diff --git a/app/Feature/Trial/TrialService.php b/app/Feature/Trial/TrialService.php index 3890c2c377..f2fc3914d2 100644 --- a/app/Feature/Trial/TrialService.php +++ b/app/Feature/Trial/TrialService.php @@ -11,7 +11,7 @@ public function __construct(private Guest $guest) public function isChoiceModern(): bool { - return true; + return false; } public function setChoice(string $choice): void @@ -60,7 +60,7 @@ public function setBadgeNarrow(bool $narrow): void public function getUserStage(): string { - return 'stage-none'; + return $this->guest->getSetting('surveyStage', 'stage-invited'); } public function getUserChoice(): string diff --git a/app/Services/Session/Renderer.php b/app/Services/Session/Renderer.php index db416752dc..d0957b6a38 100644 --- a/app/Services/Session/Renderer.php +++ b/app/Services/Session/Renderer.php @@ -1,7 +1,7 @@ spacer = new Spacer(8); diff --git a/config/laravel-menu.php b/config/laravel-menu.php index 86a9479054..ee4a4e46cc 100644 --- a/config/laravel-menu.php +++ b/config/laravel-menu.php @@ -21,12 +21,12 @@ ], '__master_menu___' => [ - 'Forum' => ['route' => 'forum.home', 'class' => 'nav-item dropdown designer-navbar-text'], - 'Mikroblogi' => ['route' => 'microblog.home', 'class' => 'nav-item designer-navbar-text'], - 'Praca' => ['route' => 'job.home', 'class' => 'nav-item designer-navbar-text'], + 'Forum' => ['route' => 'forum.home', 'class' => 'nav-item dropdown'], + 'Mikroblogi' => ['route' => 'microblog.home', 'class' => 'nav-item'], + 'Praca' => ['route' => 'job.home', 'class' => 'nav-item'], 'Kompendium' => [ 'url' => 'Kategorie', - 'class' => 'nav-item dropdown designer-navbar-text', + 'class' => 'nav-item dropdown', 'children' => [ 'Delphi' => ['url' => 'Delphi'], 'C/C++' => ['url' => 'C'], diff --git a/resources/feature/lookAndFeel/lookAndFeel.scss b/resources/feature/lookAndFeel/lookAndFeel.scss index 91f0f2116b..cc91363126 100644 --- a/resources/feature/lookAndFeel/lookAndFeel.scss +++ b/resources/feature/lookAndFeel/lookAndFeel.scss @@ -1,7 +1,6 @@ @import "../theme/theme"; @import "bootstrap/scss/mixins/breakpoints"; - -@import "../sass/pages/homepage_modern"; +@import "../../sass/pages/homepage_modern"; @import "style-guide"; @mixin size($size) { @@ -49,13 +48,13 @@ body { @include background-theme($background-light, $background-dark); } -.designer-post { +.neon-post { border-radius: $tile-radius; border: none; @include background-theme($tile-background-light, $tile-background-dark); - .designer-post-header { + .neon-post-header { @include background-theme($tile-background-light, $tile-background-dark); } @@ -65,7 +64,7 @@ body { border-bottom-right-radius: $tile-radius; } - .designer-post-header { + .neon-post-header { border-bottom-width: $tile-border-width; } @@ -73,7 +72,7 @@ body { border-top-width: $tile-border-width; } - .designer-post-header, + .neon-post-header, .designer-post-footer { @include light { border-color: $tile-border-primary-light; @@ -84,7 +83,7 @@ body { } } -.designer-aside { +.neon-forum-aside { @include background-theme($background-light, $background-dark); padding: 24px; border-radius: $tile-radius; @@ -106,7 +105,7 @@ body { } } -.designer-section-heading, h4.heading { // TODO remove h4.heading +.neon-section-heading, h4.heading { // TODO remove h4.heading border-bottom-width: $tile-border-width !important; @include light { border-bottom-color: $tile-border-secondary-light; @@ -243,7 +242,7 @@ header nav.navbar { } } - .designer-navbar-text { + .neon-navbar-text { @include light { color: $text-color-primary-light !important; } diff --git a/resources/js/components/defaultAvatar.scss b/resources/js/components/defaultAvatar.scss index b8c6d54e5b..823b7e0324 100644 --- a/resources/js/components/defaultAvatar.scss +++ b/resources/js/components/defaultAvatar.scss @@ -8,14 +8,4 @@ color: currentColor; } } - - body.theme-light & { - color: #435b00; - background: #f3f7e6; - } - - body.theme-dark & { - color: #789b17; - background: #141414; - } } diff --git a/resources/js/components/forum/post.vue b/resources/js/components/forum/post.vue index 6856ac22b4..31794d8105 100644 --- a/resources/js/components/forum/post.vue +++ b/resources/js/components/forum/post.vue @@ -9,7 +9,7 @@
Treść posta została ukryta, ponieważ autorem jest zablokowany przez Ciebie użytkownik. -