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

DEV: Refactor `dark-light-choose()` usage in SCSS 

Covers most, but not all, cases.
This commit is contained in:
Penar Musaraj 2020-07-29 09:09:37 -04:00
parent fb2fce037b
commit 3116591dc6
No known key found for this signature in database
GPG Key ID: E390435D881FF0F7
32 changed files with 122 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/stylesheets/common/base/_topic-list.scss
View File

@ -302,7 +302,7 @@ ol.category-breadcrumb {
} }
div.education { div.education {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
.badge-notification.new-posts { .badge-notification.new-posts {
vertical-align: text-bottom; vertical-align: text-bottom;
} }
@ -310,7 +310,7 @@ div.education {
.list-cell { .list-cell {
padding: 12px 5px; padding: 12px 5px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.table-heading { .table-heading {

2
app/assets/stylesheets/common/base/category-list.scss
View File

@ -123,7 +123,7 @@
margin-bottom: 1em; margin-bottom: 1em;
text-align: center; text-align: center;
font-size: $font-0; font-size: $font-0;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
position: relative; position: relative;
@include line-clamp(4); @include line-clamp(4);

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

@ -69,7 +69,7 @@
} }
} }
.me { .me {
background-color: dark-light-choose($highlight-low, $highlight-medium); background-color: $highlight-low-or-medium;
.username a, .username a,
.name, .name,
.title, .title,

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

@ -108,10 +108,10 @@ sup img.emoji {
.emoji-picker .section-header .clear-recent .fa { .emoji-picker .section-header .clear-recent .fa {
margin: 0; margin: 0;
padding: 0; padding: 0;
color: dark-light-choose($header_primary-medium, $header_primary); color: $primary-medium;
&:hover { &:hover {
color: $primary; color: $primary-high;
} }
} }
@ -237,7 +237,7 @@ sup img.emoji {
} }
.emoji-picker .filter .d-icon-search { .emoji-picker .filter .d-icon-search {
color: dark-light-choose($header_primary-medium, $header_primary); color: $primary-medium;
font-size: $font-up-1; font-size: $font-up-1;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
@ -279,7 +279,7 @@ sup img.emoji {
top: 12px; top: 12px;
border: 0; border: 0;
background: none; background: none;
color: dark-light-choose($header_primary-medium, $header_primary); color: $primary-high;
outline: none; outline: none;
display: none; display: none;

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

@ -39,7 +39,7 @@
.group-info-full-name { .group-info-full-name {
font-size: $font-up-2; font-size: $font-up-2;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
span { span {

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

@ -85,7 +85,7 @@
.new { .new {
font-size: $font-down-1; font-size: $font-down-1;
margin-left: 0.5em; margin-left: 0.5em;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -109,7 +109,7 @@
} }
} }
.badge-notification { .badge-notification {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
background-color: transparent; background-color: transparent;
display: inline; display: inline;
padding: 0; padding: 0;
@ -136,7 +136,7 @@
// note these topic counts only appear for anons in the category hamburger drop down // note these topic counts only appear for anons in the category hamburger drop down
b.topics-count { b.topics-count {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-weight: normal; font-weight: normal;
font-size: $font-down-1; font-size: $font-down-1;
} }
@ -251,7 +251,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
min-height: 30px; min-height: 30px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
background: $blend-primary-secondary-5; background: $blend-primary-secondary-5;
&:hover { &:hover {
color: $primary; color: $primary;
@ -320,7 +320,7 @@ div.menu-links-header {
} }
a.active { a.active {
border: 1px solid dark-light-choose($primary-low, $secondary-medium); border: 1px solid $primary-low;
border-bottom: 1px solid $secondary; border-bottom: 1px solid $secondary;
position: relative; position: relative;
@ -373,7 +373,7 @@ div.menu-links-header {
} }
.fa, .fa,
a { a {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.d-icon-user { .d-icon-user {

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

@ -103,7 +103,7 @@ aside.onebox {
header { header {
margin-bottom: 8px; margin-bottom: 8px;
a[href] { a[href] {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
text-decoration: none; text-decoration: none;
} }
} }
@ -600,7 +600,7 @@ aside.onebox.stackexchange .onebox-body {
} }
.onebox-metadata { .onebox-metadata {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.onebox.xkcd .onebox-body { .onebox.xkcd .onebox-body {
@ -630,7 +630,7 @@ aside.onebox.stackexchange .onebox-body {
.onebox.whitelistedgeneric { .onebox.whitelistedgeneric {
.label1, .label1,
.label2 { .label2 {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.label1 { .label1 {
float: left; float: left;
@ -660,7 +660,7 @@ aside.onebox.stackexchange .onebox-body {
.onebox.instagram { .onebox.instagram {
div.instagram-description { div.instagram-description {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
padding-top: 10px; padding-top: 10px;
} }
} }
@ -670,7 +670,7 @@ aside.onebox.stackexchange .onebox-body {
position: relative; position: relative;
} }
div.description { div.description {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -683,7 +683,7 @@ aside.onebox.stackexchange .onebox-body {
.onebox.twitterstatus { .onebox.twitterstatus {
.like, .like,
.retweet { .retweet {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
padding-left: 10px; padding-left: 10px;
svg { svg {
fill: currentColor; fill: currentColor;

4
app/assets/stylesheets/common/base/reviewables.scss
View File

@ -234,7 +234,7 @@
} }
.reviewable-meta-data { .reviewable-meta-data {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
display: flex; display: flex;
width: 100%; width: 100%;
margin-bottom: 0.5em; margin-bottom: 0.5em;
@ -250,7 +250,7 @@
margin-left: 1em; margin-left: 1em;
margin-right: auto; margin-right: auto;
a { a {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
.score { .score {

4
app/assets/stylesheets/common/base/search-menu.scss
View File

@ -213,12 +213,12 @@
} }
.username { .username {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
font-size: $font-down-1; font-size: $font-down-1;
} }
.name { .name {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
font-size: $font-0; font-size: $font-0;
font-weight: 700; font-weight: 700;
} }

4
app/assets/stylesheets/common/base/share_link.scss
View File

@ -29,7 +29,7 @@
.date { .date {
font-weight: normal; font-weight: normal;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -92,7 +92,7 @@
.close-share { .close-share {
font-size: $font-up-3; font-size: $font-up-3;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.new-topic { .new-topic {

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

@ -58,12 +58,12 @@ $quote-share-maxwidth: 150px;
@include ellipsis; @include ellipsis;
vertical-align: middle; vertical-align: middle;
a { a {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
} }
.fa { .fa {
font-size: $font-down-1; font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.svg-icon-title { .svg-icon-title {
margin-left: 3px; margin-left: 3px;
@ -72,7 +72,7 @@ $quote-share-maxwidth: 150px;
.new_user a, .new_user a,
.user-title, .user-title,
.user-title a { .user-title a {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -164,7 +164,7 @@ $quote-share-maxwidth: 150px;
// add staff color // add staff color
.moderator { .moderator {
.regular > .cooked { .regular > .cooked {
background-color: dark-light-choose($highlight-low, $highlight-medium); background-color: $highlight-low-or-medium;
padding: 10px; padding: 10px;
img:not(.thumbnail) { img:not(.thumbnail) {
max-width: 100%; max-width: 100%;
@ -173,9 +173,9 @@ $quote-share-maxwidth: 150px;
} }
.clearfix > .topic-meta-data > .names { .clearfix > .topic-meta-data > .names {
span.user-title { span.user-title {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
a { a {
background-color: dark-light-choose($highlight-low, $highlight-medium); background-color: $highlight-low-or-medium;
padding-left: 4px; padding-left: 4px;
padding-right: 4px; padding-right: 4px;
} }
@ -210,7 +210,7 @@ aside.quote {
.title { .title {
@include post-aside; @include post-aside;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
padding: 12px 12px 0px 12px; padding: 12px 12px 0px 12px;
// blockquote is underneath this and has top margin // blockquote is underneath this and has top margin
.avatar { .avatar {
@ -239,7 +239,7 @@ blockquote {
.quote-controls, .quote-controls,
.quote-controls .d-icon { .quote-controls .d-icon {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
} }
.cooked .highlight { .cooked .highlight {
@ -311,8 +311,7 @@ blockquote {
} }
.insert-quote + .quote-sharing { .insert-quote + .quote-sharing {
border-left: 1px solid border-left: 1px solid rgba(255, 255, 255, 0.3);
dark-light-choose(rgba($secondary, 0.4), rgba($primary, 0.4));
} }
.quote-sharing { .quote-sharing {
@ -406,7 +405,7 @@ blockquote {
h4 { h4 {
margin: 1px 0 2px 0; margin: 1px 0 2px 0;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-weight: normal; font-weight: normal;
font-size: $font-down-1; font-size: $font-down-1;
line-height: $line-height-small; line-height: $line-height-small;
@ -414,7 +413,7 @@ blockquote {
span.domain { span.domain {
font-size: $font-down-2; font-size: $font-down-2;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
td { td {
@ -646,7 +645,7 @@ blockquote {
} }
&.via-email { &.via-email {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
} }
&.raw-email { &.raw-email {
cursor: pointer; cursor: pointer;
@ -728,7 +727,7 @@ blockquote > *:last-child {
.gap { .gap {
padding: 0.25em 0 0.5em 56px; // 45px (topic avatar) + 11px (margin) = 56px padding: 0.25em 0 0.5em 56px; // 45px (topic avatar) + 11px (margin) = 56px
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
cursor: pointer; cursor: pointer;
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
@ -854,7 +853,7 @@ a.mention {
display: inline-flex; display: inline-flex;
font-weight: bold; font-weight: bold;
font-size: 0.93em; font-size: 0.93em;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
padding: 1px 4px; padding: 1px 4px;
background: $primary-low; background: $primary-low;
border-radius: 8px; border-radius: 8px;
@ -873,7 +872,7 @@ a.mention-group {
&.notify, &.notify,
.small-action-desc & { .small-action-desc & {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
padding: 2px 4px; padding: 2px 4px;
background: $primary-low; background: $primary-low;
border-radius: 8px; border-radius: 8px;
@ -903,7 +902,7 @@ a.mention-group {
} }
> .d-icon { > .d-icon {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
margin-right: 6px; margin-right: 6px;
font-size: $font-0; font-size: $font-0;
line-height: $line-height-large; line-height: $line-height-large;
@ -919,7 +918,7 @@ a.mention-group {
> span.help { > span.help {
display: inline-block; display: inline-block;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-size: $font-down-1; font-size: $font-down-1;
font-style: italic; font-style: italic;
line-height: $line-height-large; line-height: $line-height-large;
@ -934,7 +933,7 @@ a.mention-group {
.broken-image { .broken-image {
display: inline-flex; display: inline-flex;
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
border: 1px solid $primary-low; border: 1px solid $primary-low;
font-size: $font-up-5; font-size: $font-up-5;

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

@ -135,7 +135,7 @@ a.badge-category {
} }
.private-message-glyph { .private-message-glyph {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
} }
.private-message-glyph-wrapper { .private-message-glyph-wrapper {
@ -236,7 +236,7 @@ a.badge-category {
} }
} }
.expand-links { .expand-links {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.track-link { .track-link {
display: flex; display: flex;
@ -251,7 +251,7 @@ a.badge-category {
li { li {
margin-bottom: 0.5em; margin-bottom: 0.5em;
a[href] { a[href] {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.clicks { .clicks {
margin-left: 0.5em; margin-left: 0.5em;
@ -281,7 +281,7 @@ a.badge-category {
a.topic-featured-link { a.topic-featured-link {
display: inline-block; display: inline-block;
text-transform: lowercase; text-transform: lowercase;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-size: 0.875rem; font-size: 0.875rem;
.d-icon { .d-icon {
margin-right: 3px; margin-right: 3px;

4
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -254,7 +254,7 @@
.badge-groups { .badge-groups {
margin: 20px 0; margin: 20px 0;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
h3 { h3 {
margin-bottom: 1em; margin-bottom: 1em;
} }
@ -295,7 +295,7 @@
.grant-info-item { .grant-info-item {
margin-bottom: 1em; margin-bottom: 1em;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
&:first-of-type { &:first-of-type {
margin-right: 10px; margin-right: 10px;
} }

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

@ -219,7 +219,7 @@
font-size: $font-0; font-size: $font-0;
line-height: $line-height-small; line-height: $line-height-small;
&[href] { &[href] {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }

8
app/assets/stylesheets/common/components/user-info.scss
View File

@ -29,17 +29,17 @@
.username a { .username a {
font-weight: bold; font-weight: bold;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
.name { .name {
margin-left: 5px; margin-left: 5px;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
.title { .title {
margin-top: 3px; margin-top: 3px;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -71,7 +71,7 @@
min-width: 250px; min-width: 250px;
.granted-on { .granted-on {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.post-link { .post-link {

2
app/assets/stylesheets/common/components/user-stream-item.scss
View File

@ -102,7 +102,7 @@
// common/base/header.scss // common/base/header.scss
.fa, .fa,
.icon { .icon {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-size: $font-up-4; font-size: $font-up-4;
} }
} }

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

@ -87,3 +87,25 @@ $wiki: green !default;
//blended variants //blended variants
$blend-primary-secondary-5: blend-primary-secondary(5%) !default; $blend-primary-secondary-5: blend-primary-secondary(5%) !default;
$primary-med-or-secondary-med: dark-light-choose(
$primary-medium,
$secondary-medium
);
$primary-med-or-secondary-high: dark-light-choose(
$primary-medium,
$secondary-high
);
$primary-high-or-secondary-low: dark-light-choose(
$primary-high,
$secondary-low
);
$primary-low-mid-or-secondary-high: dark-light-choose(
$primary-low-mid,
$secondary-high
);
$highlight-low-or-medium: dark-light-choose($highlight-low, $highlight-medium);

4
app/assets/stylesheets/common/select-kit/period-chooser.scss
View File

@ -28,7 +28,7 @@
.top-date-string { .top-date-string {
font-size: $font-down-1; font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
font-weight: normal; font-weight: normal;
text-transform: uppercase; text-transform: uppercase;
} }
@ -67,7 +67,7 @@
.top-date-string { .top-date-string {
font-weight: normal; font-weight: normal;
font-size: $font-down-1; font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
text-transform: uppercase; text-transform: uppercase;
margin-left: 5px; margin-left: 5px;
} }

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

@ -215,7 +215,7 @@
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
cursor: pointer; cursor: pointer;
border-radius: 5px; border-radius: 5px;
background: dark-light-choose($primary-medium, $secondary-medium); background: $primary-med-or-secondary-med;
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {

8
app/assets/stylesheets/common/topic-timeline.scss
View File

@ -89,7 +89,7 @@
} }
} }
.username { .username {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
word-wrap: break-word; word-wrap: break-word;
font-weight: bold; font-weight: bold;
} }
@ -197,7 +197,7 @@
.start-date { .start-date {
@include unselectable; @include unselectable;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.timeline-scrollarea { .timeline-scrollarea {
@ -231,7 +231,7 @@
} }
.timeline-ago { .timeline-ago {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.timeline-scroller { .timeline-scroller {
@ -269,7 +269,7 @@
.now-date { .now-date {
@include unselectable; @include unselectable;
display: inline-block; display: inline-block;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
margin-top: 0.5em; margin-top: 0.5em;
} }
} }

4
app/assets/stylesheets/desktop/category-list.scss
View File

@ -29,7 +29,7 @@
.topics .badge-notification, .topics .badge-notification,
.category .badge-notification { .category .badge-notification {
background-color: transparent; background-color: transparent;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.topics { .topics {
@ -77,7 +77,7 @@
a.last-posted-at, a.last-posted-at,
a.last-posted-at:visited { a.last-posted-at:visited {
font-size: $font-down-1; font-size: $font-down-1;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.title { .title {
@include ellipsis; @include ellipsis;

2
app/assets/stylesheets/desktop/group.scss
View File

@ -15,7 +15,7 @@
border: none; border: none;
a { a {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
padding: 8px 0; padding: 8px 0;
&.active { &.active {

2
app/assets/stylesheets/desktop/header.scss
View File

@ -43,6 +43,6 @@
font-size: $font-down-2; font-size: $font-down-2;
line-height: $line-height-large; line-height: $line-height-large;
.search-highlight { .search-highlight {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
} }

6
app/assets/stylesheets/desktop/latest-topic-list.scss
View File

@ -4,7 +4,7 @@
.table-heading { .table-heading {
padding: 12px 5px; padding: 12px 5px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.no-topics, .no-topics,
@ -49,10 +49,10 @@
.topic-stats { .topic-stats {
flex: 1 0 0px; flex: 1 0 0px;
text-align: right; text-align: right;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.topic-last-activity a { .topic-last-activity a {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
} }

14
app/assets/stylesheets/desktop/topic-list.scss
View File

@ -34,16 +34,16 @@
.topic-list-icons { .topic-list-icons {
.d-icon-thumbtack { .d-icon-thumbtack {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.d-icon-thumbtack.unpinned { .d-icon-thumbtack.unpinned {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
a.title { a.title {
color: $primary; color: $primary;
} }
.d-icon-bookmark { .d-icon-bookmark {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -63,7 +63,7 @@
} }
th { th {
button .d-icon { button .d-icon {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -104,7 +104,7 @@
&.posters-more-count { &.posters-more-count {
cursor: default; cursor: default;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
line-height: $td-posters-more-lh; line-height: $td-posters-more-lh;
font-size: $font-down-1; font-size: $font-down-1;
} }
@ -134,7 +134,7 @@
.post-actions { .post-actions {
clear: both; clear: both;
width: auto; width: auto;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
text-align: left; text-align: left;
font-size: $font-down-1; font-size: $font-down-1;
margin-top: 5px; margin-top: 5px;
@ -142,7 +142,7 @@
margin-right: 2px; margin-right: 2px;
} }
a { a {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
margin-right: 3px; margin-right: 3px;
line-height: $line-height-large; line-height: $line-height-large;
} }

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

@ -26,7 +26,7 @@
} }
.reply-to-tab { .reply-to-tab {
z-index: z("base") + 1; z-index: z("base") + 1;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
.actions .fade-out { .actions .fade-out {
.discourse-no-touch & { .discourse-no-touch & {
@ -136,7 +136,7 @@ nav.post-controls {
} }
a, a,
button { button {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
.d-icon { .d-icon {
opacity: 1; opacity: 1;
} }
@ -154,10 +154,10 @@ nav.post-controls {
button.create { button.create {
margin-right: 0; margin-right: 0;
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
margin-left: 10px; margin-left: 10px;
.d-icon { .d-icon {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
} }
} }
.create .d-icon { .create .d-icon {
@ -313,7 +313,7 @@ pre.copy-codeblocks:hover .copy-cmd {
padding: 0; padding: 0;
} }
.post-date { .post-date {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
.d-icon-arrow-up, .d-icon-arrow-up,
.d-icon-arrow-down { .d-icon-arrow-down {
@ -331,11 +331,11 @@ pre.copy-codeblocks:hover .copy-cmd {
font-size: $font-down-1; font-size: $font-down-1;
a { a {
font-weight: bold; font-weight: bold;
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
} }
} }
.arrow { .arrow {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
} }
} }
@ -394,7 +394,7 @@ pre.copy-codeblocks:hover .copy-cmd {
.btn { .btn {
border: 0; border: 0;
padding: 0 23px; padding: 0 23px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-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;
@ -413,7 +413,7 @@ pre.copy-codeblocks:hover .copy-cmd {
} }
} }
.link-summary .btn { .link-summary .btn {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
background: $blend-primary-secondary-5; background: $blend-primary-secondary-5;
width: 100%; width: 100%;
&:hover { &:hover {
@ -701,7 +701,7 @@ a.attachment:before {
.post-info { .post-info {
a { a {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
a.wiki { a.wiki {

2
app/assets/stylesheets/desktop/topic.scss
View File

@ -37,7 +37,7 @@
.remove-featured-link { .remove-featured-link {
float: right; float: right;
text-transform: lowercase; text-transform: lowercase;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
font-size: 0.857rem; font-size: 0.857rem;
} }
} }

2
app/assets/stylesheets/desktop/upload.scss
View File

@ -24,7 +24,7 @@
} }
.description, .description,
.hint { .hint {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
display: block; display: block;
} }
.hint { .hint {

2
app/assets/stylesheets/embed.scss
View File

@ -90,7 +90,7 @@ article.post {
} }
a.new-user { a.new-user {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
} }
span.title { span.title {

2
app/assets/stylesheets/mobile/login.scss
View File

@ -156,7 +156,7 @@
flex-direction: column; flex-direction: column;
tr.instructions { tr.instructions {
label { label {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }

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

@ -202,7 +202,7 @@
.num .fa, .num .fa,
a, a,
a:visited { a:visited {
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
} }
} }
@ -211,7 +211,7 @@
a { a {
// let's make all ages dim on mobile so we're not // let's make all ages dim on mobile so we're not
// overwhelming people with info about each topic // overwhelming people with info about each topic
color: dark-light-choose($primary-low-mid, $secondary-high) !important; color: $primary-low-mid-or-secondary-high !important;
} }
} }
} }
@ -223,7 +223,7 @@
td { td {
padding: 12px 5px; padding: 12px 5px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
vertical-align: top; vertical-align: top;
} }

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

@ -28,7 +28,7 @@ span.badge-posts {
.topic-post { .topic-post {
nav.post-controls { nav.post-controls {
color: dark-light-choose($primary-low-mid, $secondary-high); color: $primary-low-mid-or-secondary-high;
.actions { .actions {
display: flex; display: flex;
@ -131,7 +131,7 @@ span.badge-posts {
a.reply-to-tab { a.reply-to-tab {
z-index: z("base") + 1; z-index: z("base") + 1;
color: dark-light-choose($primary-medium, $secondary-medium); color: $primary-med-or-secondary-med;
margin-right: 0.5em; margin-right: 0.5em;
} }
@ -166,7 +166,7 @@ a.reply-to-tab {
} }
.number, .number,
.d-icon { .d-icon {
color: dark-light-choose($primary-high, $secondary-low); color: $primary-high-or-secondary-low;
font-size: $font-up-1; font-size: $font-up-1;
} }
.avatar + a { .avatar + a {
@ -192,7 +192,7 @@ a.reply-to-tab {
.btn { .btn {
border: 0; border: 0;
padding: 0 15px; padding: 0 15px;
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-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 {
@ -203,7 +203,7 @@ a.reply-to-tab {
} }
} }
.link-summary .btn { .link-summary .btn {
color: dark-light-choose($primary-medium, $secondary-high); color: $primary-med-or-secondary-high;
background: $blend-primary-secondary-5; background: $blend-primary-secondary-5;
width: 100%; width: 100%;
} }