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

fixed height header, topic map alignment
This commit is contained in:
Jeff Atwood 2014-06-29 11:54:50 -07:00
parent 10635bcd86 5ddcad19c9
commit 2c54962ced
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/desktop/header.scss
View File

@ -6,6 +6,7 @@
left: 0; left: 0;
z-index: 1000; z-index: 1000;
padding-top: 3px; padding-top: 3px;
height: 60px;
.fa-home { .fa-home {
padding-right: 3px; padding-right: 3px;
padding-top: 3px; padding-top: 3px;

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

@ -349,7 +349,7 @@ a.star {
} }
h4 { h4 {
margin: 0 0 3px 0; margin: 1px 0 2px 0;
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 50%);
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
@ -399,12 +399,14 @@ a.star {
} }
.map { .map {
.secondary {text-align: center;}
li { li {
float: left; float: left;
padding: 7px 11px; padding: 7px 11px;
&:last-of-type { &:last-of-type {
border-right: 0; border-right: 0;
} }
&:nth-child(3) { text-align:center; }
} }
a, .number { a, .number {
line-height: 20px; line-height: 20px;

2
app/assets/stylesheets/desktop/topic.scss
View File

@ -41,7 +41,7 @@
line-height: 1.2em; line-height: 1.2em;
overflow: hidden; overflow: hidden;
a {color: $primary;} a {color: $primary;}
a.badge-category { vertical-align: top; margin-top: 4px; } a.badge-category { vertical-align: top; margin-top: 2px; }
a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; } a.edit-topic { font-size: 15px; position: absolute; margin-left: 8px; }
} }
.topic-statuses { .topic-statuses {