Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify @mention CSS, add $quote-background color

This commit is contained in:
Jeff Atwood 2013-07-30 15:27:42 -07:00
parent 2c1326f89b
commit 81de7dc0af
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/application/discourse.css.scss
View File

@ -219,8 +219,8 @@ form {
blockquote { blockquote {
/* 13px left is intentional here to properly align with post quotes */ /* 13px left is intentional here to properly align with post quotes */
padding: 10px 8px 1px 13px; padding: 10px 8px 1px 13px;
background-color: #f1f1f1; background-color: $quote-background;
border-left: 5px solid #dddddd; border-left: 5px solid darken($quote-background, 20%);
p { p {
margin: 0 0 10px 0; margin: 0 0 10px 0;
} }

14
app/assets/stylesheets/application/topic.css.scss
View File

@ -155,11 +155,9 @@
} }
} }
a.mention, .ac-wrap .item span { a.mention, .ac-wrap .item span {
@include border-radius-all(5px); @include border-radius-all(6px);
@include linear-gradient(lighten($light_gray, 10%), $light_gray); color: $quote-background;
border: 1px solid $gray; padding: 1px 5px;
color: $darkish_gray;
padding: 1px 2px;
} }
a.mention { a.mention {
cursor: pointer; cursor: pointer;
@ -187,19 +185,19 @@
// When we are quoting something // When we are quoting something
aside.quote { aside.quote {
border-left: 5px solid #d7d7d7; border-left: 5px solid darken($quote-background, 20%);
margin-top: 14px; margin-top: 14px;
font-size: 14px; font-size: 14px;
line-height: 20px; line-height: 20px;
padding-left: 5px; padding-left: 5px;
background-color: #f1f1f1; background-color: $quote-background;
overflow: hidden; overflow: hidden;
&:nth-of-type(1) { &:nth-of-type(1) {
margin: 0; margin: 0;
} }
.title { .title {
padding: 8px 8px 0px; padding: 8px 8px 0px;
background-color: #f1f1f1; background-color: $quote-background;
a, a,
.avatar { .avatar {
margin-right: 4px; margin-right: 4px;

2
app/assets/stylesheets/foundation/variables.scss
View File

@ -155,6 +155,8 @@ $link_color: darken($blue, 10%);
$muted-link-color: #999; $muted-link-color: #999;
$muted-important-link-color: #5d5d5d; $muted-important-link-color: #5d5d5d;
$quote-background: #f1f1f1;
// Colors based on basics // Colors based on basics
$topicMenuColor: darken($white, 80%); $topicMenuColor: darken($white, 80%);