Merge branch 'master' into menu-image-indicator

ppy · Feb 14, 2025 · a1f7cf3 · a1f7cf3
2 parents 60d5c15 + 4302d4f
commit a1f7cf3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/app/Transformers/TeamTransformer.php b/app/Transformers/TeamTransformer.php
@@ -14,8 +14,8 @@ class TeamTransformer extends TransformerAbstract
     public function transform(Team $team): array
     {
         return [
+            'flag_url' => $team->logo()->url(),
             'id' => $team->getKey(),
-            'logo' => $team->logo()->url(),
             'name' => $team->name,
             'short_name' => $team->short_name,
         ];

diff --git a/resources/css/bem/menu-images.less b/resources/css/bem/menu-images.less
@@ -18,8 +18,9 @@
   &__arrow {
     .reset-input();
     .fade-element(@hover-transition-duration);
+    --padding: 10px;
     height: 100%;
-    padding: 10px;
+    padding: var(--padding) calc(var(--page-gutter) + var(--padding));
     position: absolute;
     top: 0;
 
@@ -33,12 +34,14 @@
 
     &--left {
       --icon: @fa-var-chevron-left;
-      left: var(--page-gutter);
+      left: 0;
+      padding-right: var(--padding);
     }
 
     &--right {
       --icon: @fa-var-chevron-right;
-      right: var(--page-gutter);
+      right: 0;
+      padding-left: var(--padding);
     }
 
     &::before {

diff --git a/resources/js/components/flag-team.tsx b/resources/js/components/flag-team.tsx
@@ -9,7 +9,7 @@ export default function FlagTeam({ team }: { team: TeamJson }) {
   return (
     <span
       className='flag-team'
-      style={{ backgroundImage: urlPresence(team.logo) }}
+      style={{ backgroundImage: urlPresence(team.flag_url) }}
       title={team.name}
     />
   );

diff --git a/resources/js/interfaces/team-json.ts b/resources/js/interfaces/team-json.ts
@@ -2,8 +2,8 @@
 // See the LICENCE file in the repository root for full licence text.
 
 export default interface TeamJson {
+  flag_url: string | null;
   id: number;
-  logo: string | null;
   name: string;
   short_name: string;
 }