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

Consolidate more CSS rules, fix inline code on arc-green #21260

Merged
merged 5 commits into from
Sep 28, 2022
Merged

Consolidate more CSS rules, fix inline code on arc-green #21260

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e508339
Consolidate more CSS rules, fix inline code on arc-green
silverwind Sep 25, 2022
e084b5f
add border color to labels
silverwind Sep 26, 2022
9bf6b58
rename variable to color-label-active-bg
silverwind Sep 26, 2022
e75239d
Merge branch 'main' into csstweaks24
silverwind Sep 26, 2022
500502d
Merge branch 'main' into csstweaks24
wxiaoguang Sep 28, 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
37 changes: 36 additions & 1 deletion web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@
--color-tooltip-bg: #000000f0;
--color-tooltip-text: #ffffff;
--color-header-bar: #ffffff;
--color-label-active-bg: #d0d0d0;
/* backgrounds */
--checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
Expand Down Expand Up @@ -393,6 +394,12 @@ a.commit-statuses-trigger {
background: var(--color-grey);
}

.ui.active.label {
background: var(--color-label-active-bg);
border-color: var(--color-label-active-bg);
color: var(--color-text-dark);
}

.ui.link.menu .item:hover,
.ui.menu .dropdown.item:hover,
.ui.menu .link.item:hover,
Expand Down Expand Up @@ -478,11 +485,21 @@ a.commit-statuses-trigger {
color: var(--color-text-light-2);
}

.ui.list .list > .item .header,
.ui.list > .item .header {
color: var(--color-text-dark);
}

.ui.list .list > .item > .content,
.ui.list > .item > .content {
color: var(--color-text);
}

.ui.list .list > .item .description,
.ui.list > .item .description {
color: var(--color-text);
}

.ui.secondary.menu .dropdown.item:hover,
.ui.secondary.menu .link.item:hover,
.ui.secondary.menu a.item:hover {
Expand Down Expand Up @@ -704,6 +721,12 @@ a.ui.card:hover,
border-top-color: var(--color-secondary-alpha-50);
}

.ui.ui.ui.ui.table tr.active,
.ui.ui.table td.active {
color: var(--color-text);
background: var(--color-active);
}

.ui.ui.selectable.table > tbody > tr:hover,
.ui.table tbody tr td.selectable:hover {
color: var(--color-text);
Expand All @@ -726,11 +749,22 @@ a.ui.card:hover,
}

.ui.modal > .header {
color: var(--color-text-dark);
background: var(--color-secondary-bg);
border-color: var(--color-secondary);
border-top-left-radius: var(--border-radius);
border-top-right-radius: var(--border-radius);
}

.ui.modal > .content {
background: var(--color-body);
}

.ui.modal > .actions {
background: var(--color-secondary-bg);
border-color: var(--color-secondary);
}

.ui.modal > .close.inside,
.ui.fullscreen.modal > .close {
top: 11px; /* align modal close icon, for example admin notices */
Expand Down Expand Up @@ -1591,6 +1625,7 @@ i.icon.centerlock {
.ui.labels a.label:hover,
a.ui.label:hover {
background: var(--color-hover);
border-color: var(--color-hover);
color: var(--color-text);
}

Expand All @@ -1615,7 +1650,7 @@ a.ui.label:hover {
padding-left: 10px;
padding-right: 10px;
text-align: right !important;
color: rgba(27, 31, 35, .3);
color: var(--color-text-light-1);
width: 1%;
font-family: var(--fonts-monospace);

Expand Down
48 changes: 2 additions & 46 deletions 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 @@ -118,7 +118,7 @@
--color-menu: #2e323e;
--color-card: #2e323e;
--color-markup-table-row: #ffffff06;
--color-markup-code-block: #292d39;
--color-markup-code-block: #ffffff0d;
--color-button: #353846;
--color-code-bg: #2a2e3a;
--color-code-sidebar-bg: #2e323e;
Expand All @@ -133,6 +133,7 @@
--color-reaction-bg: #ffffff12;
--color-reaction-active-bg: var(--color-primary-alpha-40);
--color-header-bar: #2e323e;
--color-label-active-bg: #4c525e;
}

::-webkit-calendar-picker-indicator {
Expand Down Expand Up @@ -228,11 +229,6 @@ a.ui.basic.green.label:hover {
background-color: #a0cc75;
}

.repository .navbar .active.item,
.repository .navbar .active.item:hover {
border-color: transparent !important;
}

.repository .diff-stats li {
border-color: var(--color-secondary);
}
Expand All @@ -247,37 +243,11 @@ a.ui.basic.green.label:hover {
background-color: #984646;
}

.ui.list .list > .item .header,
.ui.list > .item .header {
color: #dedede;
}

.ui.list .list > .item .description,
.ui.list > .item .description {
color: var(--color-secondary-dark-6);
}

.lines-num {
color: var(--color-secondary-dark-6) !important;
border-color: var(--color-secondary) !important;
}

.lines-code.active,
.lines-code .active {
background: #534d1b !important;
}

.ui.ui.ui.ui.table tr.active,
.ui.ui.table td.active {
color: #dbdbdb;
}

.ui.active.label {
background: #393d4a;
border-color: #393d4a;
color: #dbdbdb;
}

.ui.header .sub.header {
color: var(--color-secondary-dark-6);
}
Expand All @@ -286,20 +256,6 @@ a.ui.basic.green.label:hover {
border-bottom: 1px solid var(--color-secondary);
}

.ui.modal > .header {
background: var(--color-secondary);
color: #dbdbdb;
}

.ui.modal > .actions {
background: var(--color-secondary);
border-color: var(--color-secondary);
}

.ui.modal > .content {
background: #383c4a;
}

.minicolors-panel {
background: var(--color-secondary) !important;
border-color: #6a737d !important;
Expand Down