Merge pull request #10889 from nanaya/score-legacy-toggle-ui

Add menu to switch score display mode

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 & {

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;

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%;

resources/css/bem/simple-menu.less

@@ -135,6 +135,12 @@
     }
   }
 
+  &__extra {
+    background-color: hsl(var(--hsl-b5));
+    padding: @_padding-vertical @_gutter;
+    margin: -@_padding-vertical -@_gutter @_padding-vertical;
+  }
+
   &__form {
     margin: -@_padding-vertical -@_gutter;
   }

resources/lang/en/layout.php

@@ -195,6 +195,8 @@
             'account-edit' => 'Settings',
             'follows' => 'Watchlists',
             'friends' => 'Friends',
+            'legacy_score_only_toggle' => 'Lazer mode',
+            'legacy_score_only_toggle_tooltip' => 'Lazer mode shows scores set from lazer with a new scoring algorithm',
             'logout' => 'Sign Out',
             'profile' => 'My Profile',
         ],

resources/views/layout/_popup_user.blade.php

@@ -16,6 +16,10 @@ class="simple-menu__header simple-menu__header--link js-current-user-cover"
         <div class="u-relative">{{ Auth::user()->username }}</div>
     </a>
 
+    <div class="simple-menu__extra">
+        @include('layout._score_mode_toggle', ['class' => 'simple-menu__item'])
+    </div>
+
     <a
         class="simple-menu__item"
         href="{{ route('users.show', Auth::user()) }}"