Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mucked up styling, glyph should be inside the hyperlink so it gets color

This commit is contained in:
Sam 2013-07-16 18:01:34 +10:00
parent 6a2ffa9415
commit dc3079db37
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/views/user/activity_filter_view.js
View File

@ -37,11 +37,13 @@ Discourse.ActivityFilterView = Discourse.View.extend({
}
var icon = this.get('icon');
buffer.push("<a href='#'>");
if(icon) {
buffer.push("<i class='glyph icon icon-" + icon + "'></i>");
buffer.push("<i class='glyph icon icon-" + icon + "'></i> ");
}
buffer.push("<a href='#'>" + description +
buffer.push(description +
" <span class='count'>(" + count + ")</span>");

13
app/assets/stylesheets/components/navs.css.scss
View File

@ -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;
}
}