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

Rename choose-grey() to blend-primary-secondary()

This commit is contained in:
Kane York 2015-08-20 16:47:34 -07:00
parent eb00a92452
commit 1218d47eb5
9 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/templates/customize_colors.hbs
View File

@ -60,7 +60,7 @@
<div class="cbox90"></div> <div class="cbox90"></div>
<div class="cbox95"></div> <div class="cbox95"></div>
<div class="cbox100"></div> <div class="cbox100"></div>
choose-grey() blend-primary-secondary()
</div></div> </div></div>
<div><div class="cboxcontainer secondary"> <div><div class="cboxcontainer secondary">
@ -81,7 +81,7 @@
<div class="cbox90"></div> <div class="cbox90"></div>
<div class="cbox95"></div> <div class="cbox95"></div>
<div class="cbox100"></div> <div class="cbox100"></div>
choose-grey() blend-primary-secondary()
</div></div> </div></div>
<div><div class="cboxcontainer primary"> <div><div class="cboxcontainer primary">

36
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -1682,23 +1682,25 @@ table#user-badges {
background: $secondary; background: $secondary;
} }
} }
.cbox0 { background: choose-grey(0%); } .cbox0 { background: blend-primary-secondary(0%); }
.cbox10 { background: choose-grey(10%); } .cbox10 { background: blend-primary-secondary(10%); }
.cbox20 { background: choose-grey(20%); } .cbox20 { background: blend-primary-secondary(20%); }
.cbox30 { background: choose-grey(30%); } .cbox30 { background: blend-primary-secondary(30%); }
.cbox40 { background: choose-grey(40%); } .cbox40 { background: blend-primary-secondary(40%); }
.cbox50 { background: choose-grey(50%); } .cbox50 { background: blend-primary-secondary(50%); }
.cbox60 { background: choose-grey(60%); } .cbox60 { background: blend-primary-secondary(60%); }
.cbox70 { background: choose-grey(70%); } .cbox70 { background: blend-primary-secondary(70%); }
.cbox80 { background: choose-grey(80%); } .cbox80 { background: blend-primary-secondary(80%); }
.cbox90 { background: choose-grey(90%); } .cbox90 { background: blend-primary-secondary(90%); }
.cbox100 { background: choose-grey(100%); } .cbox100 { background: blend-primary-secondary(100%); }
.cbox5 { background: choose-grey(5%); } .cbox5 { background: blend-primary-secondary(5%); }
.cbox15 { background: choose-grey(15%); } .cbox7 { background: blend-primary-secondary(7%); }
.cbox25 { background: choose-grey(25%); } .cbox15 { background: blend-primary-secondary(15%); }
.cbox95 { background: choose-grey(95%); } .cbox17 { background: blend-primary-secondary(17%); }
.cbox85 { background: choose-grey(85%); } .cbox25 { background: blend-primary-secondary(25%); }
.cbox75 { background: choose-grey(75%); } .cbox95 { background: blend-primary-secondary(95%); }
.cbox85 { background: blend-primary-secondary(85%); }
.cbox75 { background: blend-primary-secondary(75%); }
.dbox0 { background: dark-light-diff($primary, $secondary, 0%, -0%); } .dbox0 { background: dark-light-diff($primary, $secondary, 0%, -0%); }
.dbox10 { background: dark-light-diff($primary, $secondary, 10%, -10%); } .dbox10 { background: dark-light-diff($primary, $secondary, 10%, -10%); }

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

@ -171,7 +171,7 @@ pre {
display: block; display: block;
padding: 5px 10px; padding: 5px 10px;
color: $primary; color: $primary;
background: choose-grey(5%); background: blend-primary-secondary(5%);
max-height: 500px; max-height: 500px;
} }
} }

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: choose-grey(5%); background-color: blend-primary-secondary(5%);
} }

6
app/assets/stylesheets/common/foundation/variables.scss
View File

@ -59,14 +59,10 @@ $base-font-family: Helvetica, Arial, sans-serif !default;
} }
// Replaces dark-light-diff($primary, $secondary, 50%, -50%) // Replaces dark-light-diff($primary, $secondary, 50%, -50%)
@function choose-grey($percent) { @function blend-primary-secondary($percent) {
@return srgb-scale($primary, $secondary, $percent); @return srgb-scale($primary, $secondary, $percent);
} }
@function choose-gray($percent) {
@return choose-grey($percent);
}
@function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) { @function dark-light-diff($adjusted-color, $comparison-color, $lightness, $darkness) {
@if brightness($adjusted-color) < brightness($comparison-color) { @if brightness($adjusted-color) < brightness($comparison-color) {
@return scale-color($adjusted-color, $lightness: $lightness); @return scale-color($adjusted-color, $lightness: $lightness);

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: choose-grey(5%); background: blend-primary-secondary(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: choose-grey(5%); background: blend-primary-secondary(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: choose-grey(5%); background-color: blend-primary-secondary(5%);
} }
} }
aside { aside {
.quote, .title, blockquote, .onebox, .onebox-result { .quote, .title, blockquote, .onebox, .onebox-result {
background: choose-grey(5%); background: blend-primary-secondary(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/compose.scss
View File

@ -16,7 +16,7 @@ display: none !important; // can be removed if inline JS CSS is removed from com
input { input {
background: $secondary; background: $secondary;
color: $primary; color: $primary;
border-color: choose-grey(15%); border-color: blend-primary-secondary(15%);
} }
#reply-control { #reply-control {
@ -178,7 +178,7 @@ input {
background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%)); background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
} }
.wmd-input { .wmd-input {
color: dark-light-choose(darken($primary, 40%), choose-grey(90%)); color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
} }
.wmd-input { .wmd-input {
bottom: 35px; bottom: 35px;

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: choose-grey(5%); background: blend-primary-secondary(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: choose-grey(5%); background: blend-primary-secondary(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 {

4
app/assets/stylesheets/mobile/user.scss
View File

@ -306,7 +306,7 @@
width: 100%; width: 100%;
position: relative; position: relative;
float: left; float: left;
color: dark-light-choose(scale-color($secondary, $lightness: 75%), choose-grey(90%)); color: dark-light-choose(scale-color($secondary, $lightness: 75%), blend-primary-secondary(90%));
h1 {font-weight: bold;} h1 {font-weight: bold;}
@ -369,7 +369,7 @@
.details { .details {
padding: 12px 15px 2px 15px; padding: 12px 15px 2px 15px;
margin-top: 0; margin-top: 0;
background: dark-light-choose(rgba($primary, 1), choose-grey(5%)); background: dark-light-choose(rgba($primary, 1), blend-primary-secondary(5%));
.bio { display: none; } .bio { display: none; }
.primary { .primary {