From dc3079db37a2b8a4879489a389ff1695a02a9447 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 16 Jul 2013 18:01:34 +1000 Subject: [PATCH] fix mucked up styling, glyph should be inside the hyperlink so it gets color --- .../discourse/views/user/activity_filter_view.js | 6 ++++-- app/assets/stylesheets/components/navs.css.scss | 13 ++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/views/user/activity_filter_view.js b/app/assets/javascripts/discourse/views/user/activity_filter_view.js index e80ec7919b9..a38375c58bd 100644 --- a/app/assets/javascripts/discourse/views/user/activity_filter_view.js +++ b/app/assets/javascripts/discourse/views/user/activity_filter_view.js @@ -37,11 +37,13 @@ Discourse.ActivityFilterView = Discourse.View.extend({ } var icon = this.get('icon'); + + buffer.push(""); if(icon) { - buffer.push(""); + buffer.push(" "); } - buffer.push("" + description + + buffer.push(description + " (" + count + ")"); diff --git a/app/assets/stylesheets/components/navs.css.scss b/app/assets/stylesheets/components/navs.css.scss index 30da604c22d..3f2ae83acb6 100644 --- a/app/assets/stylesheets/components/navs.css.scss +++ b/app/assets/stylesheets/components/navs.css.scss @@ -55,6 +55,7 @@ // -------------------------------------------------- .nav-stacked { + position: relative; @extend %nav; border: 1px solid $nav-stacked-border-color; padding: 0; @@ -69,7 +70,7 @@ } > a { margin: 0; - padding: 13px; + padding: 13px 13px 13px 30px; font-weight: bold; font-size: 16px; line-height: 20px; @@ -94,17 +95,11 @@ line-height: 20px; } - .no-glyph { - a { - padding-left: 30px; - } - } - .glyph { font-size: 12px; - margin: 15px 0 0 0; width: 30px; text-align: center; - float: left; + position: absolute; + left: 2px; } }