Skip to content

Commit 93e09f1

Browse files
committed
fix UI theme for SplitEditor and CreateFromURL modal
1 parent c570fc9 commit 93e09f1

File tree

2 files changed

+34
-113
lines changed

2 files changed

+34
-113
lines changed

browser/components/MarkdownSplitEditor.styl

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,14 @@
1616
z-index 10
1717
cursor col-resize
1818

19-
body[data-theme="dark"]
20-
.root
21-
.slider
22-
border-left 1px solid $ui-dark-borderColor
19+
apply-theme(theme)
20+
body[data-theme={theme}]
21+
.root
22+
.slider
23+
border-left 1px solid get-theme-var(theme, 'borderColor')
2324

24-
body[data-theme="solarized-dark"]
25-
.root
26-
.slider
27-
border-left 1px solid $ui-solarized-dark-borderColor
25+
for theme in 'dark' 'dracula' 'solarized-dark'
26+
apply-theme(theme)
2827

29-
body[data-theme="monokai"]
30-
.root
31-
.slider
32-
border-left 1px solid $ui-monokai-borderColor
33-
34-
body[data-theme="dracula"]
35-
.root
36-
.slider
37-
border-left 1px solid $ui-dracula-borderColor
28+
for theme in $themes
29+
apply-theme(theme)

browser/main/modals/CreateMarkdownFromURLModal.styl

Lines changed: 25 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -51,110 +51,39 @@
5151
font-size 14px
5252
colorPrimaryButton()
5353

54-
body[data-theme="dark"]
55-
.root
56-
modalDark()
57-
width 500px
58-
height 270px
59-
overflow hidden
60-
position relative
61-
62-
.header
63-
background-color transparent
64-
border-color $ui-dark-borderColor
65-
color $ui-dark-text-color
66-
67-
.control-folder-label
68-
color $ui-dark-text-color
69-
70-
.control-folder-input
71-
border 1px solid $ui-input--create-folder-modal
72-
color white
73-
74-
.description
75-
color $ui-inactive-text-color
76-
77-
.control-confirmButton
78-
colorDarkPrimaryButton()
79-
80-
body[data-theme="solarized-dark"]
81-
.root
82-
modalSolarizedDark()
83-
width 500px
84-
height 270px
85-
overflow hidden
86-
position relative
87-
88-
.header
89-
background-color transparent
90-
border-color $ui-dark-borderColor
91-
color $ui-solarized-dark-text-color
92-
93-
.control-folder-label
94-
color $ui-solarized-dark-text-color
95-
96-
.control-folder-input
97-
border 1px solid $ui-input--create-folder-modal
98-
color white
99-
100-
.description
101-
color $ui-inactive-text-color
102-
103-
.control-confirmButton
104-
colorSolarizedDarkPrimaryButton()
105-
10654
.error
10755
text-align center
10856
color #F44336
10957

110-
body[data-theme="monokai"]
111-
.root
112-
modalMonokai()
113-
width 500px
114-
height 270px
115-
overflow hidden
116-
position relative
117-
118-
.header
119-
background-color transparent
120-
border-color $ui-dark-borderColor
121-
color $ui-monokai-text-color
122-
123-
.control-folder-label
124-
color $ui-monokai-text-color
125-
126-
.control-folder-input
127-
border 1px solid $ui-input--create-folder-modal
128-
color white
129-
130-
.description
131-
color $ui-inactive-text-color
58+
apply-theme(theme)
59+
body[data-theme={theme}]
60+
.root
61+
background-color transparent
62+
width 500px
63+
height 270px
64+
overflow hidden
65+
position relative
13266

133-
.control-confirmButton
134-
colorMonokaiPrimaryButton()
67+
.header
68+
background-color transparent
69+
border-color get-theme-var(theme, 'borderColor')
70+
color get-theme-var(theme, 'text-color')
13571

136-
body[data-theme="dracula"]
137-
.root
138-
modalDracula()
139-
width 500px
140-
height 270px
141-
overflow hidden
142-
position relative
72+
.control-folder-label
73+
color get-theme-var(theme, 'text-color')
14374

144-
.header
145-
background-color transparent
146-
border-color $ui-dracula-borderColor
147-
color $ui-dracula-text-color
75+
.control-folder-input
76+
border 1px solid $ui-input--create-folder-modal
77+
color white
14878

149-
.control-folder-label
150-
color $ui-dracula-text-color
79+
.description
80+
color $ui-inactive-text-color
15181

152-
.control-folder-input
153-
border 1px solid $ui-input--create-folder-modal
154-
color white
82+
.control-confirmButton
83+
colorThemedPrimaryButton(theme)
15584

156-
.description
157-
color $ui-inactive-text-color
85+
for theme in 'dark' 'dracula' 'solarized-dark'
86+
apply-theme(theme)
15887

159-
.control-confirmButton
160-
colorDraculaPrimaryButton()
88+
for theme in $themes
89+
apply-theme(theme)

0 commit comments

Comments
 (0)