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

Use choose-grey(5%) instead of diff(97%)

This commit is contained in:
Kane York 2015-08-20 14:35:28 -07:00
parent 7083bfdf27
commit aaccb73a3b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/common/base/topic-post.scss
View File

@ -169,7 +169,7 @@ pre {
display: block; display: block;
padding: 5px 10px; padding: 5px 10px;
color: $primary; color: $primary;
background: dark-light-diff($primary, $secondary, 97%, -65%); background: choose-grey(5%);
max-height: 500px; max-height: 500px;
} }
} }

4
app/assets/stylesheets/common/components/badges.css.scss
View File

@ -265,9 +265,9 @@
&.clicks { &.clicks {
font-weight: normal; font-weight: normal;
background-color: dark-light-diff($primary, $secondary, 85%, -65%); background-color: dark-light-diff($primary, $secondary, 85%, -60%);
top: -1px; top: -1px;
color: dark-light-diff($primary, $secondary, 50%, -45%); color: dark-light-diff($primary, $secondary, 50%, -20%);
position: relative; position: relative;
margin-left: 2px; margin-left: 2px;
border: none; border: none;

2
app/assets/stylesheets/common/foundation/mixins.scss
View File

@ -98,5 +98,5 @@
// Stuff we repeat // Stuff we repeat
@mixin post-aside { @mixin post-aside {
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%); border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%);
background-color: dark-light-diff($primary, $secondary, 97%, -75%); background-color: choose-grey(5%);
} }

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

@ -308,7 +308,7 @@ a.star {
.topic-map { .topic-map {
margin: 20px 0 0 0; margin: 20px 0 0 0;
background: dark-light-diff($primary, $secondary, 97%, -75%); background: choose-grey(5%);
border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: none; // would cause double top border border-top: none; // would cause double top border
@ -414,7 +414,7 @@ a.star {
border: 0; border: 0;
padding: 0 23px; padding: 0 23px;
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)); color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
background: dark-light-diff($primary, $secondary, 97%, -75%); background: choose-grey(5%);
border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
&:hover { &:hover {
@ -626,13 +626,13 @@ blockquote {
.quote { .quote {
&>blockquote { &>blockquote {
.onebox-result { .onebox-result {
background-color: dark-light-diff($primary, $secondary, 97%, -45%); background-color: choose-grey(5%);
} }
} }
aside { aside {
.quote, .title, blockquote, .onebox, .onebox-result { .quote, .title, blockquote, .onebox, .onebox-result {
background: dark-light-diff($primary, $secondary, 97%, -45%); background: choose-grey(5%);
border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%); border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -65%);
} }

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

@ -168,7 +168,7 @@ a.star {
.topic-map { .topic-map {
margin: 10px 0; margin: 10px 0;
background: dark-light-diff($primary, $secondary, 97%, -45%); background: choose-grey(5%);
border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: none; // would cause double top border border-top: none; // would cause double top border
@ -287,7 +287,7 @@ a.star {
border: 0; border: 0;
padding: 0 15px; padding: 0 15px;
color: $primary; color: $primary;
background: dark-light-diff($primary, $secondary, 97%, -75%); background: choose-grey(5%);
border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
.fa { .fa {