Skip to content

Commit

Permalink
more updated layout changes
Browse files Browse the repository at this point in the history
Signed-off-by: frank <frankie.lineha@gmail.com>
  • Loading branch information
frank committed Jun 28, 2015
1 parent 5d7ee2b commit a30bdac
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 62 deletions.
5 changes: 5 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{% if site.theme.footer_text %}
<footer class="site-footer">
<p class="text">Crafted in the Gem State, Boise, Idaho.</p>
<p>
<a href="https://twitter.com/FrankLinehan" class="fc-social-icons">
<i class="fa-twitter"></i>
</a>
</p>
</footer>

<script defer src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
Expand Down
26 changes: 13 additions & 13 deletions _layouts/post.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
---
layout: default
---
<div class="mt" {% if page.feature-img %}class="feature-image"{% endif %}>
<div class="mt container" {% if page.feature-img %}class="feature-image"{% endif %}>
<div class="row">
<section class="post-content">
<header style="margin-bottom: 70px; background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
<h1 class="title">{{ page.title }}</h1>

<header style="margin-bottom: 70px; background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
<h1 class="title">{{ page.title }}</h1>

<p class="meta">
{{ page.date | date: "%B %-d, %Y" }}
{% if page.author %} - {{ page.author }}{% endif %}
</p>
</header>

<section class="post-content">
{{ content }}
</section>
<p class="meta">
{{ page.date | date: "%B %-d, %Y" }}
{% if page.author %} - {{ page.author }}{% endif %}
</p>
</header>
{{ content }}
</section>

</div>
</div>

<!-- Disqus -->
Expand Down
2 changes: 1 addition & 1 deletion _sass/base/_global.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

html {
background: $background-color;
background: #eee;
}

// typography
Expand Down
2 changes: 1 addition & 1 deletion _sass/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $padding-x-small: 3%;

// brand colors
$brand-color: #fff;
$background-color: #fafafa;
$background-color: #eee;
$border-color: rgba(0, 0, 0, 0.1); // rgba recommended if using feature images

// typography colors
Expand Down
16 changes: 3 additions & 13 deletions _sass/modules/icons.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

