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

fixing appearance of horizontal scrollbar on topic list at about 996px wide
This commit is contained in:
Jeff Atwood 2014-07-11 21:38:46 -07:00
parent 038b2ceca7 8da4046d79
commit 7b1eb06735
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -124,7 +124,9 @@ table.badges-listing {
} }
.show-badge .user-badge-with-posts .badge-user { .show-badge .user-badge-with-posts .badge-user {
width: 400px; width: 45%;
padding: 0 0 0 4%;
margin-bottom: 20px;
.badge-info { .badge-info {
width: 100px; width: 100px;
@ -136,7 +138,6 @@ table.badges-listing {
width: 250px; width: 250px;
display: block; display: block;
float: left; float: left;
margin-top: 67px;
margin-left: 18px; margin-left: 18px;
text-align: left; text-align: left;
} }

2
app/assets/stylesheets/common/foundation/mixins.scss
View File

@ -13,7 +13,7 @@
} }
@mixin medium-width { @mixin medium-width {
@media screen and (min-width: 967px) and (max-width: 1139px) { @media screen and (min-width: 1000px) and (max-width: 1139px) {
@content; @content;
} }
} }