From 2f364f5a56fc6309e635e17c66489c6fc672c9c2 Mon Sep 17 00:00:00 2001 From: Nigina Zaripova Date: Thu, 18 Sep 2025 01:28:21 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=94=D0=B5=D0=BB=D0=B2=D0=B5=D1=82=20?= =?UTF-8?q?=D1=88=D0=B0=D0=BF=D0=BA=D1=83=20=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/img/icon_find.svg | 3 ++ source/img/icon_menu.svg | 3 ++ source/img/icon_shop.svg | 3 ++ source/img/logo.svg | 16 ++-------- source/index.html | 52 ++++++++++++++++++++++++++------ source/sass/common/main-nav.scss | 24 +++++++++++++++ source/sass/style.scss | 1 + 7 files changed, 78 insertions(+), 24 deletions(-) create mode 100644 source/img/icon_find.svg create mode 100644 source/img/icon_menu.svg create mode 100644 source/img/icon_shop.svg create mode 100644 source/sass/common/main-nav.scss diff --git a/source/img/icon_find.svg b/source/img/icon_find.svg new file mode 100644 index 00000000..c49716e5 --- /dev/null +++ b/source/img/icon_find.svg @@ -0,0 +1,3 @@ + + + diff --git a/source/img/icon_menu.svg b/source/img/icon_menu.svg new file mode 100644 index 00000000..ced5b67d --- /dev/null +++ b/source/img/icon_menu.svg @@ -0,0 +1,3 @@ + + + diff --git a/source/img/icon_shop.svg b/source/img/icon_shop.svg new file mode 100644 index 00000000..3a42f9a4 --- /dev/null +++ b/source/img/icon_shop.svg @@ -0,0 +1,3 @@ + + + diff --git a/source/img/logo.svg b/source/img/logo.svg index b6557b7a..83e428c5 100644 --- a/source/img/logo.svg +++ b/source/img/logo.svg @@ -1,15 +1,3 @@ - - - - - - - - - - - - - - + + diff --git a/source/index.html b/source/index.html index 39b24a4e..e72afd3b 100644 --- a/source/index.html +++ b/source/index.html @@ -1,13 +1,45 @@ - - - - - Ваш проект - - - - Привет мир! - + + + + + + Ваш проект + + + + + +
+ + + diff --git a/source/sass/common/main-nav.scss b/source/sass/common/main-nav.scss new file mode 100644 index 00000000..20feaafb --- /dev/null +++ b/source/sass/common/main-nav.scss @@ -0,0 +1,24 @@ +.main-nav { + background-color: #ffffff; + + &__container { + display: flex; + align-items: center; + } + + &__logo { + margin-right: 360px; + } + + &__list { + @include clear-list; + display: flex; + } + + &__icons { + @include clear-list; + display: flex; + margin-left: auto; + } + +} diff --git a/source/sass/style.scss b/source/sass/style.scss index 387357a4..491d492f 100644 --- a/source/sass/style.scss +++ b/source/sass/style.scss @@ -1,5 +1,6 @@ @import 'common/fonts.scss'; @import 'common/clear-button.scss'; @import 'common/clear-list.scss'; +@import 'common/main-nav.scss'; @import 'root.scss'; From 7eebc56da8b69ab36c6ba480c186dcb0b25fee2c Mon Sep 17 00:00:00 2001 From: Nigina9 <153537742+Nigina9@users.noreply.github.com> Date: Thu, 18 Sep 2025 14:00:14 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=B5=D1=82?= =?UTF-8?q?=20=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20=D0=B4=D0=BB=D1=8F=20=D0=B1?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/sass/{common => blocks}/main-nav.scss | 0 source/sass/style.scss | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename source/sass/{common => blocks}/main-nav.scss (100%) diff --git a/source/sass/common/main-nav.scss b/source/sass/blocks/main-nav.scss similarity index 100% rename from source/sass/common/main-nav.scss rename to source/sass/blocks/main-nav.scss diff --git a/source/sass/style.scss b/source/sass/style.scss index 491d492f..7dd58089 100644 --- a/source/sass/style.scss +++ b/source/sass/style.scss @@ -1,6 +1,6 @@ @import 'common/fonts.scss'; @import 'common/clear-button.scss'; @import 'common/clear-list.scss'; -@import 'common/main-nav.scss'; +@import 'blocks/main-nav.scss'; @import 'root.scss'; From e6d461a26985592501547fbe6988096f660a9921 Mon Sep 17 00:00:00 2001 From: Nigina9 <153537742+Nigina9@users.noreply.github.com> Date: Thu, 18 Sep 2025 18:24:31 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=D0=B7=D1=83?= =?UTF-8?q?=D0=B5=D1=82=20=D1=88=D0=B0=D0=BF=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/index.html | 8 +++--- source/sass/blocks/main-nav.scss | 43 ++++++++++++++++++++++++++++++++ source/sass/root.scss | 12 +++++++++ 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/source/index.html b/source/index.html index e72afd3b..461b6dfc 100644 --- a/source/index.html +++ b/source/index.html @@ -13,7 +13,7 @@