codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-10 22:14:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate <aside> quote CSS styles in base

Browse source
This commit is contained in:
Jeff Atwood 2014-09-13 23:02:46 -07:00
parent cf4bd67946
commit 10e2c3f693
3 changed files with 16 additions and 26 deletions
app/assets/stylesheets
common/base
topic-post.scss
desktop
topic-post.scss
mobile
topic-post.scss

15
app/assets/stylesheets/common/base/topic-post.scss
View file

@ -37,12 +37,27 @@
aside.quote {
margin-top: 1em;
margin-bottom: 1em;
.title {
border-left: 5px solid darken(scale-color-diff(), 10%);
background-color: scale-color-diff();
color: scale-color($primary, $lightness: 30%);
padding: 12px 12px 0 12px;
/* blockquote is underneath this and has top margin */
.avatar { margin-right: 7px; }
img { margin-top: -4px; }
}
// blockquote is docked within aside for content
blockquote {
margin-top: 0;
}
}
.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before {
color: scale-color($primary, $lightness: 50%);
}
.cooked .highlight {
background-color: dark-light-diff($tertiary, $secondary, 90%, -40%);
padding: 2px;

14
app/assets/stylesheets/desktop/topic-post.scss
View file

@ -666,16 +666,6 @@ blockquote > *:last-child {
}
}
.title {
border-left: 5px solid darken(scale-color-diff(), 10%);
background-color: scale-color-diff();
color: scale-color($primary, $lightness: 30%);
padding: 12px 12px 0 12px;
/* blockquote is underneath this and has top margin */
.avatar { margin-right: 7px; }
img { margin-top: -4px; }
}
aside {
.quote, .title, blockquote, .onebox, .onebox-result {
background: darken(scale-color-diff(), 5%);
@ -689,9 +679,7 @@ blockquote > *:last-child {
}
.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before {
color: scale-color($primary, $lightness: 50%);
}
.gutter {
margin-top: 13px;

13
app/assets/stylesheets/mobile/topic-post.scss
View file

@ -448,19 +448,6 @@ blockquote > *:last-child {
margin-bottom: 0 !important;
}
.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before {
color: $primary;
}
.quote .title {
border-left: 5px solid scale-color($primary, $lightness: 75%);
background-color: scale-color-diff();
padding: 10px 10px 10px 12px;
clear: both;
.avatar { margin-right: 7px; }
}
.gutter { display: none; }
.posts-wrapper { position: relative;