Skip to content

Commit 2787fa9

Browse files
maxcommaxcom
committed
пофиксил цвета tango-light
+ убрал дублирование определений
1 parent 32acbca commit 2787fa9

10 files changed

Lines changed: 129 additions & 192 deletions

File tree

‎src/main/webapp/sass/_cal-heapmap.scss‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
@use "sass:color";
22

3-
:root {
4-
--heatmap-empty: #{color.grayscale(color.adjust($heatmap_max, $lightness: -20%*$heatmap_scale))};
5-
--heatmap-q1: #{color.adjust($heatmap_max, $lightness: -20%*$heatmap_scale)};
6-
--heatmap-q2: #{color.adjust($heatmap_max, $lightness: -15%*$heatmap_scale)};
7-
--heatmap-q3: #{color.adjust($heatmap_max, $lightness: -10%*$heatmap_scale)};
8-
--heatmap-q4: #{color.adjust($heatmap_max, $lightness: -5%*$heatmap_scale)};
9-
--heatmap-max: #{$heatmap_max};
10-
}
11-
123
.cal-heatmap-container {
134
display: block;
145
margin-bottom: 1em;

‎src/main/webapp/sass/tango/_colors-dark.scss‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/main/webapp/sass/tango/_colors-light.scss‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎src/main/webapp/sass/tango/_colors-vars.scss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ $icon_user_color: $signature_user_color;
5858

5959
$preview_border_color: var(--preview-border-color);
6060

61-
$heatmap_max: #8ae234;
62-
$heatmap_scale: 1.5;
63-
6461
$tracker_tag_color: $table_border_color;
6562

6663
$code_background: $main_background;

src/main/webapp/sass/tango/_colors-auto.scss renamed to src/main/webapp/sass/tango/_colors.scss

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,88 @@
1515

1616
@use "sass:color";
1717

18-
$heatmap_max: #73d216;
19-
$heatmap_scale: 1.5;
18+
@mixin dark {
19+
$heatmap_max: #8ae234;
20+
$heatmap_scale: 1.5;
21+
22+
:root {
23+
--main-background: #2e3436;
24+
--text-color: #babdb6;
25+
--link-color: #729fcf;
26+
--site-title-color: #eeeeec;
27+
--header-color: #d3d7cf;
28+
--blockquote-color: #909090;
29+
30+
--table-border-color: #555753;
31+
--table-link-color: #eeeeec;
32+
--table-hover-background: #5c3566;
33+
34+
--tag-color: #fcaf3e;
35+
--main-menu-color: #e9b96e;
36+
--signature-user-color: #8ae234;
37+
--signature-remark-color: #AAAAAA;
38+
--article-background: #272C2D;
39+
40+
--button-border-color: #babdb6;
41+
--button-selected-text-color: black;
42+
43+
--button-primary-background: #204a87;
44+
--button-danger-background: #a40000;
45+
--button-danger-text-color: #eeeeec;
46+
47+
--icon-button-active-color: #c17d11;
48+
49+
--tagpage-group-label-background: #8f5902;
50+
51+
--icon-reply-color: #729fcf;
52+
--unread-marker-color: #729fcf;
53+
--icon-pin-color: #e9b96e;
54+
55+
--preview-border-color: #c4a000;
56+
57+
--heatmap-empty: #{color.grayscale(color.adjust($heatmap_max, $lightness: -20%*$heatmap_scale))};
58+
--heatmap-q1: #{color.adjust($heatmap_max, $lightness: -20%*$heatmap_scale)};
59+
--heatmap-q2: #{color.adjust($heatmap_max, $lightness: -15%*$heatmap_scale)};
60+
--heatmap-q3: #{color.adjust($heatmap_max, $lightness: -10%*$heatmap_scale)};
61+
--heatmap-q4: #{color.adjust($heatmap_max, $lightness: -5%*$heatmap_scale)};
62+
--heatmap-max: #{$heatmap_max};
63+
64+
/*
65+
66+
Atom One Dark by Daniel Gamage
67+
Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
68+
69+
base: #282c34
70+
mono-1: #abb2bf
71+
mono-2: #818896
72+
mono-3: #5c6370
73+
hue-1: #56b6c2
74+
hue-2: #61aeee
75+
hue-3: #c678dd
76+
hue-4: #98c379
77+
hue-5: #e06c75
78+
hue-5-2: #be5046
79+
hue-6: #d19a66
80+
hue-6-2: #e6c07b
81+
82+
*/
83+
84+
--syntax-mono-1: #abb2bf;
85+
--syntax-mono-3: #5c6370;
86+
--syntax-hue-1: #56b6c2;
87+
--syntax-hue-2: #61aeee;
88+
--syntax-hue-3: #c678dd;
89+
--syntax-hue-4: #98c379;
90+
--syntax-hue-5: #e06c75;
91+
--syntax-hue-6: #d19a66;
92+
--syntax-hue-6-2: #e6c07b;
93+
}
94+
}
95+
96+
@mixin light {
97+
$heatmap_max: #73d216;
98+
$heatmap_scale: 1.5;
2099

21-
@media (prefers-color-scheme: light) {
22100
:root {
23101
--main-background: #d3d7cf;
24102
--text-color: #3b4245;

‎src/main/webapp/sass/tango/auto.scss‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@
1313
* limitations under the License.
1414
*/
1515

16-
@import "colors-dark";
17-
@import "colors-auto";
16+
@use "colors";
17+
18+
@include colors.dark;
19+
20+
@media (prefers-color-scheme: light) {
21+
@include colors.light;
22+
}
23+
1824
@import "colors-vars";
1925

2026
@import "reset";

‎src/main/webapp/sass/tango/dark.scss‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
* limitations under the License.
1414
*/
1515

16-
@import "colors-dark";
16+
@use "colors";
17+
18+
@include colors.dark;
19+
1720
@import "colors-vars";
1821

1922
@import "reset";

‎src/main/webapp/sass/tango/light.scss‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
* limitations under the License.
1414
*/
1515

16-
@import "colors-light";
16+
@use "colors";
17+
18+
@include colors.light;
19+
1720
@import "colors-vars";
1821

1922
@import "reset";

‎src/main/webapp/sass/zomg_ponies/_colors.scss‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,35 @@ $code_background: #400040;
6868
}
6969

7070
$unread_marker_color: #729fcf;
71+
72+
/*
73+
74+
Atom One Dark by Daniel Gamage
75+
Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
76+
77+
base: #282c34
78+
mono-1: #abb2bf
79+
mono-2: #818896
80+
mono-3: #5c6370
81+
hue-1: #56b6c2
82+
hue-2: #61aeee
83+
hue-3: #c678dd
84+
hue-4: #98c379
85+
hue-5: #e06c75
86+
hue-5-2: #be5046
87+
hue-6: #d19a66
88+
hue-6-2: #e6c07b
89+
90+
*/
91+
92+
:root {
93+
--syntax-mono-1: #abb2bf;
94+
--syntax-mono-3: #5c6370;
95+
--syntax-hue-1: #56b6c2;
96+
--syntax-hue-2: #61aeee;
97+
--syntax-hue-3: #c678dd;
98+
--syntax-hue-4: #98c379;
99+
--syntax-hue-5: #e06c75;
100+
--syntax-hue-6: #d19a66;
101+
--syntax-hue-6-2: #e6c07b;
102+
}

‎src/main/webapp/tango/syntax.css‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,3 @@
1-
/*
2-
3-
Atom One Dark by Daniel Gamage
4-
Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
5-
6-
base: #282c34
7-
mono-1: #abb2bf
8-
mono-2: #818896
9-
mono-3: #5c6370
10-
hue-1: #56b6c2
11-
hue-2: #61aeee
12-
hue-3: #c678dd
13-
hue-4: #98c379
14-
hue-5: #e06c75
15-
hue-5-2: #be5046
16-
hue-6: #d19a66
17-
hue-6-2: #e6c07b
18-
19-
*/
20-
21-
:root {
22-
--syntax-mono-1: #abb2bf;
23-
--syntax-mono-3: #5c6370;
24-
--syntax-hue-1: #56b6c2;
25-
--syntax-hue-2: #61aeee;
26-
--syntax-hue-3: #c678dd;
27-
--syntax-hue-4: #98c379;
28-
--syntax-hue-5: #e06c75;
29-
--syntax-hue-6: #d19a66;
30-
--syntax-hue-6-2: #e6c07b;
31-
}
32-
331
.hljs {
342
color: var(--syntax-mono-1);
353
/* background: #282c34; */

0 commit comments

Comments
 (0)