From fc6cec66f90aa524b87370d38d3238231e365c19 Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Mon, 29 Jan 2024 22:43:02 +0900
Subject: [PATCH] Update icon for lazer mode

---
 .../layout/osu-lazer-logo-triangles.svg       | 257 ++++++++++++++++++
 public/images/layout/osu-lazer-logo-white.svg |  46 ++++
 resources/css/bem/nav2.less                   |   4 +-
 resources/css/bem/navbar-mobile.less          |   2 +-
 resources/css/bem/osu-layout.less             |   8 +
 .../views/layout/_score_mode_toggle.blade.php |   6 +-
 resources/views/master.blade.php              |   5 +-
 7 files changed, 320 insertions(+), 8 deletions(-)
 create mode 100644 public/images/layout/osu-lazer-logo-triangles.svg
 create mode 100644 public/images/layout/osu-lazer-logo-white.svg

diff --git a/public/images/layout/osu-lazer-logo-triangles.svg b/public/images/layout/osu-lazer-logo-triangles.svg
new file mode 100644
index 00000000000..2321f2c04c2
--- /dev/null
+++ b/public/images/layout/osu-lazer-logo-triangles.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="1000"
+   height="1000"
+   viewBox="0 0 1000 1000"
+   fill="none"
+   version="1.1"
+   id="svg204"
+   sodipodi:docname="osu-lazer-logo-full.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview206"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.837"
+     inkscape:cx="473.71565"
+     inkscape:cy="499.40263"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg204" />
+  <circle
+     cx="500"
+     cy="500"
+     r="450"
+     fill="#FF66AB"
+     id="circle105" />
+  <circle
+     cx="500"
+     cy="500"
+     r="450"
+     fill="url(#paint0_linear_34_23)"
+     fill-opacity="0.2"
+     id="circle107" />
+  <mask
+     id="mask0_34_23"
+     style="mask-type:alpha"
+     maskUnits="userSpaceOnUse"
+     x="50"
+     y="50"
+     width="900"
+     height="900">
+    <circle
+       cx="500"
+       cy="500"
+       r="450"
+       fill="#FF66AB"
+       id="circle109" />
+    <circle
+       cx="500"
+       cy="500"
+       r="450"
+       fill="url(#paint1_linear_34_23)"
+       fill-opacity="0.2"
+       id="circle111" />
+  </mask>
+  <g
+     mask="url(#mask0_34_23)"
+     id="g116">
+    <path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       d="M394.438 139.1L273.829 348.001L220.638 255.872L37.1974 573.6H121.472L-0.821655 785.418H332.083L289.75 858.74H656.631L564.127 698.518H744.632L724.25 733.822H1091.13L1047.23 657.784H1235.06L1051.62 340.056L957.704 502.72L907.69 416.094L872.586 476.896L723.028 217.853L562.888 495.222L540.721 456.828H577.878L394.438 139.1ZM749.828 698.518L732.044 729.322H1083.34L1042.03 657.784H868.178L955.106 507.22L907.69 425.094L875.184 481.396L906.468 535.581H843.9L803.707 605.197L857.587 698.518H749.828ZM801.109 609.697L849.792 694.018H752.426L801.109 609.697ZM798.511 605.197L747.23 694.018H561.529L530.014 639.434L530.395 638.775H645.768L588.082 538.859L589.974 535.581H758.319L798.511 605.197ZM801.109 600.697L838.704 535.581H763.515L801.109 600.697ZM760.917 531.081H841.302L869.988 481.396L723.028 226.853L565.486 499.722L583.591 531.081H587.376L674.146 380.791L760.917 531.081ZM592.572 531.081H755.721L674.146 389.791L592.572 531.081ZM582.886 538.859L580.993 535.581H539.587L560.29 499.722L535.525 456.828H389.131L362.895 502.269L404.078 573.6H321.713L286.682 634.275H419.346L473.191 541.012L527.036 634.275H527.797L582.886 538.859ZM532.993 634.275H637.974L585.484 543.359L532.993 634.275ZM524.818 639.434L524.437 638.775H421.944L351.669 760.494L366.059 785.418H337.279L297.544 854.24H648.837L558.931 698.518H490.706L524.818 639.434ZM556.333 694.018L527.416 643.934L498.5 694.018H556.333ZM578.395 531.081L562.888 504.222L547.382 531.081H578.395ZM846.498 531.081L872.586 485.896L898.674 531.081H846.498ZM220.638 264.872L271.23 352.501L210.997 456.828H331.464L357.699 502.269L319.114 569.1H241.167L182.619 467.69L124.07 569.1H44.9916L220.638 264.872ZM273.829 357.001L218.791 452.328H328.866L273.829 357.001ZM276.427 352.501L334.062 452.328H386.533L462.328 321.047L538.123 452.328H570.084L394.438 148.1L276.427 352.501ZM360.297 497.769L336.66 456.828H383.935L360.297 497.769ZM462.328 330.047L532.927 452.328H391.729L462.328 330.047ZM126.668 573.6L6.97257 780.918H334.681L346.473 760.494L238.569 573.6H126.668ZM235.971 569.1H129.266L182.619 476.69L235.971 569.1ZM243.765 573.6L280.141 636.604L316.516 573.6H243.765ZM360.297 506.769L324.311 569.1H396.284L360.297 506.769ZM349.071 755.994L281.394 638.775H416.747L349.071 755.994ZM349.071 764.994L339.877 780.918H358.265L349.071 764.994ZM424.542 634.275L473.191 550.012L521.839 634.275H424.542ZM957.704 511.72L875.972 653.284H1039.44L957.704 511.72ZM1044.63 653.284L960.302 507.22L1051.62 349.056L1227.26 653.284H1044.63Z"
+       fill="url(#paint2_linear_34_23)"
+       id="path114" />
+  </g>
+  <defs
+     id="defs202">
+    <filter
+       id="filter0_d_34_23"
+       x="170.75"
+       y="354.714"
+       width="658.571"
+       height="283.661"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood136" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         result="hardAlpha"
+         id="feColorMatrix138" />
+      <feOffset
+         dy="10.7249"
+         id="feOffset140" />
+      <feGaussianBlur
+         stdDeviation="10.7249"
+         id="feGaussianBlur142" />
+      <feComposite
+         in2="hardAlpha"
+         operator="out"
+         id="feComposite144" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix146" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow_34_23"
+         id="feBlend148" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow_34_23"
+         result="shape"
+         id="feBlend150" />
+    </filter>
+    <filter
+       id="filter1_d_34_23"
+       x="32"
+       y="41"
+       width="936"
+       height="936"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood153" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         result="hardAlpha"
+         id="feColorMatrix155" />
+      <feOffset
+         dy="9"
+         id="feOffset157" />
+      <feGaussianBlur
+         stdDeviation="9"
+         id="feGaussianBlur159" />
+      <feComposite
+         in2="hardAlpha"
+         operator="out"
+         id="feComposite161" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix163" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow_34_23"
+         id="feBlend165" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow_34_23"
+         result="shape"
+         id="feBlend167" />
+    </filter>
+    <filter
+       id="filter2_d_34_23"
+       x="236.45"
+       y="475.775"
+       width="98.3216"
+       height="97.9616"
+       filterUnits="userSpaceOnUse"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0"
+         result="BackgroundImageFix"
+         id="feFlood170" />
+      <feColorMatrix
+         in="SourceAlpha"
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
+         result="hardAlpha"
+         id="feColorMatrix172" />
+      <feOffset
+         dy="10.7249"
+         id="feOffset174" />
+      <feGaussianBlur
+         stdDeviation="10.7249"
+         id="feGaussianBlur176" />
+      <feComposite
+         in2="hardAlpha"
+         operator="out"
+         id="feComposite178" />
+      <feColorMatrix
+         type="matrix"
+         values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
+         id="feColorMatrix180" />
+      <feBlend
+         mode="normal"
+         in2="BackgroundImageFix"
+         result="effect1_dropShadow_34_23"
+         id="feBlend182" />
+      <feBlend
+         mode="normal"
+         in="SourceGraphic"
+         in2="effect1_dropShadow_34_23"
+         result="shape"
+         id="feBlend184" />
+    </filter>
+    <linearGradient
+       id="paint0_linear_34_23"
+       x1="500"
+       y1="50"
+       x2="500"
+       y2="950"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity="0"
+         id="stop187" />
+      <stop
+         offset="1"
+         id="stop189" />
+    </linearGradient>
+    <linearGradient
+       id="paint1_linear_34_23"
+       x1="500"
+       y1="50"
+       x2="500"
+       y2="950"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity="0"
+         id="stop192" />
+      <stop
+         offset="1"
+         id="stop194" />
+    </linearGradient>
+    <linearGradient
+       id="paint2_linear_34_23"
+       x1="617.118"
+       y1="139.1"
+       x2="617.118"
+       y2="858.74"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#F964A7"
+         id="stop197" />
+      <stop
+         offset="1"
+         stop-color="#B6346F"
+         id="stop199" />
+    </linearGradient>
+  </defs>
+</svg>
diff --git a/public/images/layout/osu-lazer-logo-white.svg b/public/images/layout/osu-lazer-logo-white.svg
new file mode 100644
index 00000000000..8209a0c0ae4
--- /dev/null
+++ b/public/images/layout/osu-lazer-logo-white.svg
@@ -0,0 +1,46 @@
+<svg width="1000" height="1000" viewBox="0 0 1000 1000" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_34_81)">
+<path d="M780.16 365.439C792.756 365.439 801.393 374.796 801.393 387.751V507.592C801.393 520.548 792.756 529.905 780.16 529.905C767.204 529.905 758.927 520.548 758.927 507.592V387.751C758.927 374.796 767.204 365.439 780.16 365.439ZM780.16 606.2C764.685 606.2 752.449 593.964 752.449 578.489C752.449 563.374 764.685 551.138 780.16 551.138C795.635 551.138 807.871 563.374 807.871 578.489C807.871 593.964 795.635 606.2 780.16 606.2Z" fill="white"/>
+<path d="M702.605 423.379C715.561 423.379 723.838 432.736 723.838 445.332V524.866C723.838 583.527 687.672 606.199 643.766 606.199C599.501 606.199 563.334 583.527 563.334 524.866V445.332C563.334 432.736 571.611 423.379 584.567 423.379C597.163 423.379 605.8 432.736 605.8 445.332V521.987C605.8 554.017 619.294 566.612 643.766 566.612C667.878 566.612 681.372 554.017 681.372 521.987V445.332C681.372 432.736 690.01 423.379 702.605 423.379Z" fill="white"/>
+<path d="M442.923 471.964C442.923 483.84 455.159 488.159 478.551 493.557C510.941 501.474 541.891 509.752 541.891 549.699C541.891 588.566 513.1 606.2 471.714 606.2C437.525 606.2 412.693 594.324 401.177 580.648C392.18 569.852 393.259 560.495 401.896 552.218C412.693 541.781 422.05 546.1 428.168 551.498C437.885 560.495 449.761 569.852 472.793 569.852C490.067 569.852 500.864 564.094 500.864 552.578C500.864 541.061 489.348 537.103 459.118 528.825C429.247 520.548 402.616 512.631 402.616 477.002C402.616 437.055 435.006 420.501 470.994 420.501C491.507 420.501 514.899 425.899 529.295 441.374C535.413 447.492 540.091 456.129 529.295 468.005C518.498 479.162 510.581 475.923 503.023 470.165C496.185 465.126 484.309 456.489 466.315 456.489C454.079 456.489 442.923 460.448 442.923 471.964Z" fill="white"/>
+<path d="M286.129 606.2C231.427 606.2 192.2 566.613 192.2 513.35C192.2 459.728 231.427 420.501 286.129 420.501C340.831 420.501 380.058 459.728 380.058 513.35C380.058 566.613 340.831 606.2 286.129 606.2ZM286.129 566.613C317.799 566.613 337.592 543.581 337.592 513.35C337.592 483.12 317.799 459.728 286.129 459.728C254.46 459.728 234.666 483.12 234.666 513.35C234.666 543.581 254.46 566.613 286.129 566.613Z" fill="white"/>
+</g>
+<g filter="url(#filter1_d_34_81)">
+<path d="M950 500C950 748.528 748.528 950 500 950C251.472 950 50 748.528 50 500C50 251.472 251.472 50 500 50C748.528 50 950 251.472 950 500ZM95 500C95 723.675 276.325 905 500 905C723.675 905 905 723.675 905 500C905 276.325 723.675 95 500 95C276.325 95 95 276.325 95 500Z" fill="white"/>
+</g>
+<g filter="url(#filter2_d_34_81)">
+<path d="M257.9 513.851C257.9 529.326 270.136 541.562 285.611 541.562C301.086 541.562 313.322 529.326 313.322 513.851C313.322 498.736 301.086 486.5 285.611 486.5C270.136 486.5 257.9 498.736 257.9 513.851Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_34_81" x="170.75" y="354.714" width="658.571" height="283.661" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="10.7249"/>
+<feGaussianBlur stdDeviation="10.7249"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_34_81"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_34_81" result="shape"/>
+</filter>
+<filter id="filter1_d_34_81" x="32" y="41" width="936" height="936" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="9"/>
+<feGaussianBlur stdDeviation="9"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_34_81"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_34_81" result="shape"/>
+</filter>
+<filter id="filter2_d_34_81" x="236.45" y="475.775" width="98.3216" height="97.9616" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="10.7249"/>
+<feGaussianBlur stdDeviation="10.7249"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_34_81"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_34_81" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/resources/css/bem/nav2.less b/resources/css/bem/nav2.less
index eade7ae8eff..2617b0c61f7 100644
--- a/resources/css/bem/nav2.less
+++ b/resources/css/bem/nav2.less
@@ -60,7 +60,7 @@
     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).
@@ -68,7 +68,7 @@
     }
 
     &--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
index def8b0270fa..9ec8321e802 100644
--- 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
index 226b8c79bb7..09915043850 100644
--- 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
index bf35d058dfb..423749dd25b 100644
--- 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
index a16912d30f9..6edadcb8eed 100644
--- 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 ?? '' }}
         "
     >