3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-21 15:16:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Wrong component background color

Browse source
This commit is contained in:
Aitor 2024-01-15 11:33:03 +01:00 • committed by Andrey Antukh
parent d30707a02c
commit eeabeadc39
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/app/main/data/dashboard.cljs
View file

@ -366,14 +366,14 @@
(defn hide-file-menu (defn hide-file-menu
[] []
(ptk/reify ::hide-file-menu (ptk/reify ::hide-file-menu
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(update state :dashboard-local (update state :dashboard-local
assoc :menu-open false)))) assoc :menu-open false))))
(defn start-edit-file-name (defn start-edit-file-name
[file-id] [file-id]
(ptk/reify ::start-edit-file-name (ptk/reify ::start-edit-file-menu
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(update state :dashboard-local (update state :dashboard-local

3
frontend/src/app/main/render.cljs
View file

@ -44,6 +44,7 @@
[app.main.ui.shapes.svg-raw :as svg-raw] [app.main.ui.shapes.svg-raw :as svg-raw]
[app.main.ui.shapes.text :as text] [app.main.ui.shapes.text :as text]
[app.main.ui.shapes.text.fontfaces :as ff] [app.main.ui.shapes.text.fontfaces :as ff]
[app.util.dom :as dom]
[app.util.http :as http] [app.util.http :as http]
[app.util.strings :as ust] [app.util.strings :as ust]
[app.util.thumbnails :as th] [app.util.thumbnails :as th]
@ -626,7 +627,7 @@
bounds (gsb/get-object-bounds objects shape) bounds (gsb/get-object-bounds objects shape)
background (when (str/ends-with? object-id "component") background (when (str/ends-with? object-id "component")
(or (:background options) "#aab5ba")) (or (:background options) (dom/get-css-variable "--assets-component-background-color") "#fff"))
x (dm/get-prop bounds :x) x (dm/get-prop bounds :x)
y (dm/get-prop bounds :y) y (dm/get-prop bounds :y)

2
frontend/src/app/main/ui/dashboard.scss
View file

@ -11,7 +11,7 @@
display: grid; display: grid;
grid-template-columns: $s-40 $s-256 1fr; grid-template-columns: $s-40 $s-256 1fr;
grid-template-rows: $s-52 1fr; grid-template-rows: $s-52 1fr;
height: 100.0vh; height: 100vh;
:global(svg#loader-pencil) { :global(svg#loader-pencil) {
fill: $df-secondary; fill: $df-secondary;

6
frontend/src/app/util/dom.cljs
View file

@ -433,6 +433,12 @@
[o prop] [o prop]
(.getPropertyValue ^js o prop)) (.getPropertyValue ^js o prop))
(defn get-css-variable
([variable element]
(.getPropertyValue (.getComputedStyle js/window element) variable))
([variable]
(.getPropertyValue (.getComputedStyle js/window (.-documentElement js/document)) variable)))
(defn focus! (defn focus!
[^js node] [^js node]
(when (some? node) (when (some? node)