Merge branch 'pr-2282'

citizenfx · Dec 5, 2023 · d54c2c1 · d54c2c1
2 parents 4b45846 + fa1cee4
commit d54c2c1
Showing 1 changed file with 30 additions and 21 deletions.
diff --git a/...pMenu/parts/LegacyConnectingModal/AdaptiveCardPresenter/AdaptiveCardPresenter.module.scss b/...pMenu/parts/LegacyConnectingModal/AdaptiveCardPresenter/AdaptiveCardPresenter.module.scss
@@ -126,6 +126,7 @@
     }
 
     :global(.ac-pushButton),
+    :global(.ac-pushButton-disabled),
     :global(.ac-inlineActionButton) {
       gap: ui.offset('small');
 
@@ -157,32 +158,40 @@
 
       @include ui.animated('background-color');
 
-      &:hover {
-        border-color: ui.color-token('button-hover-border');
-        background-color: ui.color-token('button-hover-background');
-      }
-
-      &:active {
-        border-color: ui.color-token('button-active-border');
-        background-color: ui.color-token('button-active-background');
+
+      &:global(.ac-pushButton-disabled) {
+        cursor: not-allowed;
+        opacity: .5;
       }
 
-      &:focus-visible:not(:active):not(:hover) {
-        box-shadow: 0 0 0 2px ui.color-token('button-focus-outline');
-      }
+      &:not(:global(.ac-pushButton-disabled)) {
+        &:hover {
+          border-color: ui.color-token('button-hover-border');
+          background-color: ui.color-token('button-hover-background');
+        }
 
-      &:global(.style-positive) {
-        &,
-        &:hover,
         &:active {
-          border-color: ui.color('success');
+          border-color: ui.color-token('button-active-border');
+          background-color: ui.color-token('button-active-background');
         }
-      }
-      &:global(.style-destructive) {
-        &,
-        &:hover,
-        &:active {
-          border-color: ui.color('error');
+
+        &:focus-visible:not(:active):not(:hover) {
+          box-shadow: 0 0 0 2px ui.color-token('button-focus-outline');
+        }
+
+        &:global(.style-positive) {
+          &,
+          &:hover,
+          &:active {
+            border-color: ui.color('success');
+          }
+        }
+        &:global(.style-destructive) {
+          &,
+          &:hover,
+          &:active {
+            border-color: ui.color('error');
+          }
         }
       }
     }