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

fixed deleted/mod post highlight, reduced some gutter padding, re-aligne...
This commit is contained in:
Robin Ward 2013-10-21 12:19:11 -07:00
parent b51fb4d3fb ecb6ec0b6d
commit 51b2f512a3
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,10 +14,10 @@ html {background-color: #fff;}
margin-left: 0px; margin-left: 0px;
} }
.logo-small {margin-right: 8px;}
.topic-post { .topic-post {
padding: 0 0 3px 0; padding: 0;
&:first-of-type { &:first-of-type {
border-top: none; border-top: none;
} }
@ -77,7 +77,7 @@ section.post-menu-area {
nav.post-controls { nav.post-controls {
background-color: #fff; background-color: #fff;
padding: 0px; padding: 0;
margin-top: 20px; margin-top: 20px;
button {color: #aaa; button {color: #aaa;
margin-right: 2px; margin-right: 2px;
@ -426,7 +426,6 @@ span.post-count {
} }
article.boxed { article.boxed {
padding-bottom: 5px;
img, svg { img, svg {
max-width: 100%; max-width: 100%;
height: auto; height: auto;
@ -457,7 +456,8 @@ iframe {
.extra-info-wrapper {float: left; width: 78%;} .extra-info-wrapper {float: left; width: 78%;}
#main a.star {margin-top: 2px;} #main .inner a.star {margin-top: 6px;}
.extra-info { .extra-info {
h1 { h1 {
display: inline-block; display: inline-block;
@ -469,7 +469,6 @@ iframe {
a.star { a.star {
margin-left: 10px;
margin-right: 8px; margin-right: 8px;
margin-top: 11px !important; margin-top: 11px !important;
} }
@ -531,7 +530,21 @@ h1, h2, h3 {margin: 10px 0;}
} }
} }
.moderator {background-color: lighten(yellow, 45%);}
.deleted {
.topic-body {
background-color: lighten(red, 45%);
}
}
.moderator {
.topic-body {
background-color: lighten(yellow, 45%);
}
}
#share-link { #share-link {
width: 265px; width: 265px;
@ -562,9 +575,7 @@ h1, h2, h3 {margin: 10px 0;}
} }
.deleted {
background-color: lighten(red, 45%);
}
#show-topic-admin { #show-topic-admin {
color: #7b7b7b; color: #7b7b7b;
@ -672,7 +683,7 @@ blockquote {
max-width: 250px; max-width: 250px;
width: 15%; width: 15%;
ul {margin: 0;} ul {margin: 0;}
padding-left: 20px; padding-left: 10px;
.post-links { .post-links {
margin-top: 6px; margin-top: 6px;
@ -695,26 +706,19 @@ blockquote {
} }
.topic-body { .topic-body {
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
float: left; float: left;
position: relative; position: relative;
width: 720px; width: 720px;
padding: 10px 0 0 20px; padding: 10px 10px 10px 20px;
} }
.posts-wrapper {
position: relative;
.posts-wrapper { position: relative; } border-bottom: 1px solid #ddd;
}
//columns //columns

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

@ -25,7 +25,7 @@ h1 {
margin: 0; margin: 0;
a.badge-category {vertical-align: top;} a.badge-category {vertical-align: middle;}
a.edit-topic {font-size: 15px;} a.edit-topic {font-size: 15px;}