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

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

Browse source
This commit is contained in:
Andrey Antukh 2023-07-06 13:52:23 +02:00
commit 4561a87450
70 changed files with 655 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/resources/styles/main/partials/comments.scss
View file

@ -246,7 +246,7 @@
pointer-events: auto;
.thread-groups {
height: 100%;
height: calc(100% - 34px);
overflow-y: scroll;
hr {
border: 0;

2
frontend/resources/styles/main/partials/dashboard-fonts.scss
View file

@ -60,7 +60,7 @@
font-size: $fs14;
background-color: $color-white;
display: flex;
min-width: 1000px;
max-width: 1000px;
width: 100%;
min-height: 97px;
align-items: center;

2
frontend/resources/styles/main/partials/dashboard-team.scss
View file

@ -324,7 +324,7 @@
box-shadow: 0px 2px 8px rgba(0, 0, 0, 0.25);
z-index: 12;
top: 30px;
left: 6px;
left: -151px;
width: 155px;
hr {

15
frontend/resources/styles/main/partials/dashboard.scss
View file

@ -466,20 +466,27 @@
.dashboard-templates-section {
position: absolute;
display: flex;
flex-direction: column;
justify-content: flex-end;
bottom: 0;
width: 100%;
height: 285px;
height: 228px;
transition: bottom 300ms;
pointer-events: none;
&.collapsed {
bottom: -228px;
transition: bottom 300ms;
}
.title {
width: 100%;
pointer-events: all;
width: fit-content;
top: -56px;
right: -28px;
text-align: right;
height: 56px;
position: absolute;
button {
border: none;
cursor: pointer;
@ -529,6 +536,7 @@
display: flex;
align-items: center;
justify-content: center;
pointer-events: all;
svg {
width: 12px;
height: 12px;
@ -550,6 +558,7 @@
}
.content {
pointer-events: all;
background-color: $color-white;
width: 200%;
height: 229px;

67
frontend/resources/styles/main/partials/sidebar-layers.scss
View file

@ -355,10 +355,12 @@ span.element-name {
.pages-tool-bar {
display: flex;
justify-content: space-between;
height: 32px;
margin-top: 8px;
height: 40px;
padding: 0;
&.search {
margin-top: 8px;
padding: 8px;
.search-box {
border: 1px solid $color-gray-20;
border-radius: $br4;
@ -403,6 +405,67 @@ span.element-name {
margin: 0 2px 0 5px;
cursor: pointer;
}
.page-name {
padding: 8px;
margin-top: 8px;
}
.icon-search {
margin-top: 8px;
}
.focus-title {
width: 100%;
height: 100%;
display: grid;
align-items: center;
grid-template-columns: 16px 1fr auto;
grid-column-gap: 8px;
cursor: pointer;
.back-button {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
background: none;
border: none;
padding: 0;
margin: 0;
svg {
width: 12px;
height: 12px;
fill: $color-gray-20;
transform: rotate(180deg);
}
&:hover {
svg {
fill: $color-primary;
}
}
}
.focus-name {
height: 100%;
display: flex;
justify-content: flex-start;
align-items: center;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.focus-mode {
color: $color-primary;
border: 1px solid $color-primary;
border-radius: $br3;
font-size: $fs10;
text-transform: uppercase;
padding: 0px 4px;
display: flex;
align-items: center;
}
}
}
}
.active-filters {

47
frontend/resources/styles/main/partials/sidebar.scss
View file

@ -40,6 +40,7 @@
flex-shrink: 0;
padding: $size-2;
overflow: hidden;
margin: 0;
svg {
fill: $color-gray-20;
@ -136,52 +137,6 @@
padding: 0.25rem;
}
}
& .focus-title {
width: 100%;
height: 100%;
display: grid;
align-items: center;
grid-template-columns: auto 1fr auto;
grid-column-gap: 8px;
cursor: pointer;
& .back-button {
background: none;
border: none;
padding: 0;
margin: 0;
& svg {
fill: $color-white;
transform: rotate(180deg);
margin-top: 3px;
}
&:hover {
svg {
fill: $color-primary;
}
}
}
& .focus-name {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
& .focus-mode {
color: $color-primary;
border: 1px solid $color-primary;
border-radius: $br3;
font-size: $fs10;
text-transform: uppercase;
padding: 0px 4px;
display: flex;
align-items: center;
}
}
}
.assets-bar .tool-window {

4
frontend/resources/styles/main/partials/viewer.scss
View file

@ -182,8 +182,8 @@
right: 0;
top: 50px;
width: 256px;
height: 100%;
z-index: 10;
height: calc(100vh - 48px);
z-index: 9;
}
.empty-state {