mirror of
https://github.com/Rushilwiz/tj2023.git
synced 2025-04-09 14:50:17 -04:00
Auto stash before merge of "master" and "origin/master"
This commit is contained in:
parent
675516b093
commit
7ba766d3f5
|
@ -34,8 +34,8 @@ nav {
|
|||
transform: translateY(-70px);
|
||||
top: 0;
|
||||
left: 0;
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
color: white;
|
||||
background-image: url('img/hero.png')
|
||||
}
|
||||
|
||||
|
@ -43,11 +43,6 @@ nav {
|
|||
margin-top: 25vh;
|
||||
}
|
||||
|
||||
.valign {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
}
|
||||
.home {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
|
@ -62,100 +57,8 @@ body {
|
|||
color: #444;
|
||||
}
|
||||
|
||||
.segment {
|
||||
padding-left: 17px;
|
||||
padding-right: 17px;
|
||||
}
|
||||
|
||||
.segment-title {
|
||||
color: blue;
|
||||
font-size: 24px;
|
||||
padding-bottom: 17px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.segment-para {
|
||||
color: #444;
|
||||
text-align: left;
|
||||
font-size: 22px;
|
||||
line-height: 33px;
|
||||
font-weight: 300;
|
||||
font-family: 'Hind', sans-serif;
|
||||
}
|
||||
|
||||
.segment-more-button {
|
||||
width: 80px;
|
||||
font-size: 11px;
|
||||
margin: 0 auto;
|
||||
padding-left: 23px;
|
||||
padding-right: 23px;
|
||||
padding-top: 13px;
|
||||
padding-bottom: 13px;
|
||||
border-radius: 3px;
|
||||
border-width: 2px;
|
||||
border-style: solid;
|
||||
border-color: #38A3BD;
|
||||
color: #38A3BD;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 1.2px;
|
||||
line-height: 14.4px;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.segment-more-button:hover {
|
||||
color: #FFF;
|
||||
background-color: #38A3BD;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.news-image {
|
||||
max-width: 100%;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
.segment-quote {
|
||||
color: #444;
|
||||
text-align: left;
|
||||
font-size: 28px;
|
||||
line-height: 42px;
|
||||
font-weight: 300;
|
||||
font-style: italic;
|
||||
font-family: "Arapey";
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
.segment-projects-button {
|
||||
width: auto;
|
||||
font-size: 11px;
|
||||
margin: 0 auto;
|
||||
padding-left: 23px;
|
||||
padding-right: 23px;
|
||||
padding-top: 13px;
|
||||
padding-bottom: 13px;
|
||||
border-radius: 3px;
|
||||
border-width: 2px;
|
||||
border-style: solid;
|
||||
border-color: #38A3BD;
|
||||
color: #38A3BD;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 1.2px;
|
||||
line-height: 14.4px;
|
||||
font-weight: 400;
|
||||
}
|
||||
|
||||
.segment-projects-button:hover {
|
||||
color: #FFF;
|
||||
background-color: #38A3BD;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.segment-title-outer {
|
||||
color: #38A3BD;
|
||||
font-size: 24px;
|
||||
padding-bottom: 17px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.hero-text {
|
||||
@media (max-width: 768px) {
|
||||
.hero-text {
|
||||
margin-top: 30vh;
|
||||
}
|
||||
}
|
|
@ -15,12 +15,6 @@
|
|||
<h1 class="text-center font-weight-bold">2023 News</h1>
|
||||
<div class="row">
|
||||
{% for story in stories %}
|
||||
{% comment %} <div class="col-4 news-col">
|
||||
<h3 class="">{{ story.header }}</h3>
|
||||
<img class="news-image" src="/static/pages/css/img/{{ story.img_name }}">
|
||||
<p class="segment-para">{{ story.body }}</p>
|
||||
{{ story.created.date }}
|
||||
</div> {% endcomment %}
|
||||
<div class="col-md-4 news-col card">
|
||||
<img class="card-img-top" src="{% static 'pages/css/img' %}/{{ story.img_name }}" alt="{{ story.header }} Image">
|
||||
<div class="card-body">
|
||||
|
|
|
@ -9,6 +9,7 @@ def index(request):
|
|||
stories = stories[:3]
|
||||
except Exception:
|
||||
stories = []
|
||||
|
||||
return render(request, 'pages/index.html', {'stories': stories, 'animate': True})
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user