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

CSS color enhancements #21534

Merged
merged 11 commits into from
Oct 23, 2022
Merged

CSS color enhancements #21534

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0707598
CSS enhancements
silverwind Oct 21, 2022
b7f15f9
add new color to arc-green as well
silverwind Oct 21, 2022
92ed1bd
add back important
silverwind Oct 21, 2022
afddeda
remove padding styles
silverwind Oct 21, 2022
73f2bc2
shift accent-color by one notch
silverwind Oct 21, 2022
a9b2b9d
Update web_src/less/_base.less
silverwind Oct 21, 2022
21b94e0
Update web_src/less/_base.less
silverwind Oct 21, 2022
45682d4
tweak --color-accent
silverwind Oct 21, 2022
465a4e0
Update web_src/less/_review.less
silverwind Oct 21, 2022
6361b69
restart ci
silverwind Oct 22, 2022
0ae3e6c
Merge branch 'main' into csstweaks26
lunny Oct 23, 2022
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
27 changes: 21 additions & 6 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
--height-loading: 12rem;
/* base colors */
--color-primary: #4183c4;
--color-primary-contrast: #ffffff;
--color-primary-dark-1: #3876b3;
--color-primary-dark-2: #31699f;
--color-primary-dark-3: #2b5c8b;
Expand Down Expand Up @@ -163,9 +164,11 @@
--color-tooltip-text: #ffffff;
--color-header-bar: #ffffff;
--color-label-active-bg: #d0d0d0;
--color-accent: var(--color-primary-light-1);
--color-small-accent: var(--color-primary-light-6);
--color-accent: var(--color-primary-light-4);
--color-active-line: #fffbdd;

accent-color: var(--color-accent);
}

:root * {
Expand Down Expand Up @@ -230,10 +233,10 @@ progress::-webkit-progress-bar {
background: var(--color-secondary-dark-1);
}
progress::-webkit-progress-value {
background-color: var(--color-secondary-dark-4);
background-color: var(--color-accent);
}
progress::-moz-progress-bar {
background: var(--color-secondary-dark-4);
background-color: var(--color-accent);
}

* {
Expand All @@ -260,6 +263,17 @@ progress::-moz-progress-bar {
background: transparent;
}

::file-selector-button {
border: 1px solid var(--color-light-border);
color: var(--color-text-light);
background: var(--color-light);
border-radius: var(--border-radius);
}
::file-selector-button:hover {
color: var(--color-text);
background: var(--color-hover);
}

::selection {
background: var(--color-primary-light-1) !important;
color: var(--color-white) !important;
Expand Down Expand Up @@ -1598,11 +1612,11 @@ footer {

.activity-bar-graph {
background-color: var(--color-primary);
color: #fff;
color: var(--color-primary-contrast);
}

.activity-bar-graph-alt {
color: #fff;
color: var(--color-primary-contrast);
}

.archived-icon {
Expand Down Expand Up @@ -1899,6 +1913,7 @@ a.ui.label:hover {
.ui.primary.button,
.ui.primary.buttons .button {
background-color: var(--color-primary) !important;
color: var(--color-primary-contrast) !important;
}

.ui.primary.button:hover,
Expand All @@ -1914,7 +1929,7 @@ a.ui.label:hover {
.ui.basic.primary.button,
.ui.basic.primary.buttons .button {
box-shadow: inset 0 0 0 1px var(--color-primary) !important;
color: #fff !important;
color: var(--color-primary-contrast) !important;
}

.ui.basic.primary.button:hover,
Expand Down
8 changes: 4 additions & 4 deletions web_src/less/_review.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ a.blob-excerpt {

a.blob-excerpt:hover {
background: var(--color-primary);
color: #fff;
color: var(--color-primary-contrast);
}

// See the comment of createCommentEasyMDE() for the review editor
Expand Down Expand Up @@ -244,7 +244,7 @@ a.blob-excerpt:hover {

#review-box .review-comments-counter {
background-color: var(--color-primary-light-4);
color: #fff;
color: var(--color-primary-contrast);
}

#review-box:hover .review-comments-counter {
Expand Down Expand Up @@ -275,11 +275,11 @@ a.blob-excerpt:hover {
.viewed-file-form {
display: flex;
align-items: center;
border: 1px none;
padding: 4px 8px;
margin: -8px 0; // just like other buttons in the diff box header
border-radius: .285rem; // just like .ui.tiny.button
font-size: .857rem; // just like .ui.tiny.button
border: 1px solid transparent;
silverwind marked this conversation as resolved.
Show resolved Hide resolved
}

.viewed-file-form input {
Expand All @@ -288,7 +288,7 @@ a.blob-excerpt:hover {

.viewed-file-checked-form {
background-color: var(--color-small-accent);
border: 1px solid var(--color-accent);
border-color: var(--color-accent);
}

#viewed-files-summary {
Expand Down
2 changes: 1 addition & 1 deletion web_src/less/_tribute.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
.tribute-container li.highlight,
.tribute-container li:hover {
background: var(--color-primary) !important;
color: #ffffff !important;
color: var(--color-primary-contrast) !important;
}

.tribute-item {
Expand Down
3 changes: 2 additions & 1 deletion web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:root {
--is-dark-theme: true;
--color-primary: #87ab63;
--color-primary-contrast: #ffffff;
--color-primary-dark-1: #93b373;
--color-primary-dark-2: #9fbc82;
--color-primary-dark-3: #abc492;
Expand Down Expand Up @@ -135,8 +136,8 @@
--color-reaction-active-bg: var(--color-primary-alpha-40);
--color-header-bar: #2e323e;
--color-label-active-bg: #4c525e;
--color-accent: var(--color-primary-light-1);
--color-small-accent: var(--color-primary-light-5);
--color-accent: var(--color-primary-light-3);
--color-active-line: #534d1b;
}

Expand Down