Skip to content

Commit 06a7ed4

Browse files
silverwindlunny
andauthored
Consolidate remaining colors into variables (#21582)
Remove remaining non-color variables in arc-green, so the theme is now 100% defined from variables (excluding inverts). Adjusted red/green to match previous overwritten colors. `--color-gold-light` is removed, it was unused and is not part of fomantic colors. <img width="772" alt="Screen Shot 2022-10-24 at 20 22 25" src="https://user-images.githubusercontent.com/115237/197599339-1d1bf6e3-aa90-4f38-9753-24effd4b178d.png"> <img width="275" alt="Screen Shot 2022-10-24 at 20 25 52" src="https://user-images.githubusercontent.com/115237/197599344-79c1d3ac-c709-4e30-a60b-4738af672c12.png"> <img width="446" alt="Screen Shot 2022-10-24 at 20 26 46" src="https://user-images.githubusercontent.com/115237/197599346-f2ef6449-7efd-4f81-bbb6-e7bee4528f50.png"> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 3bd0517 commit 06a7ed4

File tree

3 files changed

+370
-121
lines changed

3 files changed

+370
-121
lines changed

web_src/less/_base.less

Lines changed: 340 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
--color-pink: #e03997;
8080
--color-brown: #a5673f;
8181
--color-grey: #888888;
82-
--color-gold: #a1882b;
8382
/* light variants - produced via Sass scale-color(color, $lightness: +25%) */
8483
--color-red-light: #e45e5e;
8584
--color-orange-light: #f59555;
@@ -93,8 +92,8 @@
9392
--color-pink-light: #e86bb1;
9493
--color-brown-light: #c58b66;
9594
--color-grey-light: #a6a6a6;
96-
--color-gold-light: #cfb34a;
9795
/* other colors */
96+
--color-gold: #a1882b;
9897
--color-black: #1b1c1d;
9998
--color-white: #ffffff;
10099
--color-diff-removed-word-bg: #fdb8c0;
@@ -314,6 +313,299 @@ a.commit-statuses-trigger {
314313
text-decoration: none !important;
315314
}
316315

316+
.ui.red.labels .label,
317+
.ui.ui.ui.red.label,
318+
.ui.red.button,
319+
.ui.red.buttons .button {
320+
background: var(--color-red);
321+
}
322+
.ui.red.button:hover,
323+
.ui.red.buttons .button:hover {
324+
background: var(--color-red-light);
325+
}
326+
.ui.basic.red.buttons .button,
327+
.ui.basic.red.button {
328+
color: var(--color-red);
329+
border-color: var(--color-red);
330+
}
331+
.ui.basic.red.buttons .button:hover,
332+
.ui.basic.red.button:hover {
333+
color: var(--color-red-light);
334+
border-color: var(--color-red-light);
335+
}
336+
337+
.ui.orange.labels .label,
338+
.ui.ui.ui.orange.label,
339+
.ui.orange.button,
340+
.ui.orange.buttons .button {
341+
background: var(--color-orange);
342+
}
343+
.ui.orange.button:hover,
344+
.ui.orange.buttons .button:hover {
345+
background: var(--color-orange-light);
346+
}
347+
.ui.basic.orange.buttons .button,
348+
.ui.basic.orange.button {
349+
color: var(--color-orange);
350+
border-color: var(--color-orange);
351+
}
352+
.ui.basic.orange.buttons .button:hover,
353+
.ui.basic.orange.button:hover {
354+
color: var(--color-orange-light);
355+
border-color: var(--color-orange-light);
356+
}
357+
358+
.ui.yellow.labels .label,
359+
.ui.ui.ui.yellow.label,
360+
.ui.yellow.button,
361+
.ui.yellow.buttons .button {
362+
background: var(--color-yellow);
363+
}
364+
.ui.yellow.button:hover,
365+
.ui.yellow.buttons .button:hover {
366+
background: var(--color-yellow-light);
367+
}
368+
.ui.basic.yellow.buttons .button,
369+
.ui.basic.yellow.button {
370+
color: var(--color-yellow);
371+
border-color: var(--color-yellow);
372+
}
373+
.ui.basic.yellow.buttons .button:hover,
374+
.ui.basic.yellow.button:hover {
375+
color: var(--color-yellow-light);
376+
border-color: var(--color-yellow-light);
377+
}
378+
379+
.ui.olive.labels .label,
380+
.ui.ui.ui.olive.label,
381+
.ui.olive.button,
382+
.ui.olive.buttons .button {
383+
background: var(--color-olive);
384+
}
385+
.ui.olive.button:hover,
386+
.ui.olive.buttons .button:hover {
387+
background: var(--color-olive-light);
388+
}
389+
.ui.basic.olive.buttons .button,
390+
.ui.basic.olive.button {
391+
color: var(--color-olive);
392+
border-color: var(--color-olive);
393+
}
394+
.ui.basic.olive.buttons .button:hover,
395+
.ui.basic.olive.button:hover {
396+
color: var(--color-olive-light);
397+
border-color: var(--color-olive-light);
398+
}
399+
400+
.ui.green.labels .label,
401+
.ui.ui.ui.green.label,
402+
.ui.green.button,
403+
.ui.green.buttons .button {
404+
background: var(--color-green);
405+
}
406+
.ui.green.button:hover,
407+
.ui.green.buttons .button:hover {
408+
background: var(--color-green-light);
409+
}
410+
.ui.basic.green.buttons .button,
411+
.ui.basic.green.button {
412+
color: var(--color-green);
413+
border-color: var(--color-green);
414+
}
415+
.ui.basic.green.buttons .button:hover,
416+
.ui.basic.green.button:hover {
417+
color: var(--color-green-light);
418+
border-color: var(--color-green-light);
419+
}
420+
421+
.ui.teal.labels .label,
422+
.ui.ui.ui.teal.label,
423+
.ui.teal.button,
424+
.ui.teal.buttons .button {
425+
background: var(--color-teal);
426+
}
427+
.ui.teal.button:hover,
428+
.ui.teal.buttons .button:hover {
429+
background: var(--color-teal-light);
430+
}
431+
.ui.basic.teal.buttons .button,
432+
.ui.basic.teal.button {
433+
color: var(--color-teal);
434+
border-color: var(--color-teal);
435+
}
436+
.ui.basic.teal.buttons .button:hover,
437+
.ui.basic.teal.button:hover {
438+
color: var(--color-teal-light);
439+
border-color: var(--color-teal-light);
440+
}
441+
442+
.ui.blue.labels .label,
443+
.ui.ui.ui.blue.label,
444+
.ui.blue.button,
445+
.ui.blue.buttons .button {
446+
background: var(--color-blue);
447+
}
448+
.ui.blue.button:hover,
449+
.ui.blue.buttons .button:hover {
450+
background: var(--color-blue-light);
451+
}
452+
.ui.basic.blue.buttons .button,
453+
.ui.basic.blue.button {
454+
color: var(--color-blue);
455+
border-color: var(--color-blue);
456+
}
457+
.ui.basic.blue.buttons .button:hover,
458+
.ui.basic.blue.button:hover {
459+
color: var(--color-blue-light);
460+
border-color: var(--color-blue-light);
461+
}
462+
463+
.ui.violet.labels .label,
464+
.ui.ui.ui.violet.label,
465+
.ui.violet.button,
466+
.ui.violet.buttons .button {
467+
background: var(--color-violet);
468+
}
469+
.ui.violet.button:hover,
470+
.ui.violet.buttons .button:hover {
471+
background: var(--color-violet-light);
472+
}
473+
.ui.basic.violet.buttons .button,
474+
.ui.basic.violet.button {
475+
color: var(--color-violet);
476+
border-color: var(--color-violet);
477+
}
478+
.ui.basic.violet.buttons .button:hover,
479+
.ui.basic.violet.button:hover {
480+
color: var(--color-violet-light);
481+
border-color: var(--color-violet-light);
482+
}
483+
484+
.ui.purple.labels .label,
485+
.ui.ui.ui.purple.label,
486+
.ui.purple.button,
487+
.ui.purple.buttons .button {
488+
background: var(--color-purple);
489+
}
490+
.ui.purple.button:hover,
491+
.ui.purple.buttons .button:hover {
492+
background: var(--color-purple-light);
493+
}
494+
.ui.basic.purple.buttons .button,
495+
.ui.basic.purple.button {
496+
color: var(--color-purple);
497+
border-color: var(--color-purple);
498+
}
499+
.ui.basic.purple.buttons .button:hover,
500+
.ui.basic.purple.button:hover {
501+
color: var(--color-purple-light);
502+
border-color: var(--color-purple-light);
503+
}
504+
505+
.ui.pink.labels .label,
506+
.ui.ui.ui.pink.label,
507+
.ui.pink.button,
508+
.ui.pink.buttons .button {
509+
background: var(--color-pink);
510+
}
511+
.ui.pink.button:hover,
512+
.ui.pink.buttons .button:hover {
513+
background: var(--color-pink-light);
514+
}
515+
.ui.basic.pink.buttons .button,
516+
.ui.basic.pink.button {
517+
color: var(--color-pink);
518+
border-color: var(--color-pink);
519+
}
520+
.ui.basic.pink.buttons .button:hover,
521+
.ui.basic.pink.button:hover {
522+
color: var(--color-pink-light);
523+
border-color: var(--color-pink-light);
524+
}
525+
526+
.ui.brown.labels .label,
527+
.ui.ui.ui.brown.label,
528+
.ui.brown.button,
529+
.ui.brown.buttons .button {
530+
background: var(--color-brown);
531+
}
532+
.ui.brown.button:hover,
533+
.ui.brown.buttons .button:hover {
534+
background: var(--color-brown-light);
535+
}
536+
.ui.basic.brown.buttons .button,
537+
.ui.basic.brown.button {
538+
color: var(--color-brown);
539+
border-color: var(--color-brown);
540+
}
541+
.ui.basic.brown.buttons .button:hover,
542+
.ui.basic.brown.button:hover {
543+
color: var(--color-brown-light);
544+
border-color: var(--color-brown-light);
545+
}
546+
547+
.ui.grey.labels .label,
548+
.ui.ui.ui.grey.label,
549+
.ui.grey.button,
550+
.ui.grey.buttons .button {
551+
background: var(--color-grey);
552+
}
553+
.ui.grey.button:hover,
554+
.ui.grey.buttons .button:hover {
555+
background: var(--color-grey-light);
556+
}
557+
.ui.basic.grey.buttons .button,
558+
.ui.basic.grey.button {
559+
color: var(--color-grey);
560+
border-color: var(--color-grey);
561+
}
562+
.ui.basic.grey.buttons .button:hover,
563+
.ui.basic.grey.button:hover {
564+
color: var(--color-grey-light);
565+
border-color: var(--color-grey-light);
566+
}
567+
568+
.ui.black.labels .label,
569+
.ui.ui.ui.black.label,
570+
.ui.black.button,
571+
.ui.black.buttons .button {
572+
background: var(--color-black);
573+
}
574+
.ui.black.button:hover,
575+
.ui.black.buttons .button:hover {
576+
background: var(--color-black-light);
577+
}
578+
.ui.basic.black.buttons .button,
579+
.ui.basic.black.button {
580+
color: var(--color-black);
581+
border-color: var(--color-black);
582+
}
583+
.ui.basic.black.buttons .button:hover,
584+
.ui.basic.black.button:hover {
585+
color: var(--color-black-light);
586+
border-color: var(--color-black-light);
587+
}
588+
589+
.ui.negative.buttons .button,
590+
.ui.negative.button {
591+
background: var(--color-red);
592+
}
593+
594+
.ui.negative.buttons .button:hover,
595+
.ui.negative.button:hover {
596+
background: var(--color-red-light);
597+
}
598+
599+
.ui.positive.buttons .button,
600+
.ui.positive.button {
601+
background: var(--color-green);
602+
}
603+
604+
.ui.positive.buttons .button:hover,
605+
.ui.positive.button:hover {
606+
background: var(--color-green-light);
607+
}
608+
317609
.ui.search > .results {
318610
background: var(--color-body);
319611
border-color: var(--color-secondary);
@@ -958,6 +1250,52 @@ a.ui.card:hover,
9581250
opacity: .35;
9591251
}
9601252

1253+
.ui.form .fields.error .field textarea,
1254+
.ui.form .fields.error .field select,
1255+
.ui.form .fields.error .field input:not([type]),
1256+
.ui.form .fields.error .field input[type="date"],
1257+
.ui.form .fields.error .field input[type="datetime-local"],
1258+
.ui.form .fields.error .field input[type="email"],
1259+
.ui.form .fields.error .field input[type="number"],
1260+
.ui.form .fields.error .field input[type="password"],
1261+
.ui.form .fields.error .field input[type="search"],
1262+
.ui.form .fields.error .field input[type="tel"],
1263+
.ui.form .fields.error .field input[type="time"],
1264+
.ui.form .fields.error .field input[type="text"],
1265+
.ui.form .fields.error .field input[type="file"],
1266+
.ui.form .fields.error .field input[type="url"],
1267+
.ui.form .field.error textarea,
1268+
.ui.form .field.error select,
1269+
.ui.form .field.error input:not([type]),
1270+
.ui.form .field.error input[type="date"],
1271+
.ui.form .field.error input[type="datetime-local"],
1272+
.ui.form .field.error input[type="email"],
1273+
.ui.form .field.error input[type="number"],
1274+
.ui.form .field.error input[type="password"],
1275+
.ui.form .field.error input[type="search"],
1276+
.ui.form .field.error input[type="tel"],
1277+
.ui.form .field.error input[type="time"],
1278+
.ui.form .field.error input[type="text"],
1279+
.ui.form .field.error input[type="file"],
1280+
.ui.form .field.error input[type="url"],
1281+
.ui.form .field.error select:focus,
1282+
.ui.form .field.error input:not([type]):focus,
1283+
.ui.form .field.error input[type="date"]:focus,
1284+
.ui.form .field.error input[type="datetime-local"]:focus,
1285+
.ui.form .field.error input[type="email"]:focus,
1286+
.ui.form .field.error input[type="number"]:focus,
1287+
.ui.form .field.error input[type="password"]:focus,
1288+
.ui.form .field.error input[type="search"]:focus,
1289+
.ui.form .field.error input[type="tel"]:focus,
1290+
.ui.form .field.error input[type="time"]:focus,
1291+
.ui.form .field.error input[type="text"]:focus,
1292+
.ui.form .field.error input[type="file"]:focus,
1293+
.ui.form .field.error input[type="url"]:focus {
1294+
background-color: var(--color-error-bg);
1295+
border: 1px solid var(--color-error-border);
1296+
color: var(--color-error-text);
1297+
}
1298+
9611299
.ui.loading.loading.input > i.icon svg {
9621300
visibility: hidden;
9631301
}

web_src/less/markup/content.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@
540540
}
541541

542542
.markup-block-error {
543+
border: 1px solid var(--color-error-border) !important;
543544
margin-bottom: 0 !important;
544545
border-bottom-left-radius: 0 !important;
545546
border-bottom-right-radius: 0 !important;

0 commit comments

Comments
 (0)