Backed out 1 changesets (bug 1832855) for causing failures on beta a=…

…pascalc Backed out changeset aef6eaa050ab (bug 1832855)
i3roly · May 23, 2023 · 45eef82 · 45eef82
1 parent 48dc95d
commit 45eef82
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 58 deletions.
diff --git a/browser/components/newtab/aboutwelcome/content/aboutwelcome.css b/browser/components/newtab/aboutwelcome/content/aboutwelcome.css
@@ -511,7 +511,6 @@ html {
 .onboardingContainer .screen[pos=center].with-video .main-content .secondary-cta .arrow-icon {
   -moz-context-properties: fill;
   fill: currentColor;
-  text-decoration: none;
 }
 .onboardingContainer .screen[pos=center].with-video .main-content .secondary-cta .arrow-icon::after {
   content: "";
@@ -529,10 +528,10 @@ html {
   font-size: 0.72em;
   font-weight: 600;
   padding: 8px 16px;
-  text-decoration: none;
   color: var(--in-content-button-text-color);
 }
 .onboardingContainer .screen[pos=center].with-video .main-content .secondary-cta .secondary:hover {
+  text-decoration: none;
   background-color: var(--in-content-button-background-hover) !important;
   color: var(--in-content-button-text-color-hover);
 }
@@ -624,21 +623,16 @@ html {
   margin: 8px 0;
 }
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .additional-cta.cta-link {
+  color: var(--in-content-link-color);
   background: none;
   padding: 0;
   font-weight: normal;
   text-decoration: underline;
   cursor: pointer;
-  color: var(--in-content-link-color);
 }
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .additional-cta.cta-link:hover {
-  text-decoration: none;
   color: var(--in-content-link-color-hover);
 }
-.onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .additional-cta.cta-link:active {
-  text-decoration: none;
-  color: var(--in-content-link-color-active);
-}
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .additional-cta.secondary:hover {
   background-color: var(--in-content-button-background-hover);
 }
@@ -658,16 +652,15 @@ html {
   font-size: 0.72em;
   font-weight: 600;
   padding: 8px 16px;
-  text-decoration: none;
 }
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .secondary-cta .secondary:hover {
+  text-decoration: none;
   background-color: var(--in-content-button-background-hover) !important;
   color: var(--in-content-button-text-color-hover);
 }
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .secondary-cta .arrow-icon {
   -moz-context-properties: fill;
   fill: currentColor;
-  text-decoration: none;
 }
 .onboardingContainer .screen[pos=split] .section-main .main-content .action-buttons .secondary-cta .arrow-icon::after {
   content: "";
@@ -951,19 +944,6 @@ html {
     text-align: center;
   }
 }
-.onboardingContainer .text-link {
-  text-decoration: underline;
-  cursor: pointer;
-  color: var(--in-content-link-color);
-}
-.onboardingContainer .text-link:hover {
-  text-decoration: none;
-  color: var(--in-content-link-color-hover);
-}
-.onboardingContainer .text-link:active {
-  text-decoration: none;
-  color: var(--in-content-link-color-active);
-}
 .onboardingContainer .welcome-text {
   display: flex;
   flex-direction: column;
@@ -1231,18 +1211,9 @@ html {
 .onboardingContainer .mobile-downloads .email-link {
   font-size: 16px;
   font-weight: 400;
-  background: none;
   text-decoration: underline;
-  cursor: pointer;
   color: var(--in-content-link-color);
-}
-.onboardingContainer .mobile-downloads .email-link:hover {
-  text-decoration: none;
-  color: var(--in-content-link-color-hover);
-}
-.onboardingContainer .mobile-downloads .email-link:active {
-  text-decoration: none;
-  color: var(--in-content-link-color-active);
+  background: none;
 }
 .onboardingContainer .mobile-downloads .email-link:hover {
   background: none;

diff --git a/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss b/browser/components/newtab/content-src/aboutwelcome/aboutwelcome.scss
@@ -187,7 +187,6 @@ html {
     .arrow-icon {
       -moz-context-properties: fill;
       fill: currentColor;
-      text-decoration: none;
 
       &::after {
         content: '';
@@ -210,31 +209,15 @@ html {
     font-size: 0.72em;
     font-weight: 600;
     padding: 8px 16px;
-    text-decoration: none;
 
     &:hover {
+      text-decoration: none;
       // sass-lint:disable-block no-important
       background-color: var(--in-content-button-background-hover) !important;
       color: var(--in-content-button-text-color-hover);
     }
   }
 
-  @mixin text-link-styles {
-    text-decoration: underline;
-    cursor: pointer;
-    color: var(--in-content-link-color);
-
-    &:hover {
-      text-decoration: none;
-      color: var(--in-content-link-color-hover);
-    }
-
-    &:active {
-      text-decoration: none;
-      color: var(--in-content-link-color-active);
-    }
-  }
-
   .screen {
     display: flex;
     position: relative;
@@ -451,11 +434,16 @@ html {
               margin: 8px 0;
 
               &.cta-link {
+                color: var(--in-content-link-color);
                 background: none;
                 padding: 0;
                 font-weight: normal;
+                text-decoration: underline;
+                cursor: pointer;
 
-                @include text-link-styles;
+                &:hover {
+                  color: var(--in-content-link-color-hover);
+                }
               }
 
               &.secondary {
@@ -824,10 +812,6 @@ html {
     }
   }
 
-  .text-link {
-    @include text-link-styles;
-  }
-
   .welcome-text {
     display: flex;
     flex-direction: column;
@@ -1162,10 +1146,10 @@ html {
     .email-link {
       font-size: 16px;
       font-weight: 400;
+      text-decoration: underline;
+      color: var(--in-content-link-color);
       background: none;
 
-      @include text-link-styles;
-
       &:hover {
         background: none;
       }