Skip to content

Commit 3f9e323

Browse files
silverwindsilverwind
authored
Various CSS tweaks (#21244)
- Remove arc-green specific rules and instead fix the colors in the base rules. - Make file table row border visible on arc-green. - Remove remnants of fomantic accordeon module that was removed.
1 parent 301d84e commit 3f9e323

File tree

5 files changed

+61
-99
lines changed

5 files changed

+61
-99
lines changed

‎web_src/fomantic/theme.config.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
@table : 'default';
5151

5252
/* Modules */
53-
@accordion : 'default';
5453
@calendar : 'default';
5554
@checkbox : 'default';
5655
@dimmer : 'default';

‎web_src/less/_base.less

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
--color-light: #00000006;
136136
--color-light-mimic-enabled: rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled)));
137137
--color-light-border: #0000001d;
138-
--color-hover: #0000000f;
138+
--color-hover: #0000000c;
139139
--color-active: #00000014;
140140
--color-menu: #ffffff;
141141
--color-card: #ffffff;
@@ -157,6 +157,7 @@
157157
--color-reaction-active-bg: var(--color-primary-alpha-20);
158158
--color-tooltip-bg: #000000f0;
159159
--color-tooltip-text: #ffffff;
160+
--color-header-bar: #ffffff;
160161
/* backgrounds */
161162
--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>');
162163
--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>');
@@ -294,6 +295,29 @@ a.commit-statuses-trigger {
294295
text-decoration: none !important;
295296
}
296297

