diff --git a/static/core/styles/core.css b/static/core/styles/core.css index 1b7a9b9..f6c03d4 100644 --- a/static/core/styles/core.css +++ b/static/core/styles/core.css @@ -22,11 +22,12 @@ nav { } #home .background-blur { background-size: cover; + background-position: center center; position: absolute; height: 100vh; width: 100vw; filter: blur(5px); - z-index: -1; + z-index: -2; } #home .splash-image-container { width: 100vw; @@ -38,14 +39,14 @@ nav { position: absolute; } #home .splash-image-container img { - z-index: 0; + z-index: -5; width: 100vw; } #home h1 { animation: slide_in_text ease 2s; position: absolute; top: 25%; - left: 108px; + left: 5%; font-size: 6rem; } #home p { @@ -56,20 +57,6 @@ nav { font-size: 2rem; } -@media screen and (max-width: 768px) { - #home h1 { - width: 100%; - top: 40%; - left: 0; - font-size: 2.5rem; - } - #home p { - width: 100%; - top: 50%; - left: 0; - font-size: 1.5rem; - } -} section { display: flex; justify-content: center; @@ -89,12 +76,6 @@ section .subtext { max-width: 50%; } -@media screen and (max-width: 768px) { - section .subtext { - max-width: 100%; - padding: 1rem; - } -} #what-we-do { background-color: #243b9a; } @@ -145,39 +126,100 @@ section .subtext { overflow: hidden; } -@media screen and (max-width: 768px) { - #latest-products > .product-spotlight-container > .product-spotlight { - width: 80%; - } -} #available-retailers .retailers-wrapper { padding-top: 2rem; width: 50%; display: flex; - flex-direction: column; + align-content: center; } -#available-retailers .retailers-wrapper div { +#available-retailers .retailers-wrapper a { display: flex; - flex-direction: row; - margin-bottom: 1rem; -} -#available-retailers .retailers-wrapper div a { + align-items: center; text-decoration: none; font-size: 16pt; - margin-left: 1.5rem; -} -#available-retailers .retailers-wrapper:last-child { - margin-left: 1rem; - font-size: 16pt; + margin: 0 1.5rem; } +@media screen and (max-width: 992px) { + #home h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 4.5rem; + } + #home p { + width: 100%; + top: 50%; + left: 0; + font-size: 2rem; + } +} @media screen and (max-width: 768px) { + #home h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 3rem; + } + #home p { + width: 100%; + top: 50%; + left: 0; + font-size: 1.5rem; + } + #available-retailers > .retailers-wrapper { width: 100%; padding: 1rem; + min-width: 0; + display: flex; + flex-wrap: wrap; + justify-content: center; + } + #available-retailers > .retailers-wrapper a { + padding-top: 1rem; + } + + section .subtext { + max-width: 100%; + padding: 1rem; } - #available-retailers > .retailers-wrapper:last-child { - margin-left: 0; + + #latest-products > .product-spotlight-container > .product-spotlight { + width: 100%; + padding: 1rem; + } + #latest-products > .product-spotlight-container > .product-spotlight h3 { + text-align: center; + } + #latest-products > .product-spotlight-container > .product-spotlight .product { + flex-direction: column; + align-items: center; + } + #latest-products > .product-spotlight-container > .product-spotlight .product .product-spotlight-image { + margin: 0; + } + #latest-products > .product-spotlight-container > .product-spotlight .product .product-spotlight-text { + padding: 1rem; + max-width: 100%; + } +} +@media screen and (max-width: 576px) { + #home h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 2rem; + } + #home p { + width: 100%; + top: 50%; + left: 0; + font-size: 1.2rem; + } + + #latest-products .product-spotlight-image { + width: 100% !important; } } @keyframes slide_in_title { diff --git a/static/core/styles/core.scss b/static/core/styles/core.scss index f12f617..eb5509d 100644 --- a/static/core/styles/core.scss +++ b/static/core/styles/core.scss @@ -25,11 +25,12 @@ nav { .background-blur { background-size: cover; + background-position: center center; position: absolute; height: 100vh; width: 100vw; filter: blur(5px); - z-index: -1; + z-index: -2; } .splash-image-container { @@ -42,7 +43,7 @@ nav { position: absolute; img { - z-index: 0; + z-index: -5; width: 100vw; } } @@ -51,7 +52,7 @@ nav { animation: slide_in_text ease 2s; position: absolute; top: 25%; - left: 108px; + left: 5%; font-size: 6rem; } @@ -64,24 +65,6 @@ nav { } } -@media screen and (max-width: $md) { - #home { - h1 { - width: 100%; - top: 40%; - left: 0; - font-size: 2.5rem; - } - - p { - width: 100%; - top: 50%; - left: 0; - font-size: 1.5rem; - } - } -} - section { display: flex; justify-content: center; @@ -104,15 +87,6 @@ section { } } -@media screen and (max-width: $md) { - section { - .subtext { - max-width: 100%; - padding: 1rem; - } - } -} - #what-we-do { background-color: #243b9a; } @@ -168,45 +142,123 @@ section { } } -@media screen and (max-width: $md) { - #latest-products > .product-spotlight-container > .product-spotlight { - width: 80%; - } -} - #available-retailers { .retailers-wrapper { padding-top: 2rem; width: 50%; display: flex; - flex-direction: column; + align-content: center; + // justify-content: space-between; - div { + a { display: flex; - flex-direction: row; - margin-bottom: 1rem; - - a { - text-decoration: none; - font-size: 16pt; - margin-left: 1.5rem; - } + align-items: center; + text-decoration: none; + font-size: 16pt; + margin: 0 1.5rem; } + } +} - &:last-child { - margin-left: 1rem; - font-size: 16pt; +@media screen and (max-width: $lg) { + #home { + h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 4.5rem; + } + + p { + width: 100%; + top: 50%; + left: 0; + font-size: 2rem; } } } @media screen and (max-width: $md) { + #home { + h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 3rem; + } + + p { + width: 100%; + top: 50%; + left: 0; + font-size: 1.5rem; + } + } + #available-retailers > .retailers-wrapper { width: 100%; padding: 1rem; + min-width: 0; + display: flex; + flex-wrap: wrap; + justify-content: center; + + a { + padding-top: 1rem; + } + } + + section { + .subtext { + max-width: 100%; + padding: 1rem; + } + } + + #latest-products > .product-spotlight-container > .product-spotlight { + width: 100%; + padding: 1rem; + + h3 { + text-align: center; + } + + .product { + flex-direction: column; + align-items: center; + + .product-spotlight-image { + margin: 0; + } + + .product-spotlight-text { + padding: 1rem; + max-width: 100%; + } + } + } +} + +@media screen and (max-width: $sm) { + #home { + h1 { + width: 100%; + top: 40%; + left: 0; + font-size: 2rem; + } + + p { + width: 100%; + top: 50%; + left: 0; + font-size: 1.2rem; + } + } - &:last-child { - margin-left: 0; + #latest-products { + .product-spotlight-image { + width: 100% !important; } } } diff --git a/static/images/el-gogo.png b/static/images/el-gogo.png new file mode 100644 index 0000000..f72cb71 Binary files /dev/null and b/static/images/el-gogo.png differ diff --git a/static/images/glass-s.png b/static/images/glass-s.png deleted file mode 100644 index 47b2645..0000000 Binary files a/static/images/glass-s.png and /dev/null differ diff --git a/static/store/styles/_navbar.scss b/static/store/styles/_navbar.scss index 870a3a3..fe736bb 100644 --- a/static/store/styles/_navbar.scss +++ b/static/store/styles/_navbar.scss @@ -33,6 +33,19 @@ padding: 1rem 0; display: flex; + ul.dropdown-menu { + background-color: $background; + color: $text-color; + + li .dropdown-item { + color: $text-color; + + &:hover { + color: $background; + } + } + } + ul.dropdown-menu.avatar-dropdown { margin-left: -110px !important; } @@ -156,7 +169,7 @@ } div { - color: $background; + color: $text-color; background-color: inherit; transition: inherit; } diff --git a/static/store/styles/_product_reviews.scss b/static/store/styles/_product_reviews.scss index c3ae92c..f7a5e4c 100644 --- a/static/store/styles/_product_reviews.scss +++ b/static/store/styles/_product_reviews.scss @@ -17,6 +17,10 @@ .add-review { margin: 2rem 0; + #review-title, #review-body { + background-color: $background; + } + #review-title { border-radius: 5px 5px 0 0; } @@ -148,6 +152,18 @@ } } +ul.pagination { + li.page-item a.page-link { + background-color: $background-light; + border-color: $background-lighter; + color: $text-color; + } + + li.page-item.active a.page-link { + background-color: $color-primary; + } +} + div.stars { display: inline-flex; flex-direction: row-reverse; diff --git a/static/store/styles/_vars.scss b/static/store/styles/_vars.scss index c88ecbf..27e7d3f 100644 --- a/static/store/styles/_vars.scss +++ b/static/store/styles/_vars.scss @@ -1,13 +1,22 @@ -$background: #ffffff; -$background-light: #ececec; -$background-lighter: #f3f3f3; +// $background: #ffffff; +$background: #222222; +// $background-light: #ececec; +$background-light: #454545; +// $background-lighter: #f3f3f3; +$background-lighter: #666666; $background-alt: #1966af; $background-alt-hover: #185792; -$text-color: #000000; +// $text-color: #000000; +$text-color: white; $text-color-light: #b5b5b5; $text-color-alt: #1966af; $text-color-alt-hover: #17436c; -$text-color-disabled: #696969; -$text-color-mute: #2f4f4f; -$text-color-mute-hover: #777e7e; -$border-color: #b5b5b5; \ No newline at end of file +// $text-color-disabled: #696969; +$text-color-disabled: #c1c1c1; +// $text-color-mute: #2f4f4f; +$text-color-mute: #d1d1d1; +// $text-color-mute-hover: #777e7e; +$text-color-mute-hover: #bbbbbb; +$border-color: #b5b5b5; + +$color-primary: #0d6efd; \ No newline at end of file diff --git a/static/store/styles/store.css b/static/store/styles/store.css index 190bb3d..a5b71bd 100644 --- a/static/store/styles/store.css +++ b/static/store/styles/store.css @@ -6,7 +6,7 @@ } .brand-navbar-container { - background-color: #ffffff; + background-color: #222222; display: flex; justify-content: center; align-items: center; @@ -14,7 +14,7 @@ } .navbar-container-wrapper { - background-color: #ffffff; + background-color: #222222; height: 4rem; justify-content: center; } @@ -30,6 +30,16 @@ padding: 1rem 0; display: flex; } +.navbar-container .nav-button ul.dropdown-menu { + background-color: #222222; + color: white; +} +.navbar-container .nav-button ul.dropdown-menu li .dropdown-item { + color: white; +} +.navbar-container .nav-button ul.dropdown-menu li .dropdown-item:hover { + color: #222222; +} .navbar-container .nav-button ul.dropdown-menu.avatar-dropdown { margin-left: -110px !important; } @@ -69,7 +79,7 @@ } .search-bar { - background-color: #ffffff; + background-color: #222222; } .navbar-container-phone { @@ -147,7 +157,7 @@ background-color: #185792; } .product-menu-content div div { - color: #ffffff; + color: white; background-color: inherit; transition: inherit; } @@ -156,7 +166,7 @@ display: flex; justify-content: center; align-items: center; - background-color: #ececec; + background-color: #454545; } .product-information-wrapper .product-information { display: flex; @@ -191,7 +201,7 @@ } .product-information .product-details .product-price-wrapper { flex-shrink: 0; - background-color: #ffffff; + background-color: #222222; border-radius: 5px; padding: 0 1.5rem; } @@ -230,7 +240,7 @@ display: flex; align-items: center; justify-content: center; - background-color: #ffffff; + background-color: #222222; border-radius: 5px; height: auto; max-height: 500px; @@ -286,7 +296,7 @@ justify-content: center; margin-top: -2px; font-size: 1.2rem; - color: #2f4f4f; + color: #d1d1d1; } .ratings-wrapper .ratings-stars { display: flex; @@ -294,7 +304,7 @@ margin-top: 0.5rem; font-size: 24px; color: rgb(227, 218, 85); - text-shadow: 0 0 1px #2f4f4f; + text-shadow: 0 0 1px #d1d1d1; } .ratings-wrapper .add-review { display: flex; @@ -306,7 +316,7 @@ transition: color 150ms ease-in-out; } .ratings-wrapper .add-review a:hover { - color: #777e7e; + color: #bbbbbb; } .description-wrapper { @@ -352,6 +362,9 @@ .product-reviews-wrapper .product-reviews .add-review { margin: 2rem 0; } +.product-reviews-wrapper .product-reviews .add-review #review-title, .product-reviews-wrapper .product-reviews .add-review #review-body { + background-color: #222222; +} .product-reviews-wrapper .product-reviews .add-review #review-title { border-radius: 5px 5px 0 0; } @@ -376,7 +389,7 @@ .product-reviews-wrapper .product-reviews .review { margin-top: 1.4rem; min-height: 10rem; - background: #f3f3f3; + background: #666666; border: 1px solid #b5b5b5; border-radius: 5px; position: relative; @@ -417,7 +430,7 @@ flex-shrink: 0; } .product-reviews-wrapper .product-reviews .review .header .review-rating-wrapper .ratings-help { - color: #2f4f4f; + color: #d1d1d1; } .product-reviews-wrapper .product-reviews .review .header .review-rating-wrapper .review-title { display: flex; @@ -458,6 +471,15 @@ width: 95%; } } +ul.pagination li.page-item a.page-link { + background-color: #454545; + border-color: #666666; + color: white; +} +ul.pagination li.page-item.active a.page-link { + background-color: #0d6efd; +} + div.stars { display: inline-flex; flex-direction: row-reverse; @@ -523,10 +545,10 @@ label.star:before { border: 1px solid #b5b5b5; } .product-specifications-wrapper .product-specifications .specifications div:nth-child(odd) { - background-color: #ececec; + background-color: #454545; } .product-specifications-wrapper .product-specifications .specifications div:nth-child(even) { - background-color: #ffffff; + background-color: #222222; } .product-specifications-wrapper .product-specifications .specifications div { display: flex; @@ -549,7 +571,7 @@ label.star:before { } .product-specifications-wrapper .product-specifications .subtext { font-size: 0.8rem; - color: #696969; + color: #c1c1c1; } @media screen and (min-width: 992px) { @@ -581,5 +603,6 @@ label.star:before { } } body { - background-color: #ffffff; + background-color: #222222; + color: white; } diff --git a/static/store/styles/store.scss b/static/store/styles/store.scss index 653363f..466af69 100644 --- a/static/store/styles/store.scss +++ b/static/store/styles/store.scss @@ -8,5 +8,5 @@ body { background-color: $background; - // color: $text-color; + color: $text-color; } \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 18f0280..cbd04c0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,6 +10,7 @@ + {% block styles %}{% endblock %} diff --git a/templates/core/home.html b/templates/core/home.html index 727c1fd..c76da79 100644 --- a/templates/core/home.html +++ b/templates/core/home.html @@ -32,9 +32,9 @@
-
+ {% comment %}
splash image -
+
{% endcomment %}

