Skip to content

Commit

Permalink
Merge branch 'dduafa-responsive-home' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
noahalorwu committed May 15, 2023
2 parents da19a22 + 17aef5c commit 5053edc
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 40 deletions.
22 changes: 11 additions & 11 deletions _includes/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,10 @@
</div>
</div>
</section>

{% comment %}
{% comment %}
<section>
<div class="mini-container roadmap-section">
<div class="code"></div>
<img class="code-image" alt="code image" src="/static/img/site/code.png" />

<h3 class="heading">Our Roadmap</h3>
<!-- Roadmaps -->
Expand All @@ -62,8 +61,8 @@ <h3 class="heading">Our Roadmap</h3>
{% for date in month.dates %}
<div class="dateAndIcon" data-event-date="{{ date.date }}">
<span class="checkIcon">
<img id="check" src="/static/img/site/check.svg" />
<img id="uncheck" src="/static/img/site/uncheck.svg" />
<img id="check" src="/static/img/site/check.svg" alt="checked icon" />
<img id="uncheck" src="/static/img/site/uncheck.svg" alt="unchecked icon" />
</span>
<span class="date">
{{ date.dateCardinal }} - {% if date.url %}
Expand All @@ -78,9 +77,9 @@ <h3 class="heading">Our Roadmap</h3>
</div>
</div>
</section>
{% endcomment %}
{% endcomment %}

{% comment %}
{% comment %}
<section>
<div class="mini-container speaker">
<!-- <div class="mic"></div> -->
Expand All @@ -96,17 +95,18 @@ <h3 class="heading">Speakers</h3>
</div>
</div>
</section>
{% endcomment %}
{% endcomment %}

<section>{% include sponsors.html %}</section>

<section>
<div class="mini-container">
<h3 class="heading">Latest News</h3>
<a class="latest" href="{{site.posts.first.url}}">

<h1 class="info-news">{{ site.posts.first.title }} &#10138;</h1>
<p class="latest-pub">Published {{ site.posts.first.date | date: "%-d %b. %Y"}}</p></a>

<h1 class="info-news">{{ site.posts.first.title }} &#10138;</h1>
<p class="latest-pub">Published {{ site.posts.first.date | date: "%-d %b. %Y"}}</p>
</a>
</div>
</section>

Expand Down
5 changes: 5 additions & 0 deletions _pages/faq.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
title: Faq
layout: default
permalink: /faq/sdsd
---
85 changes: 56 additions & 29 deletions static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,6 @@ ul {
list-style-type: " • ";
}



.info {
font-family: "Circular Std";
font-weight: 200;
Expand All @@ -420,6 +418,7 @@ ul {
.speaker,
.sponsors,
.roadmap-section {
position: relative;
margin-bottom: 90px;
}

Expand Down Expand Up @@ -495,6 +494,11 @@ ul {
text-decoration-thickness: 1px;
}

.dateAndIcon {
display: flex;
align-items: center;
}

.django {
position: absolute;
width: 84.64px;
Expand Down Expand Up @@ -608,13 +612,11 @@ ul {
width: 100%;
}

.code {
position: relative;
width: 77.72px;
height: 86.64px;
left: 750px;
top: 90px;
background: url(/static/img/site/code.svg);
.code-image {
position: absolute;
height: 86px;
top: 0;
right: 0;
}

/* center image */
Expand Down Expand Up @@ -675,13 +677,12 @@ ul {
color: #000000;
}


.all-news-pub {
margin-top: 20px;
margin-bottom: 20px !important;
font-family: "Circular Std";
font-size: 15px;
color: #E87155;
color: #e87155;
}

.news-excerpt {
Expand Down Expand Up @@ -741,8 +742,6 @@ ul {
margin-right: 40px;
}



.post-paragraph {
width: 832px;
height: 90px;
Expand Down Expand Up @@ -1064,14 +1063,12 @@ ul {
font-size: 60px;
}


.icon-hero {
display: inline-block;
vertical-align: middle;
margin-right: 10px;
}


/* delete */
.post-list {
display: flex;
Expand Down Expand Up @@ -1101,7 +1098,6 @@ ul {

.post-excerpt {
margin-bottom: 20px;

}

.post-img {
Expand Down Expand Up @@ -1131,7 +1127,7 @@ ul {
font-weight: 400;
font-size: 10px;
line-height: 30px;
color: #E87155;
color: #e87155;
overflow-wrap: break-word;
}

Expand Down Expand Up @@ -1177,8 +1173,6 @@ ul {
background: #000000;
}



.news-list-img {
width: 100%px;
height: 100%;
Expand Down Expand Up @@ -1441,7 +1435,6 @@ ul {
font-weight: 400;
line-height: 30px;
word-wrap: break-word;

}

.info-news {
Expand All @@ -1452,13 +1445,47 @@ ul {
margin-bottom: 10px;
}

.post-content {
font-family: "Edmondsans";
font-size: 18px;
line-height: 26px;
margin-top: 50px;
margin-left: 0px;
margin-right: 0px;
}
.post-content {
font-family: "Edmondsans";
font-size: 18px;
line-height: 26px;
margin-top: 50px;
margin-left: 0px;
margin-right: 0px;
}

.roadmap {
flex-direction: column;
border-left: 2px solid #000000;
}

}
.roadmap .month {
width: 100%;
justify-content: flex-start;
padding-left: 20px;
border: 2px solid #000000;
border-bottom: none;
border-left: none;
font-size: 26px;
}

.code-image {
top: 10px;
right: 0;
height: 50px;
}

.roadmap .dates .date {
display: block;
font-size: 16px;
line-height: 23px;
}

.roadmap .dates {
padding-left: 20px;
}

.roadmap-section {
margin-top: 50px;
}
}
Binary file added static/img/site/code.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5053edc

Please sign in to comment.