Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6701 Toolbox. Submenu button doesn't align correctly (UI scaling less 100 per cent) #6724

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
top: 50%;
}
.svc-toolbox__item-submenu-button {
top: calc(var(--ctr-toolbox-item-padding-top, var(--sjs-spacing-x1)));
top: 0;
}
}
}
Expand Down Expand Up @@ -78,15 +78,11 @@
/* Shadow / Medium */
border-radius: var(--ctr-tooltip-corner-radius, var(--sjs-corner-radius-x075));
box-shadow:
var(--ctr-tooltip-shadow-1-offset-x, 0px)
var(--ctr-tooltip-shadow-1-offset-y, 2px)
var(--ctr-tooltip-shadow-1-blur, 8px)
var(--ctr-tooltip-shadow-1-spread, 0px)
var(--ctr-tooltip-shadow-1-offset-x, 0px) var(--ctr-tooltip-shadow-1-offset-y, 2px)
var(--ctr-tooltip-shadow-1-blur, 8px) var(--ctr-tooltip-shadow-1-spread, 0px)
var(--ctr-tooltip-shadow-1-color, var(--sjs-special-glow, #004c441a)),
var(--ctr-tooltip-shadow-2-offset-x, 0px)
var(--ctr-tooltip-shadow-2-offset-y, 1px)
var(--ctr-tooltip-shadow-2-blur, 2px)
var(--ctr-tooltip-shadow-2-spread, 0px)
var(--ctr-tooltip-shadow-2-offset-x, 0px) var(--ctr-tooltip-shadow-2-offset-y, 1px)
var(--ctr-tooltip-shadow-2-blur, 2px) var(--ctr-tooltip-shadow-2-spread, 0px)
var(--ctr-tooltip-shadow-2-color, var(--sjs-special-shadow, #00000040));
// transition:
// max-width 0.1s ease-in-out,
Expand All @@ -95,7 +91,7 @@
overflow: visible;
position: absolute;
z-index: 200;
top: calc(50% + 0.5*var(--ctr-toolbox-group-gap, var(--sjs-spacing-x05)));
top: calc(50% + 0.5 * var(--ctr-toolbox-group-gap, var(--sjs-spacing-x05)));
transform: translate(0, -50%);
pointer-events: none;
.svc-toolbox__item-icon {
Expand All @@ -114,15 +110,11 @@
border-top-color: transparent;
border-inline-end-color: transparent;
box-shadow:
var(--ctr-tooltip-shadow-1-offset-x, 0px)
var(--ctr-tooltip-shadow-1-offset-y, 2px)
var(--ctr-tooltip-shadow-1-blur, 8px)
var(--ctr-tooltip-shadow-1-spread, 0px)
var(--ctr-tooltip-shadow-1-offset-x, 0px) var(--ctr-tooltip-shadow-1-offset-y, 2px)
var(--ctr-tooltip-shadow-1-blur, 8px) var(--ctr-tooltip-shadow-1-spread, 0px)
var(--ctr-tooltip-shadow-1-color, var(--sjs-special-glow, #004c441a)),
var(--ctr-tooltip-shadow-2-offset-x, 0px)
var(--ctr-tooltip-shadow-2-offset-y, 1px)
var(--ctr-tooltip-shadow-2-blur, 2px)
var(--ctr-tooltip-shadow-2-spread, 0px)
var(--ctr-tooltip-shadow-2-offset-x, 0px) var(--ctr-tooltip-shadow-2-offset-y, 1px)
var(--ctr-tooltip-shadow-2-blur, 2px) var(--ctr-tooltip-shadow-2-spread, 0px)
var(--ctr-tooltip-shadow-2-color, var(--sjs-special-shadow, #00000040));
align-self: center;
position: absolute;
Expand Down Expand Up @@ -186,15 +178,11 @@
background-color: var(--ctr-toolbox-item-background-color-hovered, var(--sjs-primary-background-10, #19b3941a));

box-shadow:
var(--ctr-toolbox-item-shadow-hovered-1-offset-x, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-offset-y, 2px)
var(--ctr-toolbox-item-shadow-hovered-1-blur, 8px)
var(--ctr-toolbox-item-shadow-hovered-1-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-offset-x, 0px) var(--ctr-toolbox-item-shadow-hovered-1-offset-y, 2px)
var(--ctr-toolbox-item-shadow-hovered-1-blur, 8px) var(--ctr-toolbox-item-shadow-hovered-1-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-color, #00000000),
var(--ctr-toolbox-item-shadow-hovered-2-offset-x, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-offset-y, 1px)
var(--ctr-toolbox-item-shadow-hovered-2-blur, 2px)
var(--ctr-toolbox-item-shadow-hovered-2-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-offset-x, 0px) var(--ctr-toolbox-item-shadow-hovered-2-offset-y, 1px)
var(--ctr-toolbox-item-shadow-hovered-2-blur, 2px) var(--ctr-toolbox-item-shadow-hovered-2-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-color, #00000000);
transition: 0.1s ease-in-out;

Expand Down Expand Up @@ -231,8 +219,11 @@
position: absolute;
inset-inline-end: var(--ctr-toolbox-item-padding-right, var(--sjs-spacing-x2));
margin-inline-end: var(--ctr-toolbox-item-submenu-button-margin-right, var(--sjs-spacing-x1n));
top: calc(var(--ctr-toolbox-item-padding-top, var(--sjs-spacing-x1)) + var(--ctr-toolbox-gap, var(--sjs-spacing-x05)));
bottom: var(--ctr-toolbox-item-padding-bottom, var(--dft-toolbox-item-padding-bottom));
top: var(--ctr-toolbox-gap, var(--sjs-spacing-x05));
bottom: 0;
margin-top: auto;
margin-bottom: auto;
height: fit-content;
display: inline-flex;
padding: var(--ctr-toolbox-item-submenu-button-padding-top, var(--sjs-spacing-x05))
var(--ctr-toolbox-item-submenu-button-padding-right, var(--sjs-spacing-x05))
Expand All @@ -241,10 +232,16 @@
box-sizing: border-box;
align-items: center;
border-radius: var(--ctr-toolbox-item-submenu-button-corner-radius, var(--sjs-corner-radius-x05));
background-color: var(--ctr-toolbox-item-submenu-button-background-color, var(--sjs-layer-1-background-500, #ffffffff));
background-color: var(
--ctr-toolbox-item-submenu-button-background-color,
var(--sjs-layer-1-background-500, #ffffffff)
);
transition: background-color $creator-transition-duration;
&:hover {
background-color: var(--ctr-toolbox-item-submenu-button-background-color-hovered, var(--sjs-primary-background-10, #19b3941a));
background-color: var(
--ctr-toolbox-item-submenu-button-background-color-hovered,
var(--sjs-primary-background-10, #19b3941a)
);
}
svg {
fill: var(--ctr-toolbox-item-submenu-button-icon-color, var(--sjs-layer-1-foreground-50, #00000080));
Expand Down Expand Up @@ -274,10 +271,8 @@
.svc-toolbox__item {
background: var(--ctr-toolbox-item-background-color-pressed, var(--sjs-layer-1-background-400, #f5f5f5ff));
box-shadow: var(--ctr-toolbox-item-shadow-pressed-offset-x, 0px)
var(--ctr-toolbox-item-shadow-pressed-offset-y, 1px)
var(--ctr-toolbox-item-shadow-pressed-blur, 2px)
var(--ctr-toolbox-item-shadow-pressed-spread, 0px)
var(--ctr-toolbox-item-shadow-pressed-color, #00000000);
var(--ctr-toolbox-item-shadow-pressed-offset-y, 1px) var(--ctr-toolbox-item-shadow-pressed-blur, 2px)
var(--ctr-toolbox-item-shadow-pressed-spread, 0px) var(--ctr-toolbox-item-shadow-pressed-color, #00000000);
}

.svc-toolbox__item-title {
Expand Down Expand Up @@ -323,15 +318,11 @@
& > .sv-popup__container > .sv-popup__body-content {
border-radius: var(--ctr-toolbox-submenu-corner-radius, var(--sjs-corner-radius-x1));
box-shadow:
var(--ctr-toolbox-submenu-shadow-1-offset-x, 0px)
var(--ctr-toolbox-submenu-shadow-1-offset-y, 2px)
var(--ctr-toolbox-submenu-shadow-1-blur, 8px)
var(--ctr-toolbox-submenu-shadow-1-spread, 0px)
var(--ctr-toolbox-submenu-shadow-1-offset-x, 0px) var(--ctr-toolbox-submenu-shadow-1-offset-y, 2px)
var(--ctr-toolbox-submenu-shadow-1-blur, 8px) var(--ctr-toolbox-submenu-shadow-1-spread, 0px)
var(--ctr-toolbox-submenu-shadow-1-color, var(--sjs-special-glow, #004c441a)),
var(--ctr-toolbox-submenu-shadow-2-offset-x, 0px)
var(--ctr-toolbox-submenu-shadow-2-offset-y, 16px)
var(--ctr-toolbox-submenu-shadow-2-blur, 32px)
var(--ctr-toolbox-submenu-shadow-2-spread, 0px)
var(--ctr-toolbox-submenu-shadow-2-offset-x, 0px) var(--ctr-toolbox-submenu-shadow-2-offset-y, 16px)
var(--ctr-toolbox-submenu-shadow-2-blur, 32px) var(--ctr-toolbox-submenu-shadow-2-spread, 0px)
var(--ctr-toolbox-submenu-shadow-2-color, var(--sjs-special-glow, #004c441a));
background: var(--ctr-toolbox-submenu-background-color, var(--sjs-layer-1-background-500, #ffffffff));
padding: 0;
Expand All @@ -357,15 +348,11 @@
border-radius: var(--ctr-toolbox-item-corner-radius, var(--sjs-corner-radius-x1));
background: var(--ctr-toolbox-item-background-color-submenu, var(--sjs-layer-1-background-500, #ffffffff));
box-shadow:
var(--ctr-toolbox-item-shadow-hovered-1-offset-x, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-offset-y, 2px)
var(--ctr-toolbox-item-shadow-hovered-1-blur, 8px)
var(--ctr-toolbox-item-shadow-hovered-1-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-offset-x, 0px) var(--ctr-toolbox-item-shadow-hovered-1-offset-y, 2px)
var(--ctr-toolbox-item-shadow-hovered-1-blur, 8px) var(--ctr-toolbox-item-shadow-hovered-1-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-1-color, #00000000),
var(--ctr-toolbox-item-shadow-hovered-2-offset-x, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-offset-y, 1px)
var(--ctr-toolbox-item-shadow-hovered-2-blur, 2px)
var(--ctr-toolbox-item-shadow-hovered-2-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-offset-x, 0px) var(--ctr-toolbox-item-shadow-hovered-2-offset-y, 1px)
var(--ctr-toolbox-item-shadow-hovered-2-blur, 2px) var(--ctr-toolbox-item-shadow-hovered-2-spread, 0px)
var(--ctr-toolbox-item-shadow-hovered-2-color, #00000000);
transition: 0.1s ease-in-out;
padding: var(--ctr-toolbox-item-padding-top-submenu, var(--sjs-spacing-x150))
Expand Down