style(button-toggle): amend styles

Sage · Oct 16, 2023 · 78c10a1 · 78c10a1
1 parent fe4da3b
commit 78c10a1
Showing 1 changed file with 2 additions and 97 deletions.
diff --git a/src/components/button-toggle/button-toggle.style.ts b/src/components/button-toggle/button-toggle.style.ts
@@ -136,13 +136,7 @@ const StyledButtonToggle = styled.button<StyledButtonToggleProps>`
         }
       }
       cursor: not-allowed;
-    `}
-
-<<<<<<< HEAD
-
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
+    `}s
 
       & ${StyledIcon} {
     color: var(--colorsActionMinor500);
@@ -180,15 +174,8 @@ const StyledButtonToggle = styled.button<StyledButtonToggleProps>`
         0px 0px 0px var(--borderWidth600) var(--colorsUtilityYin090);
     }
   }
-=======
-  ${({ variant }) =>
-    variant === "minor" &&
-    css`
-=======
 
->>>>>>> 0a84e5447 (feat(button-toggle): rm variant prop)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
-      & ${StyledIcon} {
+  & ${StyledIcon} {
     color: var(--colorsActionMinor500);
     :not([aria-pressed="true"]):not(:disabled):hover {
       color: var(--colorsActionMinorYang100);
@@ -214,36 +201,6 @@ const StyledButtonToggle = styled.button<StyledButtonToggleProps>`
       color: var(--colorsActionMinorYang100);
     }
   }
-
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-      &[aria-pressed="true"]:not(:hover) {
-        box-shadow: inset 0px 0px 0px 3px var(--colorsActionMinor500);
-        background-color: transparent;
-        :focus {
-          box-shadow: inset 0px 0px 0px 3px var(--colorsActionMinor500),
-            0px 0px 0px var(--borderWidth300) var(--colorsSemanticFocus500),
-            0px 0px 0px var(--borderWidth600) var(--colorsUtilityYin090);
-        }
-      }
-    `}
->>>>>>> 8c445eebb (feat(button-toggle): add minor child)
-=======
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
-  &[aria-pressed="true"]:not(:hover) {
-    box-shadow: inset 0px 0px 0px 3px var(--colorsActionMinor500);
-    background-color: transparent;
-    :focus {
-      box-shadow: inset 0px 0px 0px 3px var(--colorsActionMinor500),
-        0px 0px 0px var(--borderWidth300) var(--colorsSemanticFocus500),
-        0px 0px 0px var(--borderWidth600) var(--colorsUtilityYin090);
-    }
-  }
-<<<<<<< HEAD
-=======
->>>>>>> 0a84e5447 (feat(button-toggle): rm variant prop)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
 `;
 
 const iconFontSizes = {
@@ -295,21 +252,7 @@ const StyledButtonToggleWrapper = styled.div<StyledButtonToggleWrapperProps>`
       css`
         &&&& {
           ${StyledButtonToggle} {
-<<<<<<< HEAD
             border-radius: var(--borderRadius050);
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-            border-radius: var(--borderRadius050);
-=======
-            border-radius: ${variant === "minor"
-              ? "var(--borderRadius050)"
-              : "var(--borderRadius400)"};
->>>>>>> 8c445eebb (feat(button-toggle): add minor child)
-=======
-            border-radius: var(--borderRadius050);
->>>>>>> 0a84e5447 (feat(button-toggle): rm variant prop)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
           }
         }
       `}
@@ -319,53 +262,15 @@ const StyledButtonToggleWrapper = styled.div<StyledButtonToggleWrapperProps>`
         &&&& {
           :first-of-type {
             ${StyledButtonToggle} {
-<<<<<<< HEAD
-              border-top-left-radius: var(--borderRadius050);
-              border-bottom-left-radius: var(--borderRadius050);
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-              border-top-left-radius: var(--borderRadius050);
-              border-bottom-left-radius: var(--borderRadius050);
-=======
-              border-top-left-radius: ${variant === "minor"
-                ? "var(--borderRadius050)"
-                : "var(--borderRadius400)"};
-              border-bottom-left-radius: ${variant === "minor"
-                ? "var(--borderRadius050)"
-                : "var(--borderRadius400)"};
->>>>>>> 8c445eebb (feat(button-toggle): add minor child)
-=======
               border-top-left-radius: var(--borderRadius050);
               border-bottom-left-radius: var(--borderRadius050);
->>>>>>> 0a84e5447 (feat(button-toggle): rm variant prop)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
             }
           }
 
           :last-of-type {
             ${StyledButtonToggle} {
-<<<<<<< HEAD
-              border-top-right-radius: var(--borderRadius050);
-              border-bottom-right-radius: var(--borderRadius050);
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-              border-top-right-radius: var(--borderRadius050);
-              border-bottom-right-radius: var(--borderRadius050);
-=======
-              border-top-right-radius: ${variant === "minor"
-                ? "var(--borderRadius050)"
-                : "var(--borderRadius400)"};
-              border-bottom-right-radius: ${variant === "minor"
-                ? "var(--borderRadius050)"
-                : "var(--borderRadius400)"};
->>>>>>> 8c445eebb (feat(button-toggle): add minor child)
-=======
               border-top-right-radius: var(--borderRadius050);
               border-bottom-right-radius: var(--borderRadius050);
->>>>>>> 0a84e5447 (feat(button-toggle): rm variant prop)
->>>>>>> df20abe7b (feat(button-toggle): rm variant prop)
             }
           }
         }