Kolofon Technologies

You dream the future. We make it.

@@ -74,19 +74,19 @@

{{ product.name }}<
-

Available retailers

+

Partnered retailers

Our company is dedicated to deliver. Thus, we cannot also take the burden of delivering the products directly to everyone's doorsteps. This is where our retail partners come in. Kolofon Technologies has signed an exclusive contract with select trusted companies to sell our products. A list of all retailers is listed below.

-
-
- the best guys -
-
The Best Guys -
-
+ + the best guys + + + el-gogo + + {% comment %}
Hang on tight! More coming soon! -
+
{% endcomment %}
{% endblock body %} diff --git a/templates/store/product_layout.html b/templates/store/product_layout.html index 97c4f08..65fa735 100644 --- a/templates/store/product_layout.html +++ b/templates/store/product_layout.html @@ -75,7 +75,7 @@

Looks a bit empty here...

  • - Checkout Now + Checkout Now
  • @@ -124,7 +124,24 @@

    Looks a bit empty here...

    diff --git a/website/settings.py b/website/settings.py index 9b15222..45e4435 100644 --- a/website/settings.py +++ b/website/settings.py @@ -10,14 +10,12 @@ https://docs.djangoproject.com/en/4.0/ref/settings/ """ -# from pathlib import Path from dotenv import load_dotenv import os load_dotenv() # Build paths inside the project like this: BASE_DIR / 'subdir'. -# BASE_DIR = Path(__file__).resolve().parent.parent BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -149,4 +147,7 @@ MEDIA_URL = '/media/' # other -LIVERELOAD_HOST = '192.168.1.85' +import socket +host_name = socket.gethostname() +ip_address = socket.gethostbyname(host_name) +LIVERELOAD_HOST = ip_address