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

DEV: Refactor `blend-primary-secondary()` usage in SCSS

This commit is contained in:
Penar Musaraj 2020-07-28 13:33:31 -04:00
parent cfd3dcee4a
commit 81ab62c72a
No known key found for this signature in database
GPG Key ID: E390435D881FF0F7
11 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/common/base/discourse.scss
View File

@ -507,7 +507,7 @@ table {
animation: rotate-forever 1s infinite linear; animation: rotate-forever 1s infinite linear;
height: 30px; height: 30px;
width: 30px; width: 30px;
border: 4px solid blend-primary-secondary(50%); border: 4px solid $primary-low-mid;
border-right-color: transparent; border-right-color: transparent;
border-radius: 50%; border-radius: 50%;

2
app/assets/stylesheets/common/base/menu-panel.scss
View File

@ -252,7 +252,7 @@
align-items: center; align-items: center;
min-height: 30px; min-height: 30px;
color: dark-light-choose($primary-medium, $secondary-high); color: dark-light-choose($primary-medium, $secondary-high);
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
&:hover { &:hover {
color: $primary; color: $primary;
background: $primary-low; background: $primary-low;

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

@ -131,12 +131,12 @@ aside.onebox {
} }
a[href] { a[href] {
color: dark-light-choose($tertiary, $tertiary); color: $tertiary;
text-decoration: none; text-decoration: none;
} }
a[href]:visited { a[href]:visited {
color: dark-light-choose($tertiary, $tertiary); color: $tertiary;
} }
img { img {
@ -304,7 +304,7 @@ aside.onebox {
// Google Calendar Placeholder // Google Calendar Placeholder
.gdocs-onebox-splash { .gdocs-onebox-splash {
background-color: blend-primary-secondary(30%); background-color: $primary-low-mid;
color: $primary; color: $primary;
border: 1px inset $primary; border: 1px inset $primary;
.gdocs-onebox-logo { .gdocs-onebox-logo {
@ -351,7 +351,7 @@ pre.onebox code ol {
line-height: $line-height-large; line-height: $line-height-large;
} }
pre.onebox code { pre.onebox code {
background-color: dark-light-choose(#fff, #000); background-color: $primary-very-low;
} }
pre.onebox code li { pre.onebox code li {
padding-left: 5px; padding-left: 5px;

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

@ -303,10 +303,7 @@ blockquote {
position: absolute; position: absolute;
z-index: z("dropdown"); z-index: z("dropdown");
opacity: 0.9; opacity: 0.9;
background-color: dark-light-choose( background-color: $secondary-high;
blend-primary-secondary(60%),
blend-primary-secondary(30%)
);
&.visible { &.visible {
display: inline-flex; display: inline-flex;
@ -668,7 +665,7 @@ pre {
display: block; display: block;
padding: 0.5em; padding: 0.5em;
color: $primary; color: $primary;
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
max-height: 500px; max-height: 500px;
} }
} }

2
app/assets/stylesheets/common/components/badges.scss
View File

@ -183,7 +183,7 @@
&.new-posts, &.new-posts,
&.unread-posts { &.unread-posts {
background-color: dark-light-choose($tertiary-medium, $tertiary); background-color: dark-light-choose($tertiary-medium, $tertiary);
color: dark-light-choose($secondary, $secondary); color: $secondary;
font-weight: dark-light-choose(normal, bold); font-weight: dark-light-choose(normal, bold);
} }

3
app/assets/stylesheets/common/foundation/color_transformations.scss
View File

@ -81,3 +81,6 @@ $love-low: dark-light-diff($love, $secondary, 85%, -60%) !default;
//wiki //wiki
$wiki: green !default; $wiki: green !default;
//blended variants
$blend-primary-secondary-5: blend-primary-secondary(5%) !default;

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

@ -90,7 +90,7 @@ $breakpoints: (
// Stuff we repeat // Stuff we repeat
@mixin post-aside { @mixin post-aside {
border-left: 5px solid $primary-low; border-left: 5px solid $primary-low;
background-color: blend-primary-secondary(5%); background-color: $blend-primary-secondary-5;
} }
// We still need -webkit for latest iPhone and Safari // We still need -webkit for latest iPhone and Safari

2
app/assets/stylesheets/common/select-kit/notifications-filter.scss
View File

@ -23,7 +23,7 @@
} }
.header-text { .header-text {
color: dark-light-choose($tertiary, $tertiary); color: $tertiary;
cursor: pointer; cursor: pointer;
margin-bottom: 0; margin-bottom: 0;
} }

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

@ -395,7 +395,7 @@ pre.copy-codeblocks:hover .copy-cmd {
border: 0; border: 0;
padding: 0 23px; padding: 0 23px;
color: dark-light-choose($primary-medium, $secondary-high); color: dark-light-choose($primary-medium, $secondary-high);
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
border-left: 1px solid $primary-low; border-left: 1px solid $primary-low;
border-top: 1px solid transparent; border-top: 1px solid transparent;
&:hover { &:hover {
@ -414,7 +414,7 @@ pre.copy-codeblocks:hover .copy-cmd {
} }
.link-summary .btn { .link-summary .btn {
color: dark-light-choose($primary-medium, $secondary-high); color: dark-light-choose($primary-medium, $secondary-high);
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
width: 100%; width: 100%;
&:hover { &:hover {
color: $primary; color: $primary;

2
app/assets/stylesheets/mobile/topic-list.scss
View File

@ -183,7 +183,7 @@
.category-topic-link td.num .badge-notification { .category-topic-link td.num .badge-notification {
&.new-posts, &.new-posts,
&.unread-posts { &.unread-posts {
color: dark-light-choose($secondary, $secondary); color: $secondary;
} }
} }

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

@ -193,7 +193,7 @@ a.reply-to-tab {
border: 0; border: 0;
padding: 0 15px; padding: 0 15px;
color: dark-light-choose($primary-medium, $secondary-high); color: dark-light-choose($primary-medium, $secondary-high);
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
border-left: 1px solid $primary-low; border-left: 1px solid $primary-low;
.fa { .fa {
margin: 0; margin: 0;
@ -204,7 +204,7 @@ a.reply-to-tab {
} }
.link-summary .btn { .link-summary .btn {
color: dark-light-choose($primary-medium, $secondary-high); color: dark-light-choose($primary-medium, $secondary-high);
background: blend-primary-secondary(5%); background: $blend-primary-secondary-5;
width: 100%; width: 100%;
} }
} }