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

Merge pull request #5346 from penpot/alotor-fixes-1

Browse source 
Alotor fixes 1
This commit is contained in:
Andrey Antukh 2024-11-25 11:16:25 +01:00 • committed by GitHub
commit 8ee9b45243
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.md
View file

@ -24,11 +24,12 @@
### :sparkles: New features ### :sparkles: New features
- Viewer role for team members [Taiga #1056 & #6590](https://tree.taiga.io/project/penpot/us/1056 & https://tree.taiga.io/project/penpot/us/6590) - Viewer role for team members [Taiga #1056 & #6590](https://tree.taiga.io/project/penpot/us/1056 & https://tree.taiga.io/project/penpot/us/6590)
- File history versions management [Taiga](https://tree.taiga.io/project/penpot/us/187?milestone=411120) - File history versions management [Taiga #187](https://tree.taiga.io/project/penpot/us/187?milestone=411120)
- Rename selected layer via keyboard shortcut and context menu option [Taiga #8882](https://tree.taiga.io/project/penpot/us/8882) - Rename selected layer via keyboard shortcut and context menu option [Taiga #8882](https://tree.taiga.io/project/penpot/us/8882)
### :bug: Bugs fixed ### :bug: Bugs fixed
- Fix problem with some texts desynchronization [Taiga #9379](https://tree.taiga.io/project/penpot/issue/9379)
## 2.3.3 ## 2.3.3

9
frontend/playwright/ui/specs/versions.spec.js
View file

@ -58,10 +58,11 @@ test("Save and restore version", async ({ page }) => {
await page.getByRole("textbox").press("Enter"); await page.getByRole("textbox").press("Enter");
await page await page
.locator("li") .getByLabel("History", { exact: true })
.filter({ hasText: "INIT" }) .locator("div")
.getByRole("button") .nth(3)
.click(); .hover();
await page.getByRole("button", { name: "Open version menu" }).click();
await page.getByRole("button", { name: "Restore" }).click(); await page.getByRole("button", { name: "Restore" }).click();
await workspacePage.mockRPC( await workspacePage.mockRPC(

9
frontend/src/app/main/ui/shapes/text/styles.cljs
View file

@ -49,11 +49,16 @@
(defn generate-paragraph-styles (defn generate-paragraph-styles
[_shape data] [_shape data]
(let [line-height (:line-height data 1.2) (let [line-height (:line-height data)
line-height
(if (and (some? line-height) (not= "" line-height))
line-height
(:line-height txt/default-text-attrs))
text-align (:text-align data "start") text-align (:text-align data "start")
base #js {;; Fix a problem when exporting HTML base #js {;; Fix a problem when exporting HTML
:fontSize 0 ;;(str (:font-size data (:font-size txt/default-text-attrs)) "px") :fontSize 0 ;;(str (:font-size data (:font-size txt/default-text-attrs)) "px")
:lineHeight (:line-height data (:line-height txt/default-text-attrs)) :lineHeight line-height
:margin 0}] :margin 0}]
(cond-> base (cond-> base

3
frontend/src/app/main/ui/workspace/sidebar/versions.cljs
View file

@ -134,7 +134,8 @@
time (dt/timeago (:created-at entry) {:locale locale})] time (dt/timeago (:created-at entry) {:locale locale})]
[:span {:class (stl/css :date)} time])]] [:span {:class (stl/css :date)} time])]]
[:> icon-button* {:variant "ghost" [:> icon-button* {:class (stl/css :version-entry-options)
:variant "ghost"
:aria-label (tr "workspace.versions.version-menu") :aria-label (tr "workspace.versions.version-menu")
:on-click handle-open-menu :on-click handle-open-menu
:icon "menu"}]] :icon "menu"}]]