Skip to content

Commit 00656a4

Browse files
solarrustskorobaeusigsekor
authored
👻 Hocus Pocus (#1208)
* Добавляет хэллоуинские цвета * Обращает булочку в вампира * Накладывает заклинание на переключатель тем * Делает цвета дружелюбнее --------- Co-authored-by: Svetlana Korobtseva <wizzzjer@gmail.com> Co-authored-by: Igor Korovchenko <igsekor@gmail.com>
1 parent 6c58b3c commit 00656a4

File tree

7 files changed

+50
-5
lines changed

7 files changed

+50
-5
lines changed

src/includes/blocks/logo.njk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
{% endset %}
1212

1313
{% set defaultLetters %}
14-
U<span class="logo__eye">•</span><span class="logo__nose">ᴥ</span><span class="logo__eye">•</span>U
14+
<!-- U<span class="logo__eye">•</span><span class="logo__nose">ᴥ</span><span class="logo__eye">•</span>U-->
15+
<!-- собака-вампиряка -->
16+
U<span class="logo__eye">•̀</span><span class="logo__nose">ᵥᵥ</span><span class="logo__eye">•́</span>U
1517
{% endset %}
1618
{% set letters = letters if letters else defaultLetters %}
1719

src/scripts/modules/logo.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@ class Logo {
2121

2222
setFocusOnElement() {
2323
this.refs.symbols.innerHTML =
24-
'U<span class="logo__eye">&gt;</span><span class="logo__nose">ᴥ</span><span class="logo__eye">&lt;</span>U'
24+
// собака-вампиряка (только нос)
25+
'U<span class="logo__eye">&gt;</span><span class="logo__nose">ᵥᵥ</span><span class="logo__eye">&lt;</span>U'
2526
}
2627

2728
unsetFocusOnElement() {
2829
this.refs.symbols.innerHTML =
29-
'U<span class="logo__eye">•</span><span class="logo__nose">ᴥ</span><span class="logo__eye">•</span>U'
30+
// 'U<span class="logo__eye">•</span><span class="logo__nose">ᴥ</span><span class="logo__eye">•</span>U'
31+
// собака-вампиряка
32+
'U<span class="logo__eye">•̀</span><span class="logo__nose">ᵥᵥ</span><span class="logo__eye">•́</span>U'
3033
}
3134

3235
startAnimation() {

src/scripts/modules/theme-toggle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function hasStoredTheme() {
3232

3333
function getCurrentTheme() {
3434
const storedTheme = store.getItem(STORAGE_KEY)
35-
return storedTheme || THEMES.AUTO
35+
return storedTheme || THEMES.DARK
3636
}
3737

3838
function setCurrentTheme(theme) {

src/styles/base-colors.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,22 @@
1515
--color-violet: 276 100% 72%;
1616
--color-aquamarine: 162 90% 51%;
1717

18+
/*
1819
--color-base-html: hsl(var(--color-orange));
1920
--color-base-css: hsl(var(--color-blue));
2021
--color-base-js: hsl(var(--color-yellow));
2122
--color-base-tools: hsl(var(--color-green));
2223
--color-base-recipes: hsl(var(--color-violet));
2324
--color-base-a11y: hsl(var(--color-aquamarine));
25+
*/
26+
27+
/* Цвет для Хэлоуина */
28+
--boo-color: 15 97% 59%;
29+
30+
--color-base-html: hsl(var(--boo-color));
31+
--color-base-css: hsl(var(--boo-color));
32+
--color-base-js: hsl(var(--boo-color));
33+
--color-base-tools: hsl(var(--boo-color));
34+
--color-base-recipes: hsl(var(--boo-color));
35+
--color-base-a11y: hsl(var(--boo-color));
2436
}

src/styles/blocks/logo.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@
106106
font-size: calc(var(--image-font-size) * 10 / 7);
107107
line-height: calc(var(--image-font-size) * 7 / 10);
108108
top: -0.015em;
109-
letter-spacing: calc(var(--logo-letter-spacing) * 1.5);
109+
110+
/* letter-spacing: calc(var(--logo-letter-spacing) * 1.5); */
111+
112+
/* собака-вампиряка */
113+
letter-spacing: calc(var(--logo-letter-spacing) * 2);
110114
}
111115

112116
.logo__text {

src/styles/dark-theme.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,25 @@
1414
--color-background: hsl(var(--color-dark));
1515
--color-fade: hsl(220 7% 25%);
1616

17+
/*
1718
--color-html: hsl(25 70% 24%);
1819
--color-css: hsl(209 70% 24%);
1920
--color-js: hsl(49 74% 23%);
2021
--color-tools: hsl(122 56% 23%);
2122
--color-recipes: hsl(276 39% 32%);
2223
--color-a11y: hsl(162 95% 15%);
24+
*/
2325

2426
--color-subscribe-success: hsl(124 46% 29%);
2527
--color-subscribe-error: hsl(360 100% 28%);
28+
29+
/* Цвет для Хэлоуина */
30+
--boo-color: 28 80% 39%;
31+
32+
--color-html: hsl(var(--boo-color));
33+
--color-css: hsl(var(--boo-color));
34+
--color-js: hsl(var(--boo-color));
35+
--color-tools: hsl(var(--boo-color));
36+
--color-recipes: hsl(var(--boo-color));
37+
--color-a11y: hsl(var(--boo-color));
2638
}

src/styles/light-theme.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,25 @@
1212
--color-background: hsl(var(--color-light));
1313
--color-fade: hsl(0 0% 92%);
1414

15+
/*
1516
--color-html: hsl(var(--color-orange));
1617
--color-css: hsl(var(--color-blue));
1718
--color-js: hsl(var(--color-yellow));
1819
--color-tools: hsl(var(--color-green));
1920
--color-recipes: hsl(var(--color-violet));
2021
--color-a11y: hsl(var(--color-aquamarine));
22+
*/
2123

2224
--color-subscribe-success: hsl(var(--color-green));
2325
--color-subscribe-error: hsl(var(--color-red));
26+
27+
/* Цвет для Хэлоуина */
28+
--boo-color: 15 97% 59%;
29+
30+
--color-html: hsl(var(--boo-color));
31+
--color-css: hsl(var(--boo-color));
32+
--color-js: hsl(var(--boo-color));
33+
--color-tools: hsl(var(--boo-color));
34+
--color-recipes: hsl(var(--boo-color));
35+
--color-a11y: hsl(var(--boo-color));
2436
}

0 commit comments

Comments
 (0)