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

Merge pull request #3604 from awesomerobot/master 

switching bullet-badges to flexbox to solve alignment
This commit is contained in:
Jeff Atwood 2015-07-14 18:35:27 -07:00
parent 249ef75f12 792a12349b
commit b6d1f5aee2
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -52,20 +52,12 @@
&.bullet { //bullet category style
line-height: 1.25;
margin-right: 5px;
h3 & {
line-height: .9;
}
display: inline-flex;
align-items: baseline;
margin-right: 10px;
span.badge-category {
color: $primary !important;
vertical-align: text-top;
line-height: 1;
margin-left: 4px;
padding: 3px 0 3px 3px;
margin-top: -4px;
display: inline-block;
#search-dropdown & {
@ -78,9 +70,12 @@
}
.badge-category-parent-bg, .badge-category-bg {
display: inline-block;
width: 10px;
height: 10px;
margin-right: 5px;
display: inline-block;
line-height: 1;
&:before {
content: "\a0";
}
@ -89,10 +84,9 @@
span {
&.badge-category-parent-bg { //subcategory style
width: 5px;
line-height: 1;
margin-right: 0;
& + .badge-category-bg {
width: 5px;
line-height: 1;
}
}
}
@ -198,7 +192,7 @@
}
}
.cat {
line-height: 0;
line-height: 1;
}
.badge-wrapper {
&.bar {