Просмотр исходного кода

Merge pull request #24718 from overleaf/td-bs5-warning-bg

Fix for form warning text colour

GitOrigin-RevId: 48a6d710548d919a5968a04709b41e4f1b2cd004
Tim Down 1 год назад
Родитель
Сommit
832028e92d

+ 1 - 1
services/web/frontend/js/shared/components/beta-badge-icon.tsx

@@ -16,7 +16,7 @@ const BetaBadgeIcon: FC<{
     )
   } else {
     return (
-      <OLBadge bg="warning" className="beta-badge">
+      <OLBadge bg="warning-light-bg" text="warning">
         β
       </OLBadge>
     )

+ 15 - 1
services/web/frontend/stylesheets/bootstrap-5/abstracts/variable-overrides.scss

@@ -162,10 +162,24 @@ $primary: $bg-accent-01;
 $secondary: $bg-light-primary;
 $success: $bg-accent-01;
 $info: $bg-info-01;
-$warning: $bg-warning-03;
+$warning: $content-warning;
 $danger: $bg-danger-01;
 $light: $bg-light-tertiary;
 $dark: $neutral-90;
+$warning-light-gb: $bg-warning-03;
+
+// Theme colors
+$theme-colors: (
+  'primary': $primary,
+  'secondary': $secondary,
+  'success': $success,
+  'info': $info,
+  'warning': $warning,
+  'warning-light-bg': $warning-light-gb,
+  'danger': $danger,
+  'light': $light,
+  'dark': $dark,
+);
 
 // Body colors
 $body-color: $content-primary;

+ 0 - 4
services/web/frontend/stylesheets/bootstrap-5/components/badge.scss

@@ -10,10 +10,6 @@ $max-width: 160px;
   &:not(.badge-tag) {
     max-width: $max-width;
   }
-
-  &.bg-warning {
-    --bs-badge-color: var(--content-warning);
-  }
 }
 
 .badge-prepend {

+ 4 - 2
services/web/test/frontend/components/shared/split-test-badge.spec.tsx

@@ -29,7 +29,8 @@ describe('split test badge', function () {
 
     cy.findByRole('link', { name: /this is an alpha feature/i })
       .should('have.attr', 'href', '/alpha/participate')
-      .find('.badge.alpha-badge')
+      .find('.badge')
+      .contains('α')
   })
 
   it('does not render the alpha badge when user is not assigned to the variant', function () {
@@ -87,7 +88,8 @@ describe('split test badge', function () {
 
     cy.findByRole('link', { name: /this is a beta feature/i })
       .should('have.attr', 'href', '/beta/participate')
-      .find('.badge.beta-badge')
+      .find('.badge')
+      .contains('β')
   })
 
   it('does not render the beta badge when user is not assigned to the variant', function () {