From 055a870c1f9c73a0f8adc5907fe81003aa953612 Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 28 Sep 2022 12:34:16 +0200 Subject: [PATCH 1/2] :bug: Fix view mode login size --- CHANGES.md | 1 + .../resources/styles/main/layouts/login.scss | 55 ++++++++++--------- .../resources/styles/main/partials/modal.scss | 14 +++-- 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 957759bda..3102a582b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -27,6 +27,7 @@ - Fix PDF exportation order [Taiga #4216](https://tree.taiga.io/project/penpot/issue/4216) - Fix some typos [Taiga #4215](https://tree.taiga.io/project/penpot/issue/4215) - Fix "no boards" message in viewer [Taiga #4243](https://tree.taiga.io/project/penpot/issue/4243) +- Fix view mode login size [Taiga #4210](https://tree.taiga.io/project/penpot/issue/4210) ## 1.15.3-beta diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss index b092b7e23..aa790b47c 100644 --- a/frontend/resources/styles/main/layouts/login.scss +++ b/frontend/resources/styles/main/layouts/login.scss @@ -18,7 +18,6 @@ .auth-sidebar { grid-column: 1 / span 1; height: 100vh; - display: flex; padding-top: 7vh; flex-direction: column; @@ -48,14 +47,31 @@ } .auth-content { - align-items: center; + grid-column: 2 / span 1; background-color: $color-white; display: flex; - grid-column: 2 / span 1; - height: 100vh; + align-items: center; justify-content: center; position: relative; - min-height: 48rem; + + .login-form { + margin-bottom: 30px; + + .form-container { + width: 412px; + flex-direction: column; + .auth-buttons { + margin: $size-6 0 $size-4 0; + display: flex; + justify-content: center; + column-gap: 17px; + } + + form { + margin: 2rem 0 0.5rem 0; + } + } + } input { margin-bottom: 0px; @@ -71,21 +87,6 @@ } } - .form-container { - width: 412px; - - .auth-buttons { - margin: $size-6 0 $size-4 0; - display: flex; - justify-content: center; - column-gap: 17px; - } - - form { - margin: 2rem 0 0.5rem 0; - } - } - .btn-large { flex-grow: 1; font-size: 14px; @@ -192,14 +193,14 @@ } } } -} -.terms-login { - bottom: $size-5; - font-size: $fs14; - position: absolute; + .terms-login { + bottom: $size-5; + font-size: $fs14; + position: absolute; - span { - margin: 0 $size-2; + span { + margin: 0 $size-2; + } } } diff --git a/frontend/resources/styles/main/partials/modal.scss b/frontend/resources/styles/main/partials/modal.scss index 956d755af..c2eb969a7 100644 --- a/frontend/resources/styles/main/partials/modal.scss +++ b/frontend/resources/styles/main/partials/modal.scss @@ -1629,7 +1629,10 @@ display: flex; font-family: "worksans", sans-serif; width: 472px; - height: auto; + height: 100%; + max-height: 700px; + position: relative; + overflow: auto; position: relative; .title { @@ -1661,11 +1664,10 @@ &.auth-content { align-items: initial; height: auto; - } - - .links { - margin: 7px 0 0 0; - text-align: left; + .links { + margin: 7px 0 0 0; + text-align: left; + } } } From 953607fc4a980928a58817d9436a316f936e5870 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 4 Oct 2022 14:16:36 +0200 Subject: [PATCH 2/2] :paperclip: Update changes and version files --- CHANGES.md | 3 +++ version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 3102a582b..2b1e4e1a4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,8 @@ # CHANGELOG +## 1.15.5-beta + + ## 1.15.4-beta ### :bug: Bugs fixed diff --git a/version.txt b/version.txt index 5b49f490e..48e25a00a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.15.4-beta +1.15.5-beta