From 3546827ef3d3b007eabcd73f67713b9d892c4bf6 Mon Sep 17 00:00:00 2001 From: Bob Rockefeller Date: Thu, 23 Apr 2015 19:20:31 -0400 Subject: [PATCH] Fixed icon spacing in buttons Removed from button text Added .left and .right classes to icons --- CHANGELOG.md | 5 +++-- css-compiled/theme.css | 18 +++++++++--------- css-compiled/theme.css.map | 2 +- scss/theme.scss | 12 +++++++----- templates/partials/blog_item.html.twig | 9 ++++----- templates/partials/sidebar.html.twig | 2 +- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 237cd16..8e9b035 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,12 @@ # 1.3.4 -## 04/22/2015 +## 04/23/2015 1. [](#bugfix) * Blog posts on narrow viewports did not move the sidebar to the bottom + * Fixed icon spacing in buttons (required a change in markup) 2. [](#improved) * Better indentation for the contents of accordion panes - * More constant treatment of top and bottom margins for typographic elements + * More consistent treatment of top and bottom margins for typographic elements # 1.3.3 diff --git a/css-compiled/theme.css b/css-compiled/theme.css index c4e5c69..f54df12 100644 --- a/css-compiled/theme.css +++ b/css-compiled/theme.css @@ -48,10 +48,8 @@ a { a:hover { color: #03A9F4; } -a.btn { - vertical-align: middle; } - a.btn:hover { - color: black; } +a.btn:hover { + color: black; } .tags a { display: inline-block; @@ -136,18 +134,20 @@ span.badge.new::after { vertical-align: top; } .btn { - padding-top: 0.1rem; background-color: #03A9F4; margin-bottom: 1rem; } .btn:hover { background-color: #B3E5FC; } -.btn span { - position: relative; - top: -0.1rem; } +i.left { + margin-right: 0.5rem; } + +i.right { + margin-left: 0.5rem; } span.badge.new { - background-color: #03A9F4; } + background-color: #03A9F4; + letter-spacing: 1px; } .list-blog-header { position: relative; } diff --git a/css-compiled/theme.css.map b/css-compiled/theme.css.map index 1f32937..625d5d2 100644 --- a/css-compiled/theme.css.map +++ b/css-compiled/theme.css.map @@ -1 +1 @@ -{"version":3,"sources":["../scss/theme.scss"],"names":[],"mappings":"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","file":"theme.css"} \ No newline at end of file +{"version":3,"sources":["../scss/theme.scss"],"names":[],"mappings":"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","file":"theme.css"} \ No newline at end of file diff --git a/scss/theme.scss b/scss/theme.scss index 8f3b7ee..2a880a1 100644 --- a/scss/theme.scss +++ b/scss/theme.scss @@ -77,7 +77,6 @@ a { } a.btn { - vertical-align: middle; &:hover { color: black; } @@ -193,7 +192,6 @@ span.badge.new::after { } .btn { - padding-top: 0.1rem; background-color: $localPrimaryColor; margin-bottom: 1rem; &:hover { @@ -201,13 +199,17 @@ span.badge.new::after { } } -.btn span { - position: relative; - top: -0.1rem; +i.left { + margin-right: 0.5rem; +} + +i.right { + margin-left: 0.5rem; } span.badge.new { background-color: $localPrimaryColor; + letter-spacing: 1px; } .list-blog-header { diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig index 65a2c24..6e9ff35 100644 --- a/templates/partials/blog_item.html.twig +++ b/templates/partials/blog_item.html.twig @@ -52,16 +52,15 @@ {% if show_prev_next %}

{% if not page.isFirst %} - Next Post + Next Post {% else %} - Next - Post + Next Post {% endif %} {% if not page.isLast %} - + {% else %} - + {% endif %}

{% endif %} diff --git a/templates/partials/sidebar.html.twig b/templates/partials/sidebar.html.twig index 5a88674..2c8a9b1 100644 --- a/templates/partials/sidebar.html.twig +++ b/templates/partials/sidebar.html.twig @@ -13,7 +13,7 @@ {% if config.plugins.random.enabled %}

Random Article

- I'm Feeling Lucky! + I'm Feeling Lucky!
{% endif %}