3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-04 04:38:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2023-03-03 10:36:29 +01:00
commit 910352280c
5 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/resources/styles/main/layouts/inspect.scss
View file

@ -28,7 +28,7 @@ $width-settings-bar: 256px;
top: 0;
transition: top 400ms ease 300ms;
margin-bottom: 0;
z-index: 2;
z-index: 10;
}
& .viewer-bottom {
@ -46,7 +46,7 @@ $width-settings-bar: 256px;
top: -48px;
left: 0;
transition: top 400ms ease 300ms;
z-index: 2;
z-index: 10;
margin-bottom: 48px;
&::after {

1
frontend/resources/styles/main/partials/viewer-header.scss
View file

@ -54,6 +54,7 @@
display: flex;
justify-content: flex-end;
position: relative;
z-index: 10;
> * {
margin-left: $size-5;

4
frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
View file

@ -40,8 +40,8 @@
:layer :shape
:constraint :shape
:fill :shape
:shadow :children
:blur :children
:shadow :shape
:blur :shape
:stroke :shape
:text :children
:exports :shape