Skip to content
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

Jump to bottom

fix: color definition fixes #140

Merged
merged 10 commits into from
Nov 23, 2024
Merged

fix: color definition fixes #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9ba9c99
fix: color defintion update
a2937 Nov 23, 2024
d1e77b3
try to define extra variables
a2937 Nov 23, 2024
431c26d
danger missing
a2937 Nov 23, 2024
7feeb4f
gray?
a2937 Nov 23, 2024
212d2b0
remove bad hover
a2937 Nov 23, 2024
84ce28e
gray 10
a2937 Nov 23, 2024
86dba5b
fix typo
a2937 Nov 23, 2024
78e10da
gray0
a2937 Nov 23, 2024
a5b445e
highlight background?
a2937 Nov 23, 2024
0540f46
proper color at last
a2937 Nov 23, 2024
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
12 changes: 7 additions & 5 deletions common/color_definitions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ $--gray05: mix($header_background, $header_primary, 7%);
$--gray00: mix($header_background, $header_primary, 0%);

:root {
--primary: #{$primary};
--secondary: #{$secondary};
--tertiary: #{tertiary};
--primary-low: #{$primary-low};
--primary-very-low: #{$primary-very-low};
--fcc-primary-color: #{mix($primary, $secondary, 100%)};
--fcc-secondary-color: #{mix($primary, $secondary, 93%)};
--fcc-tertiary-color: #{mix($primary, $secondary, 87%)};
Expand All @@ -44,18 +43,21 @@ $--gray00: mix($header_background, $header_primary, 0%);
--fcc-highlight-color: #{$tertiary};
--secondary-header-background: #{mix($header_primary, $header_background, 93%)};

--gray90: #{mix($header_background, $header_primary, 100%)};
--gray90: #{$--gray90};
--gray85: #{mix($header_background, $header_primary, 93%)};
--gray75: #{mix($header_background, $header_primary, 80%)};
--gray65: #{mix($header_background, $header_primary, 67%)};
--gray45: #{mix($header_background, $header_primary, 50%)};
--gray10: #{$--gray10};
--gray05: #{mix($header_background, $header_primary, 7%)};
--gray00: #{mix($header_background, $header_primary, 0%)};
--gray00: #{$--gray00};


--fcc-d-hover: rgba(var(--primary), 0.08);
--dark-blue: #002ead;
--blue-50: #198eee;
--header_primary: #fff;
--header_background: #0a0a23;
--fcc-highlight-mid: #{$fcc-highlight-mid};
--fcc-highlight-background: #{$fcc-highlight-background};
}
16 changes: 8 additions & 8 deletions common/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ a.curriculum-nav {
a.curriculum-nav:hover,
a.curriculum-nav:focus {
color: var(--gray90);
background: var(--gray00);
background-color: var(--secondary);
}

.navigation-container {
Expand Down Expand Up @@ -532,11 +532,11 @@ html.whos-online-ring.desktop-view body.user-page-online .primary img.avatar {

//main page grid ----------------------------
td.poster-names a {
color: dark-light-choose($primary-medium, $secondary-medium);
color: dark-light-choose(var(--primary-medium), var(--secondary-medium));
}

#whos-online {
color: dark-light-choose($primary-medium, $secondary-medium) !important;
color: dark-light-choose(var(--primary-medium), var(--secondary-medium)) !important;
}

//buttons ----------------------------
Expand Down Expand Up @@ -627,7 +627,7 @@ div.select-kit-header {
#reply-control .btn-mini-toggle:hover,
#reply-control .btn-mini-toggle:focus {
.d-icon {
color: $secondary;
color: var(--secondary);
}
}

Expand Down Expand Up @@ -674,7 +674,7 @@ div.select-kit-header {
clear: both;
margin-bottom: 5px;
.combo-box .combo-box-header {
background: $secondary;
background: var(--secondary);
color: var(--primary);
border: 3px solid var(--primary);
padding: 6px 12px;
Expand Down Expand Up @@ -716,7 +716,7 @@ div.select-kit-header {
.latest-topic-list-item.visited,
.category-topic-link.visited {
a.title:not(.badge-notification) {
color: var(--primary)-medium;
color: var(--primary-medium);
}
}

Expand All @@ -730,12 +730,12 @@ div.select-kit-header {

.anon & {
a.title:visited:not(.badge-notification) {
color: var(--primary)-medium;
color: var(--primary-medium);
}
}

a.title.visited:not(.badge-notification) {
color: var(--primary)-medium;
color: var(--primary-medium);
}
}

Expand Down
Loading