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

Category-dropdown items have consistent widths... other fixes
This commit is contained in:
Robin Ward 2013-11-04 10:17:21 -08:00
parent a13d05660f 5c3f12f369
commit ee6b97754a
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -23,8 +23,11 @@
a.badge-category {padding: 3px 12px; font-size: 16px; a.badge-category {padding: 3px 12px; font-size: 16px;
&.category-dropdown-button { padding: 3px 10px 3px 8px; &.category-dropdown-button {
font-size: 14px; padding: 3px 9px 2px 9px;
i {height: 20px;}
} }
} }
@ -34,7 +37,6 @@
font-weight: normal; font-weight: normal;
text-transform: capitalize; text-transform: capitalize;
&.home {padding: 3px 12px;}
} }
@ -85,7 +87,7 @@
} }
th, th,
td { td {
padding: 7px 5px; padding: 9px 5px;
line-height: 1.25; line-height: 1.25;
text-align: left; text-align: left;
vertical-align: middle; vertical-align: middle;
@ -116,7 +118,7 @@
position: relative; position: relative;
} }
+ .main-link { + .main-link {
padding-left: 0; padding-left: 5px;
} }
} }
.main-link { .main-link {
@ -451,20 +453,27 @@ ol.category-breadcrumb {
position: absolute; position: absolute;
border: 1px solid #ccc; border: 1px solid #ccc;
background-color: white; background-color: white;
max-width: 300px;
min-width: 140px;
height: 200px; height: 200px;
padding: 8px 5px 0 7px; padding: 8px 7px 0 7px;
z-index: 100; z-index: 100;
margin-top: 30px; margin-top: 30px;
min-width: 116px;
a.badge-category { a.badge-category {
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
padding: 4px 6px; padding: 4px 0;
float: none; float: none;
line-height: 19px; line-height: 19px;
text-transform: none; text-transform: none;
width: 100%;
min-width: 102px;
text-align: center;
margin-right: 20px;
} }

15
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -501,8 +501,17 @@ iframe {
h1, h2, h3 {margin: 10px 0;} h1, h2, h3 {margin: 10px 0;}
ul, ol {margin: 0 15px;} ul, ol {margin: 0 15px;}
li p {margin: 3px 0;} li p {margin: 3px 0;}
} }
a.mention {
padding: 2px 4px;
color: #666;
background: #eee;
}
.modal-body { .modal-body {
input[type=text] { input[type=text] {
font-size: 16px; font-size: 16px;
@ -587,10 +596,11 @@ position: relative;
} }
.user-title { .user-title {
margin-top: 5px; margin-top: 8px;
color: #aaa; color: #aaa;
overflow: hidden; overflow: hidden;
font-size: 80%; font-size: 80%;
line-height: 13px;
} }
.info-line { .info-line {
@ -599,9 +609,6 @@ position: relative;
} }
blockquote { /* solo quotes */ blockquote { /* solo quotes */
margin: 14px 0; margin: 14px 0;
padding: 12px; padding: 12px;