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

topic list highlight fix, some quote style fixes
This commit is contained in:
Sam 2014-05-23 12:36:26 +10:00
parent cc681c729d 00278b42d8
commit 2350227a6f
3 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/common/base/onebox.scss
View File

@ -89,7 +89,6 @@ a.loading-onebox {
} }
aside.onebox { aside.onebox {
margin-top: 15px;
padding: 12px 25px 12px 12px; padding: 12px 25px 12px 12px;
border-left: 5px solid darken(scale-color-diff(), 10%); border-left: 5px solid darken(scale-color-diff(), 10%);
background: scale-color-diff(); background: scale-color-diff();
@ -140,3 +139,11 @@ aside.onebox {
height: 90px; height: 90px;
width: 90px; width: 90px;
} }
blockquote {
aside.onebox {
background: darken(scale-color-diff(), 5%);
border-left: 5px solid darken(scale-color-diff(), 12%);
}
}

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

@ -68,7 +68,7 @@
> tbody > tr { > tbody > tr {
&:nth-child(even) { &:nth-child(even) {
background-color: rgba($primary, .04); background-color: darken($secondary, 3%);
} }
&.archived a { &.archived a {
opacity: 0.6; opacity: 0.6;
@ -362,7 +362,7 @@
.category-list-item { .category-list-item {
margin-bottom: 10px; margin-bottom: 10px;
#topic-list tbody tr:nth-child(even) { #topic-list tbody tr:nth-child(even) {
background-color: $secondary; background-color: darken($secondary, 3%);
} }
th .badge-category { th .badge-category {
float: left; float: left;

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

@ -271,7 +271,7 @@ nav.post-controls {
.fa-arrow-up {margin-left: 5px;} .fa-arrow-up {margin-left: 5px;}
.row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;} .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}
.reply:first-of-type .row {border-top: none;} .reply:first-of-type .row {border-top: none;}
.quote {margin-top: 0 !important;}
background: scale-color-diff(); background: scale-color-diff();
.quote .title, blockquote, .onebox, .onebox-result { .quote .title, blockquote, .onebox, .onebox-result {
background: darken(scale-color-diff(), 5%); background: darken(scale-color-diff(), 5%);
@ -467,10 +467,9 @@ a.star {
clear: left; clear: left;
padding: 20px 0 15px 0; padding: 20px 0 15px 0;
#topic-list > tbody > tr:nth-child(even) { #topic-list > tbody > tr:nth-child(even) {
background-color: rgba($primary, .04); background-color: darken($secondary, 3%);
} }
#topic-list > tbody > tr:nth-child(odd) { #topic-list > tbody > tr:nth-child(odd) {
background-color: $secondary;
} }
table { table {
box-shadow: none; box-shadow: none;
@ -674,7 +673,7 @@ iframe {
blockquote { /* solo quotes */ blockquote { /* solo quotes */
margin: 14px 0; margin: 0;
padding: 12px; padding: 12px;
a.mention {background: scale-color-diff();} a.mention {background: scale-color-diff();}
@ -683,21 +682,30 @@ blockquote { /* solo quotes */
} }
.quote { /* quotes with attribution */ .quote { /* quotes with attribution */
margin-top: 14px; blockquote {
blockquote {margin-top: 0; padding-top: 0; margin-top: 0;
.onebox-result {background-color: scale-color-diff();} padding-top: 0;
p:first-of-type {margin:0;}
.onebox-result {
background-color: scale-color-diff();
}
} }
.title { .title {
border-left: 5px solid darken(scale-color-diff(), 10%); border-left: 5px solid darken(scale-color-diff(), 10%);
background-color: scale-color-diff(); background-color: scale-color-diff();
padding: 12px; padding: 12px;
.avatar { margin-right: 7px; } .avatar { margin-right: 7px; }
img {margin-top: -4px;} img { margin-top: -4px; }
}
aside {
.quote, .title, blockquote, .onebox, .onebox-result {
background: darken(scale-color-diff(), 5%);
border-left: 5px solid darken(scale-color-diff(), 12%);
}
}
}
} }
.quote-controls { .quote-controls {