From fb5d40cac8c12b5b6c0f2082bd3a042b99e2ebb9 Mon Sep 17 00:00:00 2001 From: Shashank Mehta Date: Wed, 2 Jan 2013 21:05:36 +0530 Subject: [PATCH] Switched to proper Greyshade theme instead of the previous manual setup --- .themes/greyshade | 1 + sass/_greyshade.scss | 270 +++++++++++++++++++++ sass/custom/_colors.scss | 1 + sass/custom/_styles.scss | 122 ---------- sass/parts/_syntax.scss | 1 - sass/screen.scss | 2 + source/_includes/archive_post.html | 3 +- source/_includes/article.html | 2 +- source/_includes/banner.html | 2 +- source/_includes/footer.html | 1 + source/_includes/head.html | 11 +- source/_includes/header.html | 19 +- source/_includes/navigation.html | 2 +- source/_layouts/default.html | 8 +- source/blog/archives/index.html | 2 +- source/index.html | 2 +- source/javascripts/jquery.fancybox.pack.js | 2 +- 17 files changed, 302 insertions(+), 149 deletions(-) create mode 160000 .themes/greyshade create mode 100644 sass/_greyshade.scss diff --git a/.themes/greyshade b/.themes/greyshade new file mode 160000 index 0000000..ab1ac06 --- /dev/null +++ b/.themes/greyshade @@ -0,0 +1 @@ +Subproject commit ab1ac0671b562a9ba66c8a58733bd785601fb6d5 diff --git a/sass/_greyshade.scss b/sass/_greyshade.scss new file mode 100644 index 0000000..4903dd9 --- /dev/null +++ b/sass/_greyshade.scss @@ -0,0 +1,270 @@ +//This is the main GREYSHADE css file. + +body { + background: #3D4349; + font-family: "Open Sans", "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,sans-serif; +} + +::selection, ::-moz-selection, ::-webkit-selection { + background-color: $greyshade; + color: $color-background; +} + +#header { + height: auto; + border-bottom: none; + .subtitle { + color: #999; + font-style: italic; + } + #sub-nav { + float: none; + position: relative; + .social { + float: none; + } + .search { + float: none; + .alignright { + float: none; + } + } + } + + h1 { + float: none; + } + + #main-nav { + float: none; + margin-left: 0px; + + ul { + li { + margin-left: 0px; + display: block; + a { + padding: 0px 0px; + } + } + } + } +} + +.container { + .credit-box { + color: #AAA; + font-size: .8em; + position: fixed; + bottom: 20px; + left: 40px; + a { + color: inherit; + text-decoration: underline; + } + } + .mid-col { + float: right; + width: 77%; + background: whitesmoke; + .mid-col-container { + padding: 0px 70px 0px 40px; + #content { + width: 100%; + article { + border-top: none; + .title { + margin-left: 0px; + } + .entry-content { + margin-left: 0px; + .gist .gist-file .gist-data { + .line_numbers { + line-height: inherit; + } + pre { + line-height: inherit; + } + } + h2 { + font-size: 1.3em; + color: #574C4C; + border-bottom: none; + } + h2::before { + border-bottom: none; + } + blockquote { + border-left: 5px solid $greyshade; + background: #FCFCFC; + } + table { + line-height: 1.2em; + td { + text-align: left; + } + } + } + .meta { + position: relative; + float: right; + top: 0px; + color: #555; + text-align: right; + width: auto; + .date::before { + color: #555; + position: relative; + margin-right: 10px; + } + .tags::before { + color: #999; + position: relative; + margin-right: 10px; + } + } + h1.title{ + a { + color: #333; + -webkit-transition: color 0.3s; + -moz-transition: color 0.3s; + -o-transition: color 0.3s; + transition: color 0.3s; + } + a:hover { + color: $greyshade; + -webkit-transition: color 0.3s; + -moz-transition: color 0.3s; + -o-transition: color 0.3s; + transition: color 0.3s; + } + } + } + } + } + footer { + width: 100%; + } + } + .left-col:hover { + opacity: 1; + } + .left-col { + width: 23%; + position: fixed; + opacity: .3; + -webkit-transition: all .2s ease-in; + -moz-transition: all .2s ease-in; + -o-transition: all .2s ease-in; + -ms-transition: all .2s ease-in; + transition: all .2s ease-in; + height: 100%; + .intrude-less { + width: 80%; + } + #header { + width: 100%; + padding: 20% 0% 0% 15%; + #main-nav { + margin-top: 10px; + } + .profilepic { + img { + border-radius: 50%; + -moz-border-radius: 50%; + -webkit-border-radius: 50%; + } + } + a { + color: #EFEFEF; + text-shadow: 0 1px #333; + } + a:hover { + color: $greyshade; + } + #sub-nav { + margin-top: 10px; + .search::before { + left: 10px; + } + .social { + margin-bottom: 10px; + } + } + } + } +} + +.archives { + .title { + font-size: 1.2em; + } + article { + .meta { + line-height: 1.5em; + margin-top: 0; + span::before { + padding-right: 0; + } + } + } +} + +a { + color: $greyshade; +} + +a:hover { + color: $greyshade; +} + +body { + @media screen and (max-width: 1040px){ + margin: 0 0; + } +} +@media screen and (max-width: 700px){ + .container { + .credit-box { + display: none; + } + .left-col { + position: relative; + width: 100%; + opacity: 1; + .intrude-less { + margin: auto auto; + } + #header { + padding: 40px 0px; + text-align: center; + #sub-nav{ + display: block; + } + #main-nav { + ul { + display: block; + li { + display: inline; + margin-right: 10px; + } + } + } + } + } + .mid-col { + float: none; + width: 100%; + .mid-col-container { + padding: 15px 15px; + #content { + article { + .meta { + float: none; + } + } + } + } + } + } +} \ No newline at end of file diff --git a/sass/custom/_colors.scss b/sass/custom/_colors.scss index 04097de..78c27e8 100644 --- a/sass/custom/_colors.scss +++ b/sass/custom/_colors.scss @@ -41,3 +41,4 @@ $solarized: light; //$pre-bg: $base03; //$pre-border: darken($base02, 5); //$pre-color: $base1; +$greyshade: #258FB8; diff --git a/sass/custom/_styles.scss b/sass/custom/_styles.scss index 0d677cf..e90ce90 100644 --- a/sass/custom/_styles.scss +++ b/sass/custom/_styles.scss @@ -1,128 +1,6 @@ // This File is imported last, and will override other styles in the cascade // Add styles here to make changes without digging in too much - -body { - background: #3D4349; - font-family: "Open Sans", "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,sans-serif; -} - -#header { - height: auto; - border-bottom: none; - - #sub-nav { - float: none; - position: relative; - .social { - float: none; - } - .search { - float: none; - .alignright { - float: none; - } - } - } - - h1 { - float: none; - } - - #main-nav { - float: none; - margin-left: 0px; - - ul { - li { - margin-left: 0px; - display: block; - a { - padding: 0px 0px; - } - } - } - } - -} - -.container { - .mid-col { - float: right; - width: 77%; - background: whitesmoke; - .mid-col-container { - padding: 0px 70px 0px 40px; - #content { - width: 100%; - article { - border-top: none; - .title { - margin-left: 0px; - } - .entry-content { - margin-left: 0px; - } - .meta { - position: relative; - float: right; - top: 0px; - color: #555; - .date::before { - color: #555; - } - .tags::before { - color: #555; - } - } - h1.title{ - a { - color: #333; - -webkit-transition: color 0.3s; - -moz-transition: color 0.3s; - -o-transition: color 0.3s; - transition: color 0.3s; - } - a:hover { - color: #258FB8; - -webkit-transition: color 0.3s; - -moz-transition: color 0.3s; - -o-transition: color 0.3s; - transition: color 0.3s; - } - } - } - } - } - footer { - width: 100%; - } - } - .left-col { - width: 15%; - position: fixed; - #header { - width: 100%; - padding: 20% 0% 0% 20%; - a { - color: #EFEFEF; - text-shadow: 0 1px #333; - } - a:hover { - color: #258FB8; - } - #sub-nav { - .search::before { - left: 10px; - } - .social { - margin-bottom: 10px; - } - } - } - } -} - .archives { .title { font-size: 1.2em; diff --git a/sass/parts/_syntax.scss b/sass/parts/_syntax.scss index 0a95988..031d17e 100644 --- a/sass/parts/_syntax.scss +++ b/sass/parts/_syntax.scss @@ -121,7 +121,6 @@ figure.code{ td.code{ width: 100%; padding-left: 15px; - overflow-x: auto; } } .entry-content .gist{ diff --git a/sass/screen.scss b/sass/screen.scss index a5473b5..8a1ed70 100644 --- a/sass/screen.scss +++ b/sass/screen.scss @@ -5,6 +5,8 @@ @import "plugins"; @import "custom/colors"; +@import "greyshade"; + @import "custom/fonts"; @import "custom/layout"; @import "custom/styles"; \ No newline at end of file diff --git a/source/_includes/archive_post.html b/source/_includes/archive_post.html index 2b006f6..6bbbe35 100644 --- a/source/_includes/archive_post.html +++ b/source/_includes/archive_post.html @@ -8,12 +8,13 @@

