Skip to content

scale-color $lightness must use $secondary for dark themes #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
everettbu wants to merge 1 commit into
base: theme-color-scheme-pre
Choose a base branch
from
Open

scale-color $lightness must use $secondary for dark themes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/assets/stylesheets/common/admin/admin_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ td.flaggers td {
}

.desc {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}

h3 {
Expand Down Expand Up @@ -503,7 +503,7 @@ section.details {

p.help {
margin: 0;
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
font-size: 0.9em;
}
}
Expand All @@ -521,7 +521,7 @@ section.details {
.current-badge-actions {
margin: 10px;
padding: 10px;
border-top: 1px solid scale-color($primary, $lightness: 80%);
border-top: 1px solid dark-light-choose(scale-color($primary, $lightness: 80%), scale-color($secondary, $lightness: 20%));
}

.buttons {
Expand Down Expand Up @@ -574,7 +574,7 @@ section.details {
.groups {
.ac-wrap {
width: 100% !important;
border-color: scale-color($primary, $lightness: 75%);
border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
.item {
width: 190px;
margin-right: 0 !important;
Expand All @@ -597,7 +597,7 @@ section.details {
}
.select2-choices {
width: 100%;
border-color: scale-color($primary, $lightness: 75%);
border-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
}
}

Expand Down Expand Up @@ -723,7 +723,7 @@ section.details {
td.actions { width: 200px; }
.hex-input { width: 80px; margin-bottom: 0; }
.hex { text-align: center; }
.description { color: scale-color($primary, $lightness: 50%); }
.description { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }

.invalid .hex input {
background-color: white;
Expand Down Expand Up @@ -1291,7 +1291,7 @@ table.api-keys {
margin: 0 0 20px 6px;
a.filter {
display: inline-block;
background-color: scale-color($primary, $lightness: 75%);
background-color: dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));
padding: 3px 10px;
border-radius: 3px;

Expand Down Expand Up @@ -1328,7 +1328,7 @@ table.api-keys {

.staff-actions, .screened-emails, .screened-urls, .screened-ip-addresses, .permalinks {

border-bottom: dotted 1px scale-color($primary, $lightness: 75%);
border-bottom: dotted 1px dark-light-choose(scale-color($primary, $lightness: 75%), scale-color($secondary, $lightness: 25%));

.heading-container {
width: 100%;
Expand Down
12 changes: 6 additions & 6 deletions app/assets/stylesheets/common/base/_topic-list.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh

}
th {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
font-weight: normal;
font-size: 1em;
button i.fa {color: scale-color($primary, $lightness: 50%);}
button i.fa {color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));}

}
td {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
font-size: 1em;
}

Expand All @@ -66,7 +66,7 @@ html.anon .topic-list a.title:visited:not(.badge-notification) {color: dark-ligh
.topic-excerpt {
font-size: 0.929em;
margin-top: 8px;
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
word-wrap: break-word;
line-height: 1.4;
padding-right: 20px;
Expand Down Expand Up @@ -243,7 +243,7 @@ ol.category-breadcrumb {
margin: 5px 0 10px;

.top-date-string {
color: scale-color($primary, $lightness: 60%);
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%));
font-weight: normal;
font-size: 0.7em;
text-transform: uppercase;
Expand Down Expand Up @@ -298,5 +298,5 @@ ol.category-breadcrumb {
}

div.education {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}
6 changes: 3 additions & 3 deletions app/assets/stylesheets/common/base/discourse.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@ body {
// is scale-color($primary, $lightness: 50%)
// numbers get dimmer as they get colder
.coldmap-high {
color: scale-color($primary, $lightness: 70%) !important;
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)) !important;
}
.coldmap-med {
color: scale-color($primary, $lightness: 60%) !important;
color: dark-light-choose(scale-color($primary, $lightness: 60%), scale-color($secondary, $lightness: 40%)) !important;
}
.coldmap-low {
color: scale-color($primary, $lightness: 50%) !important;
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)) !important;
}
.heatmap-high {
color: #fe7a15 !important;
Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/common/base/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@

// note these topic counts only appear for anons in the category hamburger drop down
b.topics-count {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
font-weight: normal;
font-size: 11px;
}
Expand Down Expand Up @@ -192,8 +192,8 @@

// Notifications
&#notifications-dropdown {
.fa { color: scale-color($primary, $lightness: 50%); }
.icon { color: scale-color($primary, $lightness: 30%); }
.fa { color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%)); }
.icon { color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%)); }
li {
background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
i {
Expand Down Expand Up @@ -298,7 +298,7 @@
margin: 5px 5px 0 5px;
.box {margin-top: 0;}
.badge-notification {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
background-color: transparent;
vertical-align: top;
padding: 5px 5px 2px 5px;
Expand Down Expand Up @@ -329,7 +329,7 @@
.topic-statuses {
float: none;
display: inline-block;
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
margin: 0;
.fa {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/common/base/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
float: auto;
}
p {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
margin: 0;
}
}
Expand All @@ -51,5 +51,5 @@ button#login-link, button#new-account-link
background: transparent;
padding-left: 0;
margin-left: 20px;
color: scale-color($primary, $lightness: 35%);
color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/base/notification-options.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.fa.muted {
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
}
.fa.tracking, .fa.watching {
color: $tertiary;
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/common/base/search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
line-height: 20px;
word-wrap: break-word;
clear: both;
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
.date {
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
}

.search-highlight {
color: scale-color($primary, $lightness: 25%);
color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/base/share_link.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.date {
float: right;
margin: 5px;
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}

input[type=text] {
Expand Down
12 changes: 6 additions & 6 deletions app/assets/stylesheets/common/base/topic-post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
overflow: hidden;
text-overflow: ellipsis;
a {
color: scale-color($primary, $lightness: 30%);
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
}
}
.fa {
font-size: 11px;
margin-left: 3px;
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
}
.new_user a, .user-title, .user-title a {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
Copy link

@greptile-apps greptile-apps bot Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: Both light and dark theme variants use 50% lightness - consider if this provides sufficient contrast differentiation between themes

}
}

Expand Down Expand Up @@ -52,7 +52,7 @@ aside.quote {
.title {
@include post-aside;

color: scale-color($primary, $lightness: 30%);
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
// IE will screw up the blockquote underneath if bottom padding is 0px
padding: 12px 12px 1px 12px;
// blockquote is underneath this and has top margin
Expand All @@ -68,7 +68,7 @@ aside.quote {
}

.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before {
color: scale-color($primary, $lightness: 70%);
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
}

.cooked .highlight {
Expand Down Expand Up @@ -156,7 +156,7 @@ aside.quote {
color: $wiki;
}
&.via-email {
color: scale-color($primary, $lightness: 70%);
color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
}
&.raw-email {
cursor: pointer;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/common/base/user-badges.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
.count {
display: block;
font-size: 0.8em;
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}
}
}
Expand Down Expand Up @@ -94,7 +94,7 @@ table.badges-listing {

td.grant-count {
text-align: center;
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
font-size: 120%;
}

Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/common/base/user.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,17 +116,17 @@

.username a {
font-weight: bold;
color: scale-color($primary, $lightness: 30%);
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
}

.name {
margin-left: 5px;
color: scale-color($primary, $lightness: 30%);
color: dark-light-choose(scale-color($primary, $lightness: 30%), scale-color($secondary, $lightness: 70%));
}

.title {
margin-top: 3px;
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}

}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/common/components/badges.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
font-size: 11px;
line-height: 1;
text-align: center;
background-color: scale-color($primary, $lightness: 70%);
background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
&[href] {
color: $secondary;
}
Expand Down Expand Up @@ -282,7 +282,7 @@
font-size: 1em;
line-height: 1;
&[href] {
color: scale-color($primary, $lightness: 40%);
color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 60%));
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common/components/buttons.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
&[disabled] {
background: dark-light-diff($primary, $secondary, 90%, -60%);
&:hover { color: scale-color($primary, $lightness: 70%); }
&:hover { color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%)); }
cursor: not-allowed;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/desktop/compose.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
margin-bottom: 10px;

i {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/desktop/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ and (max-width : 570px) {
}

.search-link .blurb {
color: scale-color($primary, $lightness: 45%);
color: dark-light-choose(scale-color($primary, $lightness: 45%), scale-color($secondary, $lightness: 55%));
display: block;
word-wrap: break-word;
font-size: 11px;
line-height: 1.3em;
.search-highlight {
color: scale-color($primary, $lightness: 25%);
color: dark-light-choose(scale-color($primary, $lightness: 25%), scale-color($secondary, $lightness: 75%));
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/desktop/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#login-form {
a {
color: scale-color($primary, $lightness: 35%);
color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%));
}
}

Expand Down Expand Up @@ -45,7 +45,7 @@

tr.instructions {
label {
color: scale-color($primary, $lightness: 50%);
color: dark-light-choose(scale-color($primary, $lightness: 50%), scale-color($secondary, $lightness: 50%));
}
}

Expand Down
Loading