merge-upstream: various style fixes

TurboWarp · Dec 31, 2023 · ec5ce41 · ec5ce41
1 parent 1579628
commit ec5ce41
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 12 deletions.
diff --git a/src/addons/addons/vol-slider/userstyle.css b/src/addons/addons/vol-slider/userstyle.css
@@ -67,3 +67,7 @@
   border-radius: 50%;
   background-color: #c234c2;
 }
+
+.sa-mute-project-icon {
+  display: none !important;
+}
diff --git a/src/addons/generated/upstream-meta.json b/src/addons/generated/upstream-meta.json
@@ -1 +1 @@
-{"commit":"40086e2"}
+{"commit":"ce0cd3d"}
diff --git a/src/addons/settings/settings.css b/src/addons/settings/settings.css
@@ -281,9 +281,9 @@ a:active, a:focus {
     display: block;
     background: #333;
     width: 40px;
-    height: 20px;
-    border: none;
-    border-radius: 10px;
+    height: 22px;
+    border: 1px solid $ui-black-transparent;
+    border-radius: 12px;
     position: relative;
     cursor: pointer;
     transition: 0.25s ease;
@@ -296,18 +296,19 @@ a:active, a:focus {
     content: "";
     position: absolute;
     display: block;
-    width: 10px;
-    height: 10px;
+    width: 12px;
+    height: 12px;
     background: #fff;
-    border-radius: 5px;
-    top: 5px;
-    left: 5px;
+    border-radius: 6px;
+    top: 4px;
+    left: 4px;
     transition: 0.25s ease;
     transition-property: background, left;
 }
 .switch[state="on"]::before {
     background: #fff;
-    left: 25px;
+    left: auto;
+    right: 3px;
 }
 .switch:active, .switch:focus-within {
     outline: none;
@@ -455,6 +456,8 @@ a:active, a:focus {
 }
 
 .reset-setting-button {
+    background-color: $input-background;
+    border-left-width: 0;
     border-radius: 0 4px 4px 0px;
     box-sizing: border-box;
     height: 30px;
@@ -478,7 +481,7 @@ a:active, a:focus {
     margin: 0;
     background: transparent;
     border: none;
-    background: $ui-tertiary;
+    background: $ui-secondary;
     border: 1px solid $ui-black-transparent;
     border-right-width: 0;
     transition: 0.25s ease;

diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx
@@ -497,6 +497,8 @@ class MenuBar extends React.Component {
                                 <img
                                     src={fileIcon}
                                     draggable={false}
+                                    width={20}
+                                    height={20}
                                 />
                                 <span className={styles.collapsibleLabel}>
                                     <FormattedMessage
@@ -508,6 +510,8 @@ class MenuBar extends React.Component {
                                 <img
                                     src={dropdownCaret}
                                     draggable={false}
+                                    width={8}
+                                    height={5}
                                 />
                                 <MenuBarMenu
                                     className={classNames(styles.menuBarMenu)}
@@ -646,6 +650,8 @@ class MenuBar extends React.Component {
                             <img
                                 src={editIcon}
                                 draggable={false}
+                                width={20}
+                                height={20}
                             />
                             <span className={styles.collapsibleLabel}>
                                 <FormattedMessage
@@ -657,6 +663,8 @@ class MenuBar extends React.Component {
                             <img
                                 src={dropdownCaret}
                                 draggable={false}
+                                width={8}
+                                height={5}
                             />
                             <MenuBarMenu
                                 className={classNames(styles.menuBarMenu)}
@@ -814,6 +822,8 @@ class MenuBar extends React.Component {
                                 <img
                                     src={addonsIcon}
                                     draggable={false}
+                                    width={20}
+                                    height={20}
                                 />
                                 <span className={styles.collapsibleLabel}>
                                     <FormattedMessage

diff --git a/src/components/menu-bar/settings-menu.jsx b/src/components/menu-bar/settings-menu.jsx
@@ -31,6 +31,8 @@ const SettingsMenu = ({
         <img
             src={settingsIcon}
             draggable={false}
+            width={20}
+            height={20}
         />
         <span className={styles.dropdownLabel}>
             <FormattedMessage
@@ -42,6 +44,8 @@ const SettingsMenu = ({
         <img
             src={dropdownCaret}
             draggable={false}
+            width={8}
+            height={5}
         />
         <MenuBarMenu
             className={menuBarStyles.menuBarMenu}

diff --git a/src/components/stage-selector/stage-selector.css b/src/components/stage-selector/stage-selector.css
@@ -89,7 +89,7 @@ $header-height: calc($stage-menu-height - 2px);
     user-select: none;
     border: 1px solid $ui-black-transparent;
     border-radius: .25rem;
-    box-shadow: inset 0 0 4px $ui-black-transparent;
+    box-shadow: inset 0 0 4px $shadow;
     max-width: 64px;
     max-height: 48px;
 }