From 30ea087f3d9af8eeef55ac5cb3a430b0840bdd2e Mon Sep 17 00:00:00 2001 From: Alexis Mas Date: Fri, 15 May 2015 19:17:25 -0300 Subject: [PATCH 01/10] #sidebar overflow:scroll changed to auto --- source/_css/layout/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_css/layout/_sidebar.scss b/source/_css/layout/_sidebar.scss index 64257e14c..73001f9d4 100755 --- a/source/_css/layout/_sidebar.scss +++ b/source/_css/layout/_sidebar.scss @@ -5,7 +5,7 @@ position: fixed; top: 0; background: map-get($sidebar, background); - overflow: scroll; + overflow: auto; z-index: map-get($z-indexes, l-sidebar); // Sidebar animation // Transition style (push) From 6f4d5ae233c673aa0936ebca3ffd7c172e83002d Mon Sep 17 00:00:00 2001 From: Louis Barranqueiro Date: Sat, 16 May 2015 14:52:02 +0200 Subject: [PATCH 02/10] Fix class name of css tag component --- source/_css/components/_tag.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/_css/components/_tag.scss b/source/_css/components/_tag.scss index 9b3d22c66..c60948695 100755 --- a/source/_css/components/_tag.scss +++ b/source/_css/components/_tag.scss @@ -19,17 +19,17 @@ a.tag--default, } a.tag--success, -.tag--default { +.tag--success { @include tag-color-variant(map-get($colors, success)); } a.tag--primary, -.tag--default { +.tag--primary { @include tag-color-variant(map-get($colors, primary)); } a.tag--danger, -.tag--default { +.tag--danger { @include tag-color-variant(map-get($colors, danger)); } From 61e57f91b6a893cd966392d9eed17c5a4de737c8 Mon Sep 17 00:00:00 2001 From: Louis Barranqueiro Date: Sat, 16 May 2015 15:04:40 +0200 Subject: [PATCH 03/10] Set highlight codeblock to overflow-x:auto; instead of scroll --- source/_css/components/_highlight.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_css/components/_highlight.scss b/source/_css/components/_highlight.scss index 7d1d0a454..a387085dd 100755 --- a/source/_css/components/_highlight.scss +++ b/source/_css/components/_highlight.scss @@ -12,7 +12,7 @@ figure.highlight { display: block; width: 100%; overflow-y: hidden; - overflow-x: scroll; + overflow-x: auto; } // Reset for tag `pre` and for class `.gutter`, `.code`, `.tag` pre, From 625832d5a84984d96b9589e06f5f634f2c767615 Mon Sep 17 00:00:00 2001 From: Louis Barranqueiro Date: Sat, 16 May 2015 20:15:04 +0200 Subject: [PATCH 04/10] Rename tranquil-peak to tranquilpeak css & js files --- layout/_partial/head.ejs | 2 +- layout/_partial/script.ejs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs index 1b896cdc9..e854eddb2 100755 --- a/layout/_partial/head.ejs +++ b/layout/_partial/head.ejs @@ -49,7 +49,7 @@ <%- css('assets/css/font-awesome.css') %> <%- css('assets/css/jquery.fancybox.css') %> <%- css('assets/css/jquery.fancybox-thumbs.css') %> - <%- css('assets/css/tranquil-peak.css') %> + <%- css('assets/css/tranquilpeak.css') %> <%- partial('google-analytics') %> diff --git a/layout/_partial/script.ejs b/layout/_partial/script.ejs index 1fc58a2d0..7f929e190 100644 --- a/layout/_partial/script.ejs +++ b/layout/_partial/script.ejs @@ -2,7 +2,7 @@ <%- js('assets/js/jquery.js') %> <%- js('assets/js/jquery.fancybox.js') %> <%- js('assets/js/jquery.fancybox-thumbs.js') %> -<%- js('assets/js/tranquil-peak.js') %> +<%- js('assets/js/tranquilpeak.js') %> <% if ((config.disqus_shortname) && (is_post())) { %>