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 #3376 from awesomerobot/master 

some fixes for tag alignment
This commit is contained in:
Jeff Atwood 2015-04-15 20:37:31 -07:00
parent 61f53a0de0 a87bf1d9aa
commit 3d30bd115d
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/common/base/topic.scss
View File

@ -6,6 +6,13 @@
.btn-small { .btn-small {
margin: 0 6px 0 0; margin: 0 6px 0 0;
} }
.badge-wrapper {
float: left;
&.bullet {
margin-top: 5px;
}
}
} }
a.badge-category { a.badge-category {
@ -24,3 +31,13 @@
top: 0; top: 0;
} }
} }
.extra-info-wrapper {
.badge-wrapper {
float: left;
&.bullet {
margin-top: 5px;
}
}
}

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

@ -24,6 +24,8 @@
&.bar { //bar category style &.bar { //bar category style
line-height: 1.25; line-height: 1.25;
margin-right: 5px;
span.badge-category { span.badge-category {
color: $primary !important; color: $primary !important;
padding: 3px; padding: 3px;
@ -51,7 +53,7 @@
&.bullet { //bullet category style &.bullet { //bullet category style
line-height: 1; line-height: 1;
margin-right: 5px; margin-right: 10px;
h3 & { h3 & {
line-height: .9; line-height: .9;
@ -98,6 +100,7 @@
&.box { //box category style (apply custom widths to the wrapper, not the children) &.box { //box category style (apply custom widths to the wrapper, not the children)
line-height: 1.5; line-height: 1.5;
margin-top: 5px; margin-top: 5px;
margin-right: 5px;
span { span {
display: block; display: block;