{{ date | date: "%Y" }}

{% endunless %}
-

{{post.title}}

{{ date | date: "%b %e" }} +
{% include post/categories.html %} {% if site.disqus_short_name and post.comments == true and site.disqus_show_comment_count == true %} Comments {% endif %}
+

{{post.title}}

\ No newline at end of file diff --git a/source/_includes/article.html b/source/_includes/article.html index 15cb256..134c709 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -3,7 +3,7 @@
{% include post/date.html %}{{ time }}
{% include post/categories.html %}
{% if site.disqus_short_name and site.disqus_show_comment_count == true %} - Comments + Comments {% endif %}

{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}

diff --git a/source/_includes/banner.html b/source/_includes/banner.html index 9a156da..af38f03 100644 --- a/source/_includes/banner.html +++ b/source/_includes/banner.html @@ -12,4 +12,4 @@ $('#banner').getTwitterFeed('{{ site.twitter_user }}', {{ site.twitter_tweet_count }}, {{ site.twitter_show_replies }}); })(jQuery); -{% endif %} +{% endif %} \ No newline at end of file diff --git a/source/_includes/footer.html b/source/_includes/footer.html index 3a8c768..132d891 100644 --- a/source/_includes/footer.html +++ b/source/_includes/footer.html @@ -1 +1,2 @@ {% include custom/footer.html %} +Design credit: Shashank Mehta \ No newline at end of file diff --git a/source/_includes/head.html b/source/_includes/head.html index d09f6f5..b092ee8 100644 --- a/source/_includes/head.html +++ b/source/_includes/head.html @@ -8,13 +8,20 @@ {% capture description %}{% if page.description %}{{ page.description }}{% else %}{{ content | raw_content }}{% endif %}{% endcapture %} {% if page.keywords %}{% endif %} - + + + + + + {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %} + {% include custom/head.html %} - + {% include google_analytics.html %} + \ No newline at end of file diff --git a/source/_includes/header.html b/source/_includes/header.html index 9dc653c..8f27ed0 100644 --- a/source/_includes/header.html +++ b/source/_includes/header.html @@ -1,19 +1,10 @@ -WatchOut! +
+ Profile Picture +