@font-face {
font-family: 'fontawesome';
src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg8SDDEAAAC8AAAAYGNtYXAPUuKSAAABHAAAAFRnYXNwAAAAEAAAAXAAAAAIZ2x5ZmHVblIAAAF4AAABrGhlYWQEy3BUAAADJAAAADZoaGVhBigDyQAAA1wAAAAkaG10eA4AAHkAAAOAAAAAIGxvY2EBeAEIAAADoAAAABJtYXhwAAoAHQAAA7QAAAAgbmFtZQYVdZMAAAPUAAABtnBvc3QAAwAAAAAFjAAAACAAAwIAAZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADxBwPA/8AAQAPAAEAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAOAAAAAoACAACAAIAAQAg8Qf//f//AAAAAAAg8QT//f//AAH/4w8AAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABABoAdQFmAq8AGgAAARQPARcWFRQPAQYjIicBJjU0NwE2MzIfARYVAWYF4eEFBR0GBwgF/vUFBQELBQgHBh0FAoAHBuHgBgcIBhwGBgEKBgcIBQELBQUdBgcAAAEABwB1AVQCrwAaAAABFAcBBiMiLwEmNTQ/AScmNTQ/ATYzMhcBFhUBVAb+9gYHCAUdBgbh4QYGHQUIBwYBCgYBkgcG/vYGBhwGCAcG4OEGBwcGHQUF/vUFCAAAAQAsAOMCZgIvABoAAAEUDwEGIyIvAQcGIyIvASY1NDcBNjMyFwEWFQJmBR0GBwgF4eAGCAcGHAYGAQoGBwgFAQsFARIHBhwGBuDgBgYcBgcIBQELBQX+9QUIAAABACwA9QJmAkIAGgAAARQHAQYjIicBJjU0PwE2MzIfATc2MzIfARYVAmYF/vUFCAcG/vYGBhwGBwgG4OEFCAcGHQUCEgcG/vYGBgEKBgcIBR0GBuHhBgYdBQgAAAEAAAABAAD8pYRnXw889QALBAAAAAAA0aOWVAAAAADRo5ZUAAAAAAJmAq8AAAAIAAIAAAAAAAAAAQAAA8D/wAAABAAAAAAAAmYAAQAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAAAAAAACAAAAAW4AGgFuAAcCkgAsApIALAAAAAAACgAUAB4ATAB6AKgA1gAAAAEAAAAIABsAAQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQALAAAAAQAAAAAAAgAHAIQAAQAAAAAAAwALAEIAAQAAAAAABAALAJkAAQAAAAAABQALACEAAQAAAAAABgALAGMAAQAAAAAACgAaALoAAwABBAkAAQAWAAsAAwABBAkAAgAOAIsAAwABBAkAAwAWAE0AAwABBAkABAAWAKQAAwABBAkABQAWACwAAwABBAkABgAWAG4AAwABBAkACgA0ANRmb250YXdlc29tZQBmAG8AbgB0AGEAdwBlAHMAbwBtAGVWZXJzaW9uIDEuMABWAGUAcgBzAGkAbwBuACAAMQAuADBmb250YXdlc29tZQBmAG8AbgB0AGEAdwBlAHMAbwBtAGVmb250YXdlc29tZQBmAG8AbgB0AGEAdwBlAHMAbwBtAGVSZWd1bGFyAFIAZQBnAHUAbABhAHJmb250YXdlc29tZQBmAG8AbgB0AGEAdwBlAHMAbwBtAGVGb250IGdlbmVyYXRlZCBieSBJY29Nb29uLgBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA) format('truetype');
src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT1MvMg8SDJ8AAAC8AAAAYGNtYXAPveG5AAABHAAAAFRnYXNwAAAAEAAAAXAAAAAIZ2x5ZlathD0AAAF4AAAA8GhlYWQGKBE0AAACaAAAADZoaGVhB2ADxgAAAqAAAAAkaG10eAm3ABkAAALEAAAAFGxvY2EAKACMAAAC2AAAAAxtYXhwAAcAPgAAAuQAAAAgbmFtZQYVdZMAAAMEAAABtnBvc3QAAwAAAAAEvAAAACAAAwLcAZAABQAAApkCzAAAAI8CmQLMAAAB6wAzAQkAAAAAAAAAAAAAAAAAAAABEAAAAAAAAAAAAAAAAAAAAABAAADwmQPA/8AAQAPAAEAAAAABAAAAAAAAAAAAAAAgAAAAAAADAAAAAwAAABwAAQADAAAAHAADAAEAAAAcAAQAOAAAAAoACAACAAIAAQAg8Jn//f//AAAAAAAg8Jn//f//AAH/4w9rAAMAAQAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAABABkASQOeAyUAOwAAAQYHFhUUBwYHBgcGBwYjIicWMzI3JicmJxYzMjcmJyY9ARYXJicmNTQ3FhcWFyY1NDc2MzIXNjcGBzY3A54nNgEWFiwsPT5WVmKbgRQZgGU8MC8SExAZGEAqKicsJhYWGUVjY3IFNjZNUDY/NxY8NjUCzjgoCBBKSkpERDQ1Hx9TAk8BIyQ4AwYNMzJDAhUCGSkoMDIrVTM0BRUVTTY2OwwhQiQGFwABAAAAAQAAGC4fXV8PPPUACwQAAAAAANG15okAAAAA0bXmiQAAAAADngMlAAAACAACAAAAAAAAAAEAAAPA/8AAAAQAAAAAAAOeAAEAAAAAAAAAAAAAAAAAAAAFBAAAAAAAAAAAAAAAAgAAAAO3ABkAAAAAAAoAFAAeAHgAAQAAAAUAPAABAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAA4ArgABAAAAAAABAAsAAAABAAAAAAACAAcAhAABAAAAAAADAAsAQgABAAAAAAAEAAsAmQABAAAAAAAFAAsAIQABAAAAAAAGAAsAYwABAAAAAAAKABoAugADAAEECQABABYACwADAAEECQACAA4AiwADAAEECQADABYATQADAAEECQAEABYApAADAAEECQAFABYALAADAAEECQAGABYAbgADAAEECQAKADQA1GZvbnRhd2Vzb21lAGYAbwBuAHQAYQB3AGUAcwBvAG0AZVZlcnNpb24gMS4wAFYAZQByAHMAaQBvAG4AIAAxAC4AMGZvbnRhd2Vzb21lAGYAbwBuAHQAYQB3AGUAcwBvAG0AZWZvbnRhd2Vzb21lAGYAbwBuAHQAYQB3AGUAcwBvAG0AZVJlZ3VsYXIAUgBlAGcAdQBsAGEAcmZvbnRhd2Vzb21lAGYAbwBuAHQAYQB3AGUAcwBvAG0AZUZvbnQgZ2VuZXJhdGVkIGJ5IEljb01vb24uAEYAbwBuAHQAIABnAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAEkAYwBvAE0AbwBvAG4ALgAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=) format('truetype');
font-weight: normal;
font-style: normal;
}
Expand All @@ -20,15 +19,6 @@
-moz-osx-font-smoothing: grayscale;
}

.fa-angle-left:before {
content: "\f104";
}
.fa-angle-right:before {
content: "\f105";
}
.fa-angle-up:before {
content: "\f106";
}
.fa-angle-down:before {
content: "\f107";
.fa-twitter:before {
content: "\f099";
}
14 changes: 11 additions & 3 deletions _sass/theme/frank.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


body {
color: $primaryText;
}
Expand Down Expand Up @@ -139,8 +137,9 @@ h2{
}

.fc-card-title{
font-size: 30px !important;
font-size: 24px !important;
line-height: 1.3 !important;
font-family: 'Roboto Mono', Arial, serif;
}

header .meta{
Expand Down Expand Up @@ -230,3 +229,12 @@ li {
margin-bottom: -60px;
font-family: 'Roboto Mono', Arial, serif;
}


.fc-social-icons{
font-size: 30px;
}

.fc-social-icons:hover{
color: #fff;
}
31 changes: 0 additions & 31 deletions js/main.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,4 @@
/**
* Created by Frank on 12/27/2014.
*/
(function (window) {
$('a[href^="#"]').on('click', function(event) {
var target = $( $(this).attr('href') );
if( target.length ) {
event.preventDefault();
$('html, body').animate({
scrollTop: target.offset().top
}, 400);
}
});
})(window);

$( document ).ready(function() {
$(".button-collapse").sideNav();

var background = $('.fc-background');

var parallax = function() {
var scrolled = $(window).scrollTop();
background.css('top', -(scrolled * 0.8) + 'px');
};

//this is a greedy function, but we have to fire this each time
//so that the parallax scrolls nice :)
if(background){
$(window).scroll(function(e) {
parallax();
});
}
});


0 comments on commit a30bdac

Please sign in to comment.