From acddbb951990494f7b79fad5b7ca72f892f229bb Mon Sep 17 00:00:00 2001 From: RezenkovD Date: Thu, 10 Aug 2023 13:20:38 +0300 Subject: [PATCH 1/8] fix: some problem --- users/templates/account/login.html | 2 +- users/templates/base/base.html | 2 +- users/templates/style/login.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/users/templates/account/login.html b/users/templates/account/login.html index dc77582..c2824de 100644 --- a/users/templates/account/login.html +++ b/users/templates/account/login.html @@ -353,7 +353,7 @@ {{ form.login }} {% else %} -
+
{% block intro_bg_block %}{% endblock %} -
+
{% block main %}{% endblock %}
diff --git a/users/templates/style/login.css b/users/templates/style/login.css index d53bf31..fdc1f5e 100644 --- a/users/templates/style/login.css +++ b/users/templates/style/login.css @@ -336,7 +336,7 @@ .input-container-1 { width: 311px; - margin: 60px auto 12px; + margin: 16px auto 12px; } .input-container { From 5ce96f41782e47640e7481d2810e872bc18dc73e Mon Sep 17 00:00:00 2001 From: RezenkovD Date: Thu, 10 Aug 2023 13:29:21 +0300 Subject: [PATCH 2/8] ref: change login svg location --- users/templates/account/login.html | 309 +----------------- .../svg-objects/login-blue-object.html | 102 ++++++ .../svg-objects/login-hiden-object.html | 101 ++++++ .../svg-objects/login-yellow-object.html | 102 ++++++ 4 files changed, 308 insertions(+), 306 deletions(-) create mode 100644 users/templates/svg-objects/login-blue-object.html create mode 100644 users/templates/svg-objects/login-hiden-object.html create mode 100644 users/templates/svg-objects/login-yellow-object.html diff --git a/users/templates/account/login.html b/users/templates/account/login.html index c2824de..16675c5 100644 --- a/users/templates/account/login.html +++ b/users/templates/account/login.html @@ -8,311 +8,9 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {% include 'svg-objects/login-blue-object.html'%} + {% include 'svg-objects/login-yellow-object.html'%} + {% include 'svg-objects/login-hiden-object.html'%}
{% endblock %} {% block main %} @@ -327,7 +25,6 @@ {% block content %}
-
- - Правила - клубу - -
-
-
-
-
- - - - - -
-
-
Вагітні
-
- Наполегливо не рекомендуємо грати вагітним і емоційно-вразливим людям -
-
-
-
-
- - - - - - - - - - -
-
-
Алкоголь
-
- Просимо утриматися від відвідування клубу у стані алкогольного або наркотичного сп'яніння -
-
-
-
-
-
-
- - - - - - - - - - -
-
-
Вікові обмеження
-
- Ми не рекомендуємо дітям віком до 7 років відвідувати клуб. Це пов'язано з індивідуальним сприйняттям дитини -
-
-
-
-
- - - - - - - - - - -
-
-
Час відвідування
-
- Прохання приходити не раніше ніж за 5 хвилин до сеансу, а у разі запізнення попередити про це провідника -
-
-
-
-
+ {% include 'site/rules.html' %}
{% endblock %} diff --git a/vr_club_site/templates/site/rules.html b/vr_club_site/templates/site/rules.html new file mode 100644 index 0000000..a04aa2d --- /dev/null +++ b/vr_club_site/templates/site/rules.html @@ -0,0 +1,89 @@ +{% load static %} + +
+ + Правила + клубу + +
+
+
+
+
+ + + + + +
+
+
Вагітні
+
+ Наполегливо не рекомендуємо грати вагітним і емоційно-вразливим людям +
+
+
+
+
+ + + + + + + + + + +
+
+
Алкоголь
+
+ Просимо утриматися від відвідування клубу у стані алкогольного або наркотичного сп'яніння +
+
+
+
+
+
+
+ + + + + + + + + + +
+
+
Вікові обмеження
+
+ Ми не рекомендуємо дітям віком до 7 років відвідувати клуб. Це пов'язано з індивідуальним сприйняттям дитини +
+
+
+
+
+ + + + + + + + + + +
+
+
Час відвідування
+
+ Прохання приходити не раніше ніж за 5 хвилин до сеансу, а у разі запізнення попередити про це провідника +
+
+
+
+
diff --git a/vr_club_site/templates/site/style/index.css b/vr_club_site/templates/site/style/index.css index c2886a5..446a605 100644 --- a/vr_club_site/templates/site/style/index.css +++ b/vr_club_site/templates/site/style/index.css @@ -318,68 +318,6 @@ .section-rules-club { margin-top: 150px; } -.rules-club, -.rules-club * { - box-sizing: border-box; -} -.rules-club { - text-align: center; - font: 700 48px "Montserrat", sans-serif; - position: relative; - width: auto; - height: auto; -} -.rules-club .span { - color: #4fb4fe; - font: 700 48px "Montserrat", sans-serif; -} -.rules-club .span2 { - color: #ffffff; - font: 700 48px "Montserrat", sans-serif; -} - -.rules { - margin-top: 64.5px; - display: flex; - justify-content: space-between; - max-width: 1187px; - max-height: 322px; - margin-left: auto; - margin-right: auto; -} - -.column-rul { - display: flex; - flex-direction: column; - max-width: 524px; - gap: 56px; -} - -.rule { - display: flex; - flex-direction: row; - align-items: flex-start; - gap: 24px; -} - -.title { - color: #ffffff; - text-align: left; - font: 600 24px "Montserrat", sans-serif; - position: relative; - width: auto; - height: auto; -} - -.description { - margin-top: 8px; - color: rgba(255, 255, 255, 0.8); - text-align: left; - font: 500 20px "Montserrat", sans-serif; - position: relative; - width: auto; - height: auto; -} @media screen and (max-width: 1300px) { .photo-back { @@ -523,77 +461,9 @@ padding: 12px 55px 12px 55px; } - /* Rules */ .section-rules-club { margin-top: 96px; } - .rules-club, - .rules-club * { - box-sizing: border-box; - } - .rules-club { - font: 700 28px "Montserrat", sans-serif; - } - .rules-club .span { - font: 700 28px "Montserrat", sans-serif; - } - .rules-club .span2 { - font: 700 28px "Montserrat", sans-serif; - } - - .rules { - margin-top: 24px; - display: flex; - justify-content: space-between; - max-height: 598px; - margin-left: auto; - margin-right: auto; - flex-direction: column; - gap: 36px; - max-width: 338px; - } - - .column-rul { - display: flex; - flex-direction: column; - max-width: 524px; - gap: 36px; - } - - .rule { - display: flex; - align-items: flex-start; - gap: 15px; - flex-direction: row; - } - - .title { - font: 600 20px "Montserrat", sans-serif; - } - - .description { - font: 500 16px "Montserrat", sans-serif; - } - - .pregnat_ { - width: 62.933px; - height: 74.927px; - } - - .drink_ { - width: 63px; - height: 69px; - } - - .old_ { - width: 63px; - height: 56px; - } - - .time_ { - width: 63px; - height: 63px; - } .ellipse-1 { background: #ef7d1e; diff --git a/vr_club_site/templates/site/style/rules.css b/vr_club_site/templates/site/style/rules.css new file mode 100644 index 0000000..f73ec58 --- /dev/null +++ b/vr_club_site/templates/site/style/rules.css @@ -0,0 +1,133 @@ +.rules-club, +.rules-club * { + box-sizing: border-box; +} +.rules-club { + text-align: center; + font: 700 48px "Montserrat", sans-serif; + position: relative; + width: auto; + height: auto; +} +.rules-club .span { + color: #4fb4fe; + font: 700 48px "Montserrat", sans-serif; +} +.rules-club .span2 { + color: #ffffff; + font: 700 48px "Montserrat", sans-serif; +} + +.rules { + margin-top: 64.5px; + display: flex; + justify-content: space-between; + max-width: 1187px; + max-height: 322px; + margin-left: auto; + margin-right: auto; +} + +.column-rul { + display: flex; + flex-direction: column; + max-width: 524px; + gap: 56px; +} + +.rule { + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 24px; +} + +.title { + color: #ffffff; + text-align: left; + font: 600 24px "Montserrat", sans-serif; + position: relative; + width: auto; + height: auto; +} + +.description { + margin-top: 8px; + color: rgba(255, 255, 255, 0.8); + text-align: left; + font: 500 20px "Montserrat", sans-serif; + position: relative; + width: auto; + height: auto; +} + + +@media screen and (max-width: 768px) { + .rules-club, + .rules-club * { + box-sizing: border-box; + } + .rules-club { + font: 700 28px "Montserrat", sans-serif; + } + .rules-club .span { + font: 700 28px "Montserrat", sans-serif; + } + .rules-club .span2 { + font: 700 28px "Montserrat", sans-serif; + } + + .rules { + margin-top: 24px; + display: flex; + justify-content: space-between; + max-height: 598px; + margin-left: auto; + margin-right: auto; + flex-direction: column; + gap: 36px; + max-width: 338px; + } + + .column-rul { + display: flex; + flex-direction: column; + max-width: 524px; + gap: 36px; + } + + .rule { + display: flex; + align-items: flex-start; + gap: 15px; + flex-direction: row; + } + + .title { + font: 600 20px "Montserrat", sans-serif; + } + + .description { + font: 500 16px "Montserrat", sans-serif; + } + + .pregnat_ { + width: 62.933px; + height: 74.927px; + } + + .drink_ { + width: 63px; + height: 69px; + } + + .old_ { + width: 63px; + height: 56px; + } + + .time_ { + width: 63px; + height: 63px; + } +} From f0ffb2e0a6f830230fa20f6fec93eeed2399089f Mon Sep 17 00:00:00 2001 From: RezenkovD Date: Thu, 10 Aug 2023 13:56:28 +0300 Subject: [PATCH 6/8] ref: divide class section-games --- vr_club_site/templates/site/game-carousel.html | 2 +- vr_club_site/templates/site/index.html | 2 +- vr_club_site/templates/site/style/game-carousel.css | 7 ------- vr_club_site/templates/site/style/index.css | 9 +++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/vr_club_site/templates/site/game-carousel.html b/vr_club_site/templates/site/game-carousel.html index 7a58fb1..0b9842c 100644 --- a/vr_club_site/templates/site/game-carousel.html +++ b/vr_club_site/templates/site/game-carousel.html @@ -1,6 +1,6 @@ {% load static %} -
+
У diff --git a/vr_club_site/templates/site/index.html b/vr_club_site/templates/site/index.html index dcb0a37..94974e6 100644 --- a/vr_club_site/templates/site/index.html +++ b/vr_club_site/templates/site/index.html @@ -34,7 +34,7 @@
-
+
{% include 'site/game-carousel.html' %}
diff --git a/vr_club_site/templates/site/style/game-carousel.css b/vr_club_site/templates/site/style/game-carousel.css index af6daa5..10b6c4f 100644 --- a/vr_club_site/templates/site/style/game-carousel.css +++ b/vr_club_site/templates/site/style/game-carousel.css @@ -1,9 +1,5 @@ @import url('https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600&display=swap'); -.section-games { - margin-top: 8px; -} - .wrapper { max-width: 1595px; width: 100%; @@ -570,9 +566,6 @@ } @media screen and (max-width: 768px) { - .section-games { - margin-top: 76px; - } .games { color: #ffffff; diff --git a/vr_club_site/templates/site/style/index.css b/vr_club_site/templates/site/style/index.css index 446a605..8517ab8 100644 --- a/vr_club_site/templates/site/style/index.css +++ b/vr_club_site/templates/site/style/index.css @@ -319,6 +319,11 @@ margin-top: 150px; } +.section-games { + margin-top: 8px; +} + + @media screen and (max-width: 1300px) { .photo-back { margin: 13px auto 0 auto; @@ -465,6 +470,10 @@ margin-top: 96px; } + .section-games { + margin-top: 76px; + } + .ellipse-1 { background: #ef7d1e; border-radius: 50%; From 1f17422118ec7b4c0e7ca69729897921a84ed3b4 Mon Sep 17 00:00:00 2001 From: RezenkovD Date: Thu, 10 Aug 2023 14:00:38 +0300 Subject: [PATCH 7/8] ref: divide class section-calendar --- vr_club_site/templates/site/calendar.html | 2 +- vr_club_site/templates/site/index.html | 2 +- vr_club_site/templates/site/style/calendar.css | 4 ---- vr_club_site/templates/site/style/index.css | 8 ++++++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/vr_club_site/templates/site/calendar.html b/vr_club_site/templates/site/calendar.html index 8d1eda0..8493bd3 100644 --- a/vr_club_site/templates/site/calendar.html +++ b/vr_club_site/templates/site/calendar.html @@ -1,6 +1,6 @@ {% load static %} -
+
Забронюй diff --git a/vr_club_site/templates/site/index.html b/vr_club_site/templates/site/index.html index 94974e6..bef4a2f 100644 --- a/vr_club_site/templates/site/index.html +++ b/vr_club_site/templates/site/index.html @@ -55,7 +55,7 @@ Детальніше
-
+
{% include 'site/calendar.html' %}
diff --git a/vr_club_site/templates/site/style/calendar.css b/vr_club_site/templates/site/style/calendar.css index 9055c73..c65d140 100644 --- a/vr_club_site/templates/site/style/calendar.css +++ b/vr_club_site/templates/site/style/calendar.css @@ -230,10 +230,6 @@ margin-top: 44px; } -.section-calendar { - margin-top: 96px; -} - @media screen and (max-width: 768px) { .booking { font: 700 28px "Montserrat", sans-serif; diff --git a/vr_club_site/templates/site/style/index.css b/vr_club_site/templates/site/style/index.css index 8517ab8..6629bce 100644 --- a/vr_club_site/templates/site/style/index.css +++ b/vr_club_site/templates/site/style/index.css @@ -323,6 +323,10 @@ margin-top: 8px; } +.section-calendar { + margin-top: 150px; +} + @media screen and (max-width: 1300px) { .photo-back { @@ -474,6 +478,10 @@ margin-top: 76px; } + .section-calendar { + margin-top: 96px; + } + .ellipse-1 { background: #ef7d1e; border-radius: 50%; From b5c15122f7d9a20b3980ad666b0c88188ce17683 Mon Sep 17 00:00:00 2001 From: RezenkovD Date: Thu, 10 Aug 2023 14:02:50 +0300 Subject: [PATCH 8/8] chore --- vr_club_site/templates/site/style/index.css | 224 ++++++++++---------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/vr_club_site/templates/site/style/index.css b/vr_club_site/templates/site/style/index.css index 6629bce..e77141d 100644 --- a/vr_club_site/templates/site/style/index.css +++ b/vr_club_site/templates/site/style/index.css @@ -94,6 +94,118 @@ height: 61px; } +.section-what-to-play { + margin-top: 150px; +} + +.what-to-play, +.what-to-play * { + box-sizing: border-box; +} +.what-to-play { + text-align: center; + font: 700 48px "Montserrat", sans-serif; + position: relative; + width: auto; + height: auto; +} +.what-to-play .span { + color: #ffffff; + font: 700 48px "Montserrat", sans-serif; +} +.what-to-play .span2 { + color: #4fb4fe; + font: 700 48px "Montserrat", sans-serif; +} +.what-to-play .span3 { + color: #ffffff; + font: 700 48px "Montserrat", sans-serif; +} + +.oculus-meta-quest-2, +.oculus-meta-quest-2 * { + box-sizing: border-box; +} +.oculus-meta-quest-2 { + margin-top: 24px; + color: #ffffff; + text-align: center; + font: 500 24px "Montserrat", sans-serif; + position: relative; + max-width: 693px; + width: auto; + height: auto; + margin-left: auto; + margin-right: auto; +} + +.photo-back-vr { + text-align: center; + width: auto; + max-height: 630px; + margin-top: 24px; + margin-left: auto; + margin-right: auto; + height: auto; + z-index: 1; + position: sticky; +} + +.vr-helmet { + width: auto; + max-height: 630px; +} + + +.main-more-details { + margin-top: 24px; + position: relative; + width: 290px; + height: 56px; + margin-left: auto; + margin-right: auto; + display: flex; + align-items: center; +} + +.more-details, +.more-details * { + box-sizing: border-box; +} + +.more-details { + width: 100%; + height: 100%; + flex-shrink: 0; + border-radius: 100px; + border: 1px solid #FFF; + + padding: 16px 32px 16px 31px; + + color: #FFF; + text-align: center; + font-size: 16px; + font-family: "Montserrat", sans-serif; + font-weight: 700; + line-height: 150.521%; + text-transform: uppercase; + text-decoration: none; + cursor: pointer; +} + +.section-rules-club { + margin-top: 150px; +} + +.section-games { + margin-top: 8px; +} + +.section-calendar { + margin-top: 150px; +} + + .intro_bg_block { position: absolute; width: 100%; @@ -216,118 +328,6 @@ opacity: 0.11999999731779099; } -.section-what-to-play { - margin-top: 150px; -} - -.what-to-play, -.what-to-play * { - box-sizing: border-box; -} -.what-to-play { - text-align: center; - font: 700 48px "Montserrat", sans-serif; - position: relative; - width: auto; - height: auto; -} -.what-to-play .span { - color: #ffffff; - font: 700 48px "Montserrat", sans-serif; -} -.what-to-play .span2 { - color: #4fb4fe; - font: 700 48px "Montserrat", sans-serif; -} -.what-to-play .span3 { - color: #ffffff; - font: 700 48px "Montserrat", sans-serif; -} - -.oculus-meta-quest-2, -.oculus-meta-quest-2 * { - box-sizing: border-box; -} -.oculus-meta-quest-2 { - margin-top: 24px; - color: #ffffff; - text-align: center; - font: 500 24px "Montserrat", sans-serif; - position: relative; - max-width: 693px; - width: auto; - height: auto; - margin-left: auto; - margin-right: auto; -} - -.photo-back-vr { - text-align: center; - width: auto; - max-height: 630px; - margin-top: 24px; - margin-left: auto; - margin-right: auto; - height: auto; - z-index: 1; - position: sticky; -} - -.vr-helmet { - width: auto; - max-height: 630px; -} - - -.main-more-details { - margin-top: 24px; - position: relative; - width: 290px; - height: 56px; - margin-left: auto; - margin-right: auto; - display: flex; - align-items: center; -} - -.more-details, -.more-details * { - box-sizing: border-box; -} - -.more-details { - width: 100%; - height: 100%; - flex-shrink: 0; - border-radius: 100px; - border: 1px solid #FFF; - - padding: 16px 32px 16px 31px; - - color: #FFF; - text-align: center; - font-size: 16px; - font-family: "Montserrat", sans-serif; - font-weight: 700; - line-height: 150.521%; - text-transform: uppercase; - text-decoration: none; - cursor: pointer; -} - -.section-rules-club { - margin-top: 150px; -} - -.section-games { - margin-top: 8px; -} - -.section-calendar { - margin-top: 150px; -} - - @media screen and (max-width: 1300px) { .photo-back { margin: 13px auto 0 auto;