Update icon for lazer mode

ppy · Jan 29, 2024 · fc6cec6 · fc6cec6
1 parent e7ed418
commit fc6cec6
Show file tree

Hide file tree

Showing 7 changed files with 320 additions and 8 deletions.
diff --git a/public/images/layout/osu-lazer-logo-triangles.svg b/public/images/layout/osu-lazer-logo-triangles.svg
diff --git a/public/images/layout/osu-lazer-logo-white.svg b/public/images/layout/osu-lazer-logo-white.svg
diff --git a/resources/css/bem/nav2.less b/resources/css/bem/nav2.less
@@ -60,15 +60,15 @@
     transition: all 100ms ease-in-out;
     will-change: opacity, transform;
 
-    background-image: url('~@images/layout/osu-logo-white.svg');
+    background-image: var(--nav-logo);
 
     .@{_top}__logo-link:hover & {
       // be careful of weird snapping at the end of animation on Firefox (with 1.1, ~60px).
       transform: scale(1.11);
     }
 
     &--bg {
-      background-image: url('~@images/layout/osu-logo-triangles.svg');
+      background-image: var(--nav-logo-bg);
       opacity: 0;
 
       .@{_top}__logo-link:hover & {

diff --git a/resources/css/bem/navbar-mobile.less b/resources/css/bem/navbar-mobile.less
@@ -33,7 +33,7 @@
   &__logo {
     flex: none;
     display: block;
-    background-image: url('~@images/layout/osu-logo-white.svg');
+    background-image: var(--nav-logo);
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;

diff --git a/resources/css/bem/osu-layout.less b/resources/css/bem/osu-layout.less
@@ -13,6 +13,9 @@
   transition: filter 200ms ease-in-out, opacity 200ms ease-in-out; // for fading in after &--masked is removed
 
   &--body {
+    --nav-logo: url('~@images/layout/osu-logo-white.svg');
+    --nav-logo-bg: url('~@images/layout/osu-logo-triangles.svg');
+
     background-color: @osu-colour-b6;
   }
 
@@ -35,6 +38,11 @@
     }
   }
 
+  &--body-lazer {
+    --nav-logo: url('~@images/layout/osu-lazer-logo-white.svg');
+    --nav-logo-bg: url('~@images/layout/osu-lazer-logo-triangles.svg');
+  }
+
   &--full {
     flex: 1 0 auto;
     width: 100%;

diff --git a/resources/views/layout/_score_mode_toggle.blade.php b/resources/views/layout/_score_mode_toggle.blade.php
@@ -3,15 +3,15 @@
     See the LICENCE file in the repository root for full licence text.
 --}}
 @php
-    $legacyScoreOnlyValue = App\Libraries\Search\ScoreSearchParams::showLegacyForUser(Auth::user());
-    $icon = $legacyScoreOnlyValue
+    $legacyScoreMode ??= App\Libraries\Search\ScoreSearchParams::showLegacyForUser($currentUser) === true;
+    $icon = $legacyScoreMode
         ? 'far fa-square'
         : 'fas fa-check-square';
 @endphp
 <button
     class="{{ $class }}"
     type="button"
-    data-url="{{ route('account.options', ['user_profile_customization[legacy_score_only]' => !$legacyScoreOnlyValue]) }}"
+    data-url="{{ route('account.options', ['user_profile_customization[legacy_score_only]' => !$legacyScoreMode]) }}"
     data-method="PUT"
     data-remote="1"
     data-reload-on-success="1"

diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
@@ -10,6 +10,8 @@
 
     $currentUser = Auth::user();
 
+    $legacyScoreMode = App\Libraries\Search\ScoreSearchParams::showLegacyForUser($currentUser) === true;
+
     $titleTree = [];
 
     if (isset($titleOverride)) {
@@ -50,9 +52,8 @@
 
     <body
         class="
-            osu-layout
-            osu-layout--body
             t-section
+            {{ class_with_modifiers('osu-layout', 'body', ['body-lazer' => !$legacyScoreMode]) }}
             {{ $bodyAdditionalClasses ?? '' }}
         "
     >