Skip to content

Commit

Permalink
Update header styles
Browse files Browse the repository at this point in the history
  • Loading branch information
borzunov committed Sep 2, 2015
1 parent f2e6c5c commit 27fad34
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 62 deletions.
48 changes: 25 additions & 23 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
<!DOCTYPE html>
<html>

{% include head.html %}
{% include head.html %}

<body>
{% include header.html %}
<body>
{% include header.html %}

<div class="col-md-12 blog-theme-class">
<!-- Top Blog Header -->
<div class="row jumb-bot">
<div class="col-md-1"></div>
<div class="jumbotron jumb-bot-jumbu col-md-10">
<a href="{{ site.baseurl }}/">
<img class="jumbotron-logo" src="{{ site.baseurl }}/images/dvteam_white.png" />
</a>
<h1>{{site.title}}</h1>
<p>{{site.description}}</p>
</div>
<div class="col-md-1"></div>
</div>
<div class="col-md-12 blog-theme-class">
<!-- Top Blog Header -->
<div class="row jumb-bot">
<div class="col-md-1"></div>
<div class="col-md-3">
<a href="{{ site.baseurl }}/" class="jumbotron-logo-container">
<img src="{{ site.baseurl }}/images/dvteam_white.png" />
</a>
</div>
<div class="jumbotron jumb-bot-jumbu col-md-7">
<h1>{{site.title}}</h1>
<p>{{site.description}}</p>
</div>
<div class="col-md-1"></div>
</div>
<div class="col-md-12">
{{ content }}
</div>
<!-- <div class="col-md-12 share-div">
</div>
<div class="col-md-12">
{{ content }}
</div>
<!-- <div class="col-md-12 share-div">
<div class="col-md-1"></div>
<div class="col-md-10">
{% include sharer.html %}
</div>
<div class="col-md-1"></div>
</div> -->
{% include footer.html %}
{% include include_js.html %}

</body>
{% include footer.html %}
{% include include_js.html %}
</body>

</html>
4 changes: 2 additions & 2 deletions _sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4984,7 +4984,7 @@ fieldset[disabled] .navbar-default .btn-link:hover, .navbar-default .btn-link[di
}
}
.navbar-collapse, .navbar-form {
border-color: #007196;
border-color: #1caa95;
}
.navbar-nav > .open > a {
background-color: #1caa95;
Expand Down Expand Up @@ -7131,7 +7131,7 @@ button.close {
font-size: 13px;
font-weight: 300;
.navbar-toggle:hover .icon-bar {
background-color: #b3b3b3;
background-color: #d8d8d8;
}
}

Expand Down
21 changes: 16 additions & 5 deletions _sass/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.blog-theme-class {
margin-top:0.3%;
padding:3%;
padding: 3% 3% 4%;
background:#1abc9c;
.jumb-bot {
background:#1abc9c;
Expand All @@ -15,12 +15,23 @@
color:#fff;
}
}
.jumbotron-logo {
float: left;
margin: 20px 60px 20px -40px;
width: 200px;
.jumbotron-logo-container {
display: block;
padding-left: 80px;
img {
display: block;
margin: 40px auto 0;
width: 200px;
}
}
}

@media (max-width: 768px) {
.jumbotron-logo-container {
padding-left: 0 !important;
}
}

.blog-post-small {
// border-bottom: #1abc9c 1px dashed;
text-align: justify;
Expand Down
58 changes: 26 additions & 32 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,29 @@
index: true
---


<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8">
<!-- Blog Post Links -->
<div class="blog-post-small">
{% for post in site.posts %}
<div class="blog-post-preview">
<div class="blog-post-header">
<h3><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h3>
<p><i class="fa fa-calendar"></i> &nbsp;{{ post.date | date: "%b %-d, %Y" }}
{% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
| <a href="{% if page.index %}{{ post.url | prepend: site.baseurl }}{% endif %}#disqus_thread">Comments</a>
{% endif %}
</p>
</div>

{% if post.content contains '<!-- more -->' %}
<p>{{ post.content | split:'<!-- more -->' | first }}
<br />
<a href="{{ post.url | prepend: site.baseurl }}" class="btn btn-primary btn-sm button-read-more">Read More</a>
</p>
{% else %}
{{ post.content }}
{% endif %}
</div>
{% endfor %}
</div>
<!-- End Blog Post Links -->
</div>
<div class="col-md-2"></div>
</div>
<div class="row">
<div class="col-md-2"></div>
<div class="col-md-8">
<div class="blog-post-small">
{% for post in site.posts %}
<div class="blog-post-preview">
<div class="blog-post-header">
<h3><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h3>
<p><i class="fa fa-calendar"></i> &nbsp;{{ post.date | date: "%b %-d, %Y" }} {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %} | <a href="{% if page.index %}{{ post.url | prepend: site.baseurl }}{% endif %}#disqus_thread">Comments</a> {% endif %}
</p>
</div>
{% if post.content contains '<!-- more -->' %}
<p>
{{ post.content | split: '<!-- more -->' | first }}
<br />
<a href="{{ post.url | prepend: site.baseurl }}" class="btn btn-primary btn-sm button-read-more">Read More</a>
</p>
{% else %}
{{ post.content }}
{% endif %}
</div>
{% endfor %}
</div>
</div>
<div class="col-md-2"></div>
</div>

0 comments on commit 27fad34

Please sign in to comment.