From 3e545fb5261c5c87f41bb6b501fd341bc6c87c31 Mon Sep 17 00:00:00 2001 From: Polianskyi Dmytro Date: Wed, 7 Aug 2024 18:04:11 +0300 Subject: [PATCH 1/5] add structure --- package.json | 2 +- src/index.html | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c9fe737dd..80317fd98 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@linthtml/linthtml": "^0.9.5", "@mate-academy/bemlint": "latest", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^1.7.3", + "@mate-academy/scripts": "^1.8.6", "@mate-academy/stylelint-config": "latest", "@parcel/transformer-sass": "^2.12.0", "jest": "^29.7.0", diff --git a/src/index.html b/src/index.html index 8019b83ec..55cda1d89 100644 --- a/src/index.html +++ b/src/index.html @@ -13,7 +13,9 @@ /> -

Hello Mate Academy

+
+ + From 329a922d8491381556c47a10b01698043184436c Mon Sep 17 00:00:00 2001 From: Polianskyi Dmytro Date: Wed, 14 Aug 2024 20:05:44 +0300 Subject: [PATCH 2/5] test --- src/index.html | 120 ++++++++++++++++++++++++++++++++-- src/styles/main.scss | 4 +- src/styles/utils/_mixins.scss | 38 +++++++++++ src/styles/utils/_vars.scss | 4 ++ 4 files changed, 159 insertions(+), 7 deletions(-) diff --git a/src/index.html b/src/index.html index 55cda1d89..d91215e61 100644 --- a/src/index.html +++ b/src/index.html @@ -1,19 +1,131 @@ - + - Title + NAMU + + + + + + + - -
+ +
+
+
+
+ +
+
+
+
+
+ Natsionalnij hudozhnij muzej Ukrayini Kiyiv + + NA +
+ MU + +
+
+
+
diff --git a/src/styles/main.scss b/src/styles/main.scss index fb9195d12..062792fb6 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,7 +1,5 @@ @import 'utils'; @import 'fonts'; @import 'typography'; +@import 'blocks'; -body { - background: $c-gray; -} diff --git a/src/styles/utils/_mixins.scss b/src/styles/utils/_mixins.scss index 80c79780d..b6770b4fc 100644 --- a/src/styles/utils/_mixins.scss +++ b/src/styles/utils/_mixins.scss @@ -4,3 +4,41 @@ #{$_property}: $_toValue; } } + +@mixin action($_property, $_toValue) { + transition: #{$_property} 0.3s; + &:active, &:focus { + #{$_property}: $_toValue; + } +} + +@mixin on-tablet() { + @media (min-width: $tablet-min-width) { + @content; + } +} + +@mixin on-desktop() { + @media (min-width: $desktop-min-width) { + @content; + } +} + +@mixin page-grid { + --columns: 2; + + display: grid; + column-gap: 20px; + grid-template-columns: repeat(var(--columns), 1fr); + + @include on-tablet { + --columns: 6; + + column-gap: 30px; + } + + @include on-desktop { + --columns: 12; + } +} + diff --git a/src/styles/utils/_vars.scss b/src/styles/utils/_vars.scss index aeb006ffb..e2d6410ae 100644 --- a/src/styles/utils/_vars.scss +++ b/src/styles/utils/_vars.scss @@ -1 +1,5 @@ $c-gray: #eee; +$main-bg-color: #FFF; +$main-color: #0F0E08; +$tablet-min-width: 768px; +$desktop-min-width: 1280px; From 123c1d78bfeaa409bb291b30e1549e51283b6a5d Mon Sep 17 00:00:00 2001 From: Polianskyi Dmytro Date: Fri, 23 Aug 2024 12:09:14 +0300 Subject: [PATCH 3/5] for fix --- README.md | 2 +- src/index.html | 144 ++++++++++++++++++++++++------------ src/styles/utils/_vars.scss | 1 + 3 files changed, 100 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 5f9e97051..3de1a3577 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Check font styles. Use [IBM Plex Sans](https://fonts.google.com/specimen/IBM+Ple 11. `git push origin develop` - to send you code for PR. 12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo. 13. Replace `` with your Github username in the - [DEMO LINK](https://.github.io/Museum/). + [DEMO LINK](https://PolianskyiDmytro.github.io/Museum/). 14. Copy `DEMO LINK` to the PR description. > To update you PR repeat steps 7-11. diff --git a/src/index.html b/src/index.html index d91215e61..8f4960292 100644 --- a/src/index.html +++ b/src/index.html @@ -47,13 +47,30 @@
-
+
+

+ ХУДОЖНІЙ +
+ МУЗЕЙ +

+
+

ПОДІЇ

+ +
+

КВИТКИ

+
+
+ +
@@ -77,54 +94,89 @@ class="menu page__menu" id="menu" > -
-
-
- - +
+
+
+
+ +
+ + +
+
+
+

Графік роботи

+
+

+ 12:00 — 20:00 + середа +
+ 12:00 — 20:00 + четвер +
+ 12:00 — 20:00 + п’ятниця +
+ 11:00 — 19:00 + субота +
+ 11:00 — 19:00 + неділя +

+

+ Вихідні: + + понеділок, вівторок Каса припиняє роботу за 1 годину до + закриття музею + +

+
+
-
+
diff --git a/src/styles/utils/_vars.scss b/src/styles/utils/_vars.scss index e2d6410ae..a92e9ed74 100644 --- a/src/styles/utils/_vars.scss +++ b/src/styles/utils/_vars.scss @@ -3,3 +3,4 @@ $main-bg-color: #FFF; $main-color: #0F0E08; $tablet-min-width: 768px; $desktop-min-width: 1280px; +$menu-bg-color: #1A5A4C; From f8326b40178d5c15424124ac26d8f36d770e3722 Mon Sep 17 00:00:00 2001 From: Polianskyi Dmytro Date: Sat, 14 Sep 2024 13:52:01 +0300 Subject: [PATCH 4/5] add solution --- src/index.html | 309 ++++++++++++++++++++++++++++++++---- src/scripts/main.js | 1 + src/styles/utils/_vars.scss | 2 + 3 files changed, 282 insertions(+), 30 deletions(-) diff --git a/src/index.html b/src/index.html index 8f4960292..088784d7b 100644 --- a/src/index.html +++ b/src/index.html @@ -44,7 +44,10 @@ /> -
+