{{ site.title }}

+

{{ site.subtitle }}

-
-

{{ site.subtitle }}

- - \ No newline at end of file diff --git a/source/javascripts/jquery.fancybox.pack.js b/source/javascripts/jquery.fancybox.pack.js index 5b45214..6521c21 100644 --- a/source/javascripts/jquery.fancybox.pack.js +++ b/source/javascripts/jquery.fancybox.pack.js @@ -32,4 +32,4 @@ a._getPosition(f)),i=d.extend({opacity:1},g);delete i.position;f?(g=this.getOrig "elastic"===e&&(f.top="+=200px");b.animate(f,{duration:"none"===e?0:c.prevSpeed,easing:c.prevEasing,complete:function(){d(this).trigger("onReset").remove()}})}};a.helpers.overlay={overlay:null,update:function(){var a,c;this.overlay.width("100%").height("100%");d.browser.msie||k?(a=Math.max(l.documentElement.scrollWidth,l.body.scrollWidth),c=Math.max(l.documentElement.offsetWidth,l.body.offsetWidth),a=a').css(b.css).appendTo("body"),b.closeClick&&this.overlay.bind("click.fb",a.close),a.current.fixed&&!k?this.overlay.addClass("overlay-fixed"):(this.update(),this.onUpdate=function(){this.update()}),this.overlay.fadeTo(b.speedIn,b.opacity))},afterClose:function(a){this.overlay&&this.overlay.fadeOut(a.speedOut||0,function(){d(this).remove()});this.overlay=null}};a.helpers.title={beforeShow:function(b){var c; if(c=a.current.title)c=d('
'+c+"
").appendTo("body"),"float"===b.type&&(c.width(c.width()),c.wrapInner(''),a.current.margin[2]+=Math.abs(parseInt(c.css("margin-bottom"),10))),c.appendTo("over"===b.type?a.inner:"outside"===b.type?a.wrap:a.skin)}};d.fn.fancybox=function(b){var c=d(this),e=this.selector||"",f,g=function(g){var h=this,j=f,k;!g.ctrlKey&&!g.altKey&&!g.shiftKey&&!g.metaKey&&!d(h).is(".fancybox-wrap")&& -(g.preventDefault(),g=b.groupAttr||"data-fancybox-group",k=d(h).attr(g),k||(g="rel",k=h[g]),k&&""!==k&&"nofollow"!==k&&(h=e.length?d(e):c,h=h.filter("["+g+'="'+k+'"]'),j=h.index(this)),b.index=j,a.open(h,b))},b=b||{};f=b.index||0;e?q.undelegate(e,"click.fb-start").delegate(e,"click.fb-start",g):c.unbind("click.fb-start").bind("click.fb-start",g);return this};d(l).ready(function(){a.defaults.fixed=d.support.fixedPosition||!(d.browser.msie&&6>=d.browser.version)&&!k})})(window,document,jQuery); +(g.preventDefault(),g=b.groupAttr||"data-fancybox-group",k=d(h).attr(g),k||(g="rel",k=h[g]),k&&""!==k&&"nofollow"!==k&&(h=e.length?d(e):c,h=h.filter("["+g+'="'+k+'"]'),j=h.index(this)),b.index=j,a.open(h,b))},b=b||{};f=b.index||0;e?q.undelegate(e,"click.fb-start").delegate(e,"click.fb-start",g):c.unbind("click.fb-start").bind("click.fb-start",g);return this};d(l).ready(function(){a.defaults.fixed=d.support.fixedPosition||!(d.browser.msie&&6>=d.browser.version)&&!k})})(window,document,jQuery); \ No newline at end of file