From 8158c014479f55dc060494ab6673d067cd8a755e Mon Sep 17 00:00:00 2001 From: Daniel Wilkowski Date: Wed, 6 Nov 2024 18:05:59 +0100 Subject: [PATCH] Update --- database/seeders/BlocksTableSeeder.php | 12 ++-- resources/sass/core/_dark_topic.scss | 2 - resources/sass/pages/_homepage.scss | 79 ++++++++++++++++++-------- resources/views/home.twig | 8 +-- 4 files changed, 65 insertions(+), 36 deletions(-) diff --git a/database/seeders/BlocksTableSeeder.php b/database/seeders/BlocksTableSeeder.php index 6a7e933f80..61d192361b 100644 --- a/database/seeders/BlocksTableSeeder.php +++ b/database/seeders/BlocksTableSeeder.php @@ -21,7 +21,7 @@ private function addFooterBlock(): void $content = << -
+
-
+
-
+
-
+
  • O nas
  • Kontakt
    • @@ -70,10 +69,9 @@ private function addFooterBlock(): void
-
+
Skontaktuj się z nami
-
  1. diff --git a/resources/sass/core/_dark_topic.scss b/resources/sass/core/_dark_topic.scss index 2d9fa4c1f0..514bfebaea 100644 --- a/resources/sass/core/_dark_topic.scss +++ b/resources/sass/core/_dark_topic.scss @@ -16,8 +16,6 @@ body.theme-dark { header { nav.navbar { - border-bottom-color: #2f2f2f; - .nav-search { // TODO remove this after new homepage .search-bar { background-color: #2a2a2a; diff --git a/resources/sass/pages/_homepage.scss b/resources/sass/pages/_homepage.scss index 8baa0b8a99..634ca7f522 100644 --- a/resources/sass/pages/_homepage.scss +++ b/resources/sass/pages/_homepage.scss @@ -44,6 +44,12 @@ body.lookAndFeelModern { $body-background-light: #f0f2f5; $body-background-dark: #121314; + $border-color-primary-light: #dddddd; + $border-color-secondary-light: #dddddd; + + $border-color-primary-dark: #2f2f2f; + $border-color-secondary-dark: #181818; + @include light { color: #646466; background: $body-background-light; @@ -98,6 +104,13 @@ body.lookAndFeelModern { header nav.navbar { @include color-theme(#777777, #eeeeee); + @include light { + + } + @include dark { + border-bottom-color: $border-color-secondary-dark; + } + .nav-link, .btn-toggle-theme, { @@ -207,7 +220,12 @@ body.lookAndFeelModern { background: squiggle(#ffffff), linear-gradient(45deg, $card-background-light, $card-background-light, #bbe7ca); } @include dark { - background: squiggle(#04ae41), linear-gradient(45deg, $card-background-dark, $card-background-dark, #0d5c28); + background: $card-background-dark; + } + @include size(md) { + @include dark { + background: squiggle(#04ae41), linear-gradient(45deg, $card-background-dark, $card-background-dark, #0d5c28); + } } @include theme { background-repeat: no-repeat, no-repeat; @@ -223,12 +241,7 @@ body.lookAndFeelModern { } .members-banner-border-right { - @include light { - border-right: 1px solid #bbcad8; - } - @include dark { - border-right: 1px solid #464849; - } + border-right: 1px solid var(--tile-border-color); } .online-indicator { @@ -272,7 +285,29 @@ body.lookAndFeelModern { @include color-theme($secondary-color-light, $secondary-color-dark); } + .tile-palette-primary { + @include light { + --tile-border-color: #{$border-color-primary-light}; + } + @include dark { + --tile-border-color: #{$border-color-primary-dark}; + } + } + + .tile-palette-secondary { + @include light { + --tile-border-color: #{$border-color-secondary-light}; + } + @include dark { + --tile-border-color: #{$border-color-secondary-dark}; + } + } + .nav-pills { + @include theme { + border-bottom-color: var(--tile-border-color); + } + .nav-link { transition: none; @@ -524,7 +559,7 @@ body.lookAndFeelModern { margin: 10px 0 0 1px; font-family: "Open Sans", sans-serif; @include light { - border-left: 1px solid $border-color-light; + border-left: 1px solid $border-color-primary-light; } @include dark { border-left: 1px solid #2f2f2f; @@ -550,14 +585,7 @@ body.lookAndFeelModern { .row { padding: 4px 0 4px 0; margin: 0; - - @include light { - border-bottom: 1px solid #e6e6e6; - } - - @include dark { - border-bottom: 1px solid #181818; - } + border-bottom: 1px solid var(--tile-border-color); .display-count { strong { @@ -597,13 +625,7 @@ body.lookAndFeelModern { .recent-activity { margin: 10px 0 0 10px; font-size: 0.8em; - - @include light { - border-left: 1px solid $border-color-light; - } - @include dark { - border-left: 1px solid $border-color-dark; - } + border-left: 1px solid var(--tile-border-color); @include media-breakpoint-down(md) { border-left: none; @@ -639,6 +661,17 @@ body.lookAndFeelModern { @include color-theme($primary-color-light, $primary-color-dark); @include background-theme($primary-background-light, $primary-background-dark); } + + .footer-inner { + .footer-column { + @include light { + border-color: $border-color-secondary-dark; + } + @include dark { + border-color: $border-color-secondary-dark; + } + } + } } pre, code { diff --git a/resources/views/home.twig b/resources/views/home.twig index 6983e4ecd5..2517f21c8f 100644 --- a/resources/views/home.twig +++ b/resources/views/home.twig @@ -17,7 +17,7 @@
-
+
Członkowie
@@ -46,7 +46,7 @@

Co nowego na forum?

-
+
@@ -119,7 +119,7 @@ {{ topic.forum }} - + {{ topic.last_post_created_at|format_date }}
@@ -202,7 +202,7 @@

Reputacja użytkowników

-
+