298+
.ui.search > .results {
299+
background: var(--color-body);
300+
border-color: var(--color-secondary);
301+
}
302+
303+
.ui.search > .results .result {
304+
background: var(--color-body);
305+
}
306+
307+
.ui.search > .results .result .title {
308+
color: var(--color-text-dark);
309+
}
310+
311+
.ui.search > .results .result .image {
312+
width: auto;
313+
height: auto;
314+
}
315+
316+
.ui.search > .results .result:hover,
317+
.ui.category.search > .results .category .result:hover {
318+
background: var(--color-hover);
319+
}
320+
297321
.unselectable {
298322
-webkit-touch-callout: none;
299323
-webkit-user-select: none;
@@ -318,6 +342,11 @@ a.commit-statuses-trigger {
318342
color: var(--color-text-light-2);
319343
}
320344

345+
.ui.divider:not(.vertical,.horizontal) {
346+
border-top-color: var(--color-secondary) !important;
347+
border-bottom: none !important;
348+
}
349+
321350
.page-content {
322351
margin-top: 15px;
323352
}
@@ -449,6 +478,11 @@ a.commit-statuses-trigger {
449478
color: var(--color-text-light-2);
450479
}
451480

481+
.ui.list .list > .item > .content,
482+
.ui.list > .item > .content {
483+
color: var(--color-text);
484+
}
485+
452486
.ui.secondary.menu .dropdown.item:hover,
453487
.ui.secondary.menu .link.item:hover,
454488
.ui.secondary.menu a.item:hover {
@@ -656,10 +690,20 @@ a.ui.card:hover,
656690

657691
.ui.table {
658692
color: var(--color-text);
659-
background: var(--color-body);
693+
background: var(--color-box-body);
660694
border-color: var(--color-secondary);
661695
}
662696

697+
.ui.table th,
698+
.ui.table td {
699+
transition: none;
700+
}
701+
702+
.ui.table > tr > td,
703+
.ui.table > tbody > tr > td {
704+
border-top-color: var(--color-secondary-alpha-50);
705+
}
706+
663707
.ui.ui.selectable.table > tbody > tr:hover,
664708
.ui.table tbody tr td.selectable:hover {
665709
color: var(--color-text);
@@ -672,6 +716,11 @@ a.ui.card:hover,
672716
color: var(--color-text);
673717
}
674718

719+
.ui.table > thead > tr > th {
720+
background: var(--color-box-header);
721+
color: var(--color-text);
722+
}
723+
675724
.ui.modal {
676725
background: var(--color-body);
677726
}
@@ -750,7 +799,7 @@ a.ui.card:hover,
750799
margin: 0 !important;
751800

752801
&.light {
753-
background: var(--color-body);
802+
background: var(--color-header-bar);
754803
border-bottom: 1px solid var(--color-secondary);
755804
}
756805

‎web_src/less/_form.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ textarea:focus,
134134

135135
.form {
136136
.help {
137-
color: #999999;
137+
color: var(--color-secondary-dark-5);
138138
padding-bottom: .6em;
139139
display: inline-block;
140140
}

‎web_src/less/_repository.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@
384384
}
385385

386386
tr:hover {
387-
background-color: #ffffee;
387+
background-color: var(--color-hover);
388388
}
389389

390390
tr.has-parent a {
@@ -3013,9 +3013,9 @@ tbody.commit-list {
30133013
}
30143014

30153015
.tag-code,
3016-
.tag-code td {
3017-
background-color: #f0f9ff;
3018-
border-color: #f1f8ff !important;
3016+
.tag-code td,
3017+
.tag-code .blob-excerpt {
3018+
background-color: var(--color-box-body-highlight);
30193019
vertical-align: middle;
30203020
}
30213021

@@ -3031,7 +3031,7 @@ tbody.commit-list {
30313031
}
30323032

30333033
td.blob-excerpt {
3034-
background-color: #fafafa;
3034+
background-color: var(--color-secondary-alpha-30);
30353035
}
30363036

30373037
.issue-keyword {

‎web_src/less/themes/theme-arc-green.less

Lines changed: 3 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
/* target-based colors */
9595
--color-body: #383c4a;
9696
--color-box-header: #404652;
97-
--color-box-body: #303440;
97+
--color-box-body: #2a2e3a;
9898
--color-box-body-highlight: #353945;
9999
--color-text-dark: #dbe0ea;
100100
--color-text: #bbc0ca;
@@ -105,7 +105,7 @@
105105
--color-footer: #2e323e;
106106
--color-timeline: #4c525e;
107107
--color-input-text: #d5dbe6;
108-
--color-input-background: #292d39;
108+
--color-input-background: #232933;
109109
--color-input-border: #454a57;
110110
--color-input-border-hover: #505667;
111111
--color-navbar: #2a2e3a;
@@ -132,25 +132,13 @@
132132
--color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */
133133
--color-reaction-bg: #ffffff12;
134134
--color-reaction-active-bg: var(--color-primary-alpha-40);
135+
--color-header-bar: #2e323e;
135136
}
136137

137138
::-webkit-calendar-picker-indicator {
138139
filter: invert(.8);
139140
}
140141

141-
.ui.horizontal.segments > .segment {
142-
background-color: #383c4a;
143-
}
144-
145-
.following.bar.light {
146-
background: #2e323e;
147-
border-color: var(--color-secondary-alpha-40);
148-
}
149-
150-
.following.bar .top.menu a.item:hover {
151-
color: #fff;
152-
}
153-
154142
.ui.red.label,
155143
.ui.red.labels .label {
156144
background-color: #7d3434 !important;
@@ -163,10 +151,6 @@
163151
background-color: #936e00 !important;
164152
}
165153

166-
.ui.accordion .title:not(.ui) {
167-
color: #dbdbdb;
168-
}
169-
170154
.ui.green.label,
171155
.ui.green.labels .label,
172156
.ui.basic.green.label {
@@ -183,19 +167,6 @@ a.ui.basic.green.label:hover {
183167
color: #fff !important;
184168
}
185169

186-
.ui.divider:not(.vertical,.horizontal) {
187-
border-bottom-color: var(--color-secondary);
188-
border-top-color: transparent;
189-
}
190-
191-
.form .help {
192-
color: #7f8699;
193-
}
194-
195-
.ui .text.light.grey {
196-
color: #7f8699 !important;
197-
}
198-
199170
.ui.form .fields.error .field textarea,
200171
.ui.form .fields.error .field select,
201172
.ui.form .fields.error .field input:not([type]),
@@ -257,45 +228,6 @@ a.ui.basic.green.label:hover {
257228
background-color: #a0cc75;
258229
}
259230

260-
.ui.search > .results {
261-
background: #383c4a;
262-
border-color: var(--color-secondary);
263-
}
264-
265-
.ui.search > .results .result:hover,
266-
.ui.category.search > .results .category .result:hover {
267-
background: var(--color-secondary);
268-
}
269-
270-
.ui.search > .results .result .title {
271-
color: #dbdbdb;
272-
}
273-
274-
.ui.table > thead > tr > th {
275-
background: var(--color-secondary);
276-
color: #dbdbdb !important;
277-
}
278-
279-
.repository.file.list #repo-files-table tr {
280-
background: #2a2e3a;
281-
}
282-
283-
.repository.file.list #repo-files-table tr:hover {
284-
background-color: #393d4a !important;
285-
}
286-
287-
.overflow.menu .items .item {
288-
color: #9d9d9d;
289-
}
290-
291-
.overflow.menu .items .item:hover {
292-
color: #dbdbdb;
293-
}
294-
295-
.ui.list > .item > .content {
296-
color: var(--color-secondary-dark-6) !important;
297-
}
298-
299231
.repository .navbar .active.item,
300232
.repository .navbar .active.item:hover {
301233
border-color: transparent !important;
@@ -305,20 +237,6 @@ a.ui.basic.green.label:hover {
305237
border-color: var(--color-secondary);
306238
}
307239

308-
.tag-code,
309-
.tag-code td {
310-
background: #353945 !important;
311-
312-
}
313-
.tag-code td.lines-num {
314-
background-color: #3a3e4c !important;
315-
}
316-
317-
.tag-code td.lines-type-marker,
318-
td.blob-hunk {
319-
color: #dbdbdb !important;
320-
}
321-
322240
.ui.red.button,
323241
.ui.red.buttons .button {
324242
background-color: #7d3434;
@@ -344,10 +262,6 @@ td.blob-hunk {
344262
border-color: var(--color-secondary) !important;
345263
}
346264

347-
td.blob-excerpt {
348-
background-color: rgba(0, 0, 0, .15);
349-
}
350-
351265
.lines-code.active,
352266
.lines-code .active {
353267
background: #534d1b !important;

0 commit comments

Comments
 (0)