From 32405ed1d5d6c49d235fd1c2120ffa477d8732fa Mon Sep 17 00:00:00 2001 From: Muffin Date: Sat, 30 Dec 2023 21:52:00 -0600 Subject: [PATCH] merge-upstream: various more style fixes --- src/addons/addon-precedence.js | 10 ++++++---- .../block-palette-icons/icons/control_icon.svg | 2 +- .../block-palette-icons/icons/events_icon.svg | 2 +- .../block-palette-icons/icons/sensing_icon.svg | 2 +- src/addons/addons/debugger/style.css | 17 ++++++++--------- src/addons/addons/hide-flyout/style.css | 1 + src/addons/addons/vol-slider/userstyle.css | 5 ++++- src/addons/generated/upstream-meta.json | 2 +- src/components/menu-bar/menu-bar.jsx | 3 +++ src/css/z-index.css | 2 +- 10 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/addons/addon-precedence.js b/src/addons/addon-precedence.js index 9d29e64a390..f99a3112af9 100644 --- a/src/addons/addon-precedence.js +++ b/src/addons/addon-precedence.js @@ -1,10 +1,12 @@ -// This list is a subset of `addons` and defines the order by which addon CSS should -// applied in. Items later in this list are given higher precedence. Addons not listed -// here are implied to have the lowest possible precedence. +// This list is a subset of all addon IDs to control the order of userstyles. +// The last item in the list is given the highest precedence (last in the DOM). +// If an addon isn't listed here, it's interpreted to have lowest precedence and +// that its order with other unlisted addons does not matter. const addonPrecedence = [ 'columns', 'editor-stage-left', - 'editor-theme3' + 'editor-theme3', + 'hide-stage' ]; /** diff --git a/src/addons/addons/block-palette-icons/icons/control_icon.svg b/src/addons/addons/block-palette-icons/icons/control_icon.svg index 4fb2fa1876a..6aab24539f7 100644 --- a/src/addons/addons/block-palette-icons/icons/control_icon.svg +++ b/src/addons/addons/block-palette-icons/icons/control_icon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/addons/addons/block-palette-icons/icons/events_icon.svg b/src/addons/addons/block-palette-icons/icons/events_icon.svg index b148a7cfebd..252da6c4882 100644 --- a/src/addons/addons/block-palette-icons/icons/events_icon.svg +++ b/src/addons/addons/block-palette-icons/icons/events_icon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/addons/addons/block-palette-icons/icons/sensing_icon.svg b/src/addons/addons/block-palette-icons/icons/sensing_icon.svg index de698463dd9..cedcc3286e5 100644 --- a/src/addons/addons/block-palette-icons/icons/sensing_icon.svg +++ b/src/addons/addons/block-palette-icons/icons/sensing_icon.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/addons/addons/debugger/style.css b/src/addons/addons/debugger/style.css index feb817fb776..d3cf74a40a5 100644 --- a/src/addons/addons/debugger/style.css +++ b/src/addons/addons/debugger/style.css @@ -32,7 +32,8 @@ display: none; position: absolute; z-index: 492; - background-color: white; + background-color: var(--ui-modal-background); + color: var(--ui-modal-foreground); width: 565px; height: 25rem; } @@ -163,20 +164,18 @@ box-sizing: border-box; display: flex; align-items: center; - border-bottom: 1px solid rgba(0, 0, 0, 0.15); + border-bottom: 1px solid var(--ui-black-transparent); padding-left: 4px; font-family: monospace; - color: black; } .sa-debugger-log[data-type="warn"] { - border-color: hsl(50deg, 100%, 75%); - color: hsl(39deg 100% 18%); - background-color: hsl(50deg 100% 95%); + border-color: hsla(56deg, 100%, 69%, 0.5); + background-color: hsla(56deg, 100%, 69%, 0.3); } .sa-debugger-log[data-type="error"] { - border-color: hsl(0deg 100% 92%); + border-color: hsla(0deg, 100%, 69%, 0.5); color: red; - background-color: hsl(0deg 100% 95%); + background-color: hsla(0deg, 100%, 69%, 0.3); } .sa-debugger-log-repeats { @@ -273,7 +272,7 @@ display: block; text-align: center; height: 24px; - color: #2121bf; + color: var(--link-color); } .sa-debugger-compiler-warning[hidden] { display: none; diff --git a/src/addons/addons/hide-flyout/style.css b/src/addons/addons/hide-flyout/style.css index 16b04b1317e..32bccabdf14 100644 --- a/src/addons/addons/hide-flyout/style.css +++ b/src/addons/addons/hide-flyout/style.css @@ -91,6 +91,7 @@ .sa-lock-button img { width: 20px; + user-select: none; filter: var(--editorDarkMode-accent-filter, none); } diff --git a/src/addons/addons/vol-slider/userstyle.css b/src/addons/addons/vol-slider/userstyle.css index af0ad3c4b81..fbc5d5fa550 100644 --- a/src/addons/addons/vol-slider/userstyle.css +++ b/src/addons/addons/vol-slider/userstyle.css @@ -30,7 +30,10 @@ .sa-small-stage .sa-vol-slider-input, .sa-small-stage .sa-vol-slider-icon:not([data-icon="mute"]) { - display: none; + display: none !important; +} +.sa-small-stage .sa-vol-slider { + width: 0; } .sa-vol-slider-input { diff --git a/src/addons/generated/upstream-meta.json b/src/addons/generated/upstream-meta.json index b96f50c7670..d3f8ef1cbde 100644 --- a/src/addons/generated/upstream-meta.json +++ b/src/addons/generated/upstream-meta.json @@ -1 +1 @@ -{"commit":"ce0cd3d"} \ No newline at end of file +{"commit":"a79f5d8"} \ No newline at end of file diff --git a/src/components/menu-bar/menu-bar.jsx b/src/components/menu-bar/menu-bar.jsx index 972ea257a4e..68ec8511eb4 100644 --- a/src/components/menu-bar/menu-bar.jsx +++ b/src/components/menu-bar/menu-bar.jsx @@ -835,6 +835,9 @@ class MenuBar extends React.Component { )} + + + {this.props.canEditTitle ? (