Skip to content

Commit 74b6a8b

Browse files
Use css variables (#834)
1 parent 7424c83 commit 74b6a8b

10 files changed

Lines changed: 179 additions & 160 deletions

File tree

src/style/components.styl

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@import './lib';
22

33
.components
4-
background-color $bg
5-
color $white
4+
background-color var(--color-base-200)
5+
color var(--color-base-content)
66
height 100%
77
overflow auto
88
position fixed
@@ -13,7 +13,7 @@
1313
display flex
1414
justify-content space-between
1515
.entityPrint
16-
color #fff
16+
color var(--color-base-content)
1717

1818
.collapsible-content
1919
padding 5px 0
@@ -24,7 +24,7 @@
2424
text-overflow ellipsis
2525
text-transform uppercase
2626
white-space nowrap
27-
color #fff
27+
color var(--color-base-content)
2828
font-weight 600
2929
vertical-align bottom !important
3030

@@ -34,16 +34,16 @@
3434
gap 10px
3535

3636
.collapsible .static
37-
background $bglight
38-
border-bottom 2px solid $bg
37+
background var(--color-base-100)
38+
border-bottom 2px solid var(--color-base-200)
3939
box-sizing content-box
4040
cursor pointer
4141
height 16px
4242
padding 8px 10px 12px 10px
4343
vertical-align bottom
4444
font-size 13px
4545
&:hover
46-
background $bglighter
46+
background var(--color-base-lighter)
4747

4848
.collapsible .static
4949
margin 0
@@ -57,11 +57,11 @@
5757
width 0
5858

5959
.collapsible.collapsed .static .collapse-button
60-
border-left-color $white
60+
border-left-color var(--color-base-content)
6161
margin-top 4px
6262

6363
.collapsible:not(.collapsed) .static .collapse-button
64-
border-top-color $white
64+
border-top-color var(--color-base-content)
6565
margin-top 7px
6666

6767
.propertyRow
@@ -112,8 +112,8 @@
112112
input[type=number],
113113
input.string,
114114
input.number
115-
background $bgdark
116-
color $primary
115+
background var(--color-base-300)
116+
color var(--color-primary)
117117
min-height 26px
118118
padding-bottom 1px
119119
padding-left 5px
@@ -140,7 +140,7 @@
140140
letter-spacing 1px
141141

142142
.propertyRowDefined .text
143-
color #FAFAFA
143+
color var(--color-property-defined)
144144
font-weight 600
145145

146146
#addComponentContainer
@@ -149,25 +149,26 @@
149149
flex-direction column
150150
justify-content center
151151
padding 20px 10px
152-
background $bgdark
152+
background var(--color-base-200)
153+
border-top 1px solid var(--color-base-100)
153154

154155
#addComponent
155156
text-align left
156157
width 200px
157158
.select__control
158-
background #161616
159+
background var(--color-base-300)
159160
height 35px
160-
color $primary
161+
color var(--color-primary)
161162

162163
#addComponentHeader
163164
font-size 15px
164-
margin 5px 0 10px 0
165+
margin 0 0 10px 0
165166

166167
input[type=text]:focus
167168
box-shadow none
168169

169170
.Select-menu-outer .is-focused span
170-
color #fff
171+
color var(--color-base-content)
171172

172173
.component-title
173174
align-items center
@@ -188,8 +189,6 @@
188189
padding-left 5px
189190
.entityName
190191
max-width 160px
191-
.entityIcons
192-
color #FAFAFA
193192

194193
#mixinSelect
195194
width 160px

src/style/entity.styl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
white-space nowrap
1414

1515
[data-entity-name-type="id"]
16-
color $red
16+
color var(--color-error)
1717

1818
[data-entity-name-type="class"]
19-
color $green
19+
color var(--color-success)
2020

2121
[data-entity-name-type="mixin"]
22-
color $orange
22+
color var(--color-warning)

src/style/help.styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
position relative
2424

2525
.help-key span
26-
background-color #2e2e2e
26+
background-color var(--color-neutral)
2727
background-repeat repeat-x
28-
border 1px solid #666
28+
border 1px solid var(--color-neutral-content)
2929
border-radius 3px
3030
box-shadow 0 0 5px #000
31-
color #999
31+
color var(--color-neutral-content)
3232
display inline-block
3333
font-size 12px
3434
padding 0 8px
3535
text-align center
3636

3737
.help-key-def
38-
color #bbb
38+
color var(--color-base-content)
3939
display inline-block
4040
margin-left 1em

src/style/index.styl

Lines changed: 70 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,48 @@ body.aframe-inspector-opened,
1111
font-family BlinkMacSystemFont, -apple-system, "Segoe UI", Helvetica, Arial, sans-serif
1212

1313
body.aframe-inspector-opened
14-
background $bgdark
15-
color #fff
14+
background var(--color-base-200)
15+
color var(--color-base-content)
1616
font-size 12px
1717
margin 0
1818
overflow hidden
1919

20+
/* :where(:root) has zero specificity compared to :root, so any user defined :root will override the below rule */
21+
:where(:root) {
22+
color-scheme dark
23+
--color-base-100: #333;
24+
--color-base-200: #242424;
25+
--color-base-300: #1d1d1d;
26+
--color-base-content: #c3c3c3;
27+
--color-primary: #1faaf2;
28+
--color-primary-content: #fff;
29+
--color-secondary: #92374d;
30+
--color-secondary-content: #fafafa;
31+
--color-accent: #155373;
32+
--color-accent-content: #fff;
33+
--color-neutral: #333;
34+
--color-neutral-content: #aaa;
35+
--color-info: #2cb7ff;
36+
--color-info-content: #fff;
37+
--color-success: #8b8;
38+
--color-success-content: #000;
39+
--color-warning: #d66853;
40+
--color-warning-content: #000;
41+
--color-error: #92374d;
42+
--color-error-content: #000;
43+
}
44+
2045
#aframeInspector
46+
--color-base-lighter: unquote("color-mix(in oklab, var(--color-base-100) 90%, white 10%)");
47+
--color-primary-hover: unquote("color-mix(in oklab, var(--color-primary) 90%, black 10%)");
48+
--color-secondary-hover: unquote("color-mix(in oklab, var(--color-secondary) 90%, black 10%)");
49+
--color-accent-hover: unquote("color-mix(in oklab, var(--color-accent) 70%, black 30%)");
50+
--color-neutral-hover: unquote("color-mix(in oklab, var(--color-neutral) 90%, black 10%)");
51+
--color-property-defined: light-dark(
52+
unquote("color-mix(in oklab, var(--color-base-content) 10%, black 90%)"), /* darker for light theme */
53+
unquote("color-mix(in oklab, var(--color-base-content) 10%, white 90%)") /* lighter for dark theme */
54+
)
55+
2156
@import './scenegraph';
2257
@import './components';
2358
@import './entity';
@@ -46,7 +81,7 @@ body.aframe-inspector-opened
4681

4782
hr
4883
border 0
49-
border-top 1px solid #ccc
84+
border-top 1px solid var(--color-base-content)
5085

5186
a
5287
cursor pointer
@@ -62,13 +97,6 @@ body.aframe-inspector-opened
6297
white-space pre
6398
word-wrap normal
6499

65-
textarea.success
66-
border-color #8b8 !important
67-
68-
textarea.fail
69-
background-color rgba(255, 0, 0, 0.05)
70-
border-color #f00 !important
71-
72100
textarea,
73101
input
74102
outline none /* osx */
@@ -93,9 +121,9 @@ body.aframe-inspector-opened
93121
user-select none
94122

95123
.toggle-edit
96-
background-color $red
124+
background-color var(--color-secondary)
97125
box-sizing content-box
98-
color #FAFAFA
126+
color var(--color-secondary-content)
99127
font-size 13px
100128
left 3px
101129
line-height 16px
@@ -109,12 +137,12 @@ body.aframe-inspector-opened
109137
z-index 999999999
110138

111139
.toggle-edit:hover
112-
background-color rgb(228, 43, 90)
140+
background-color var(--color-secondary-hover)
113141

114142
.try-editor-btn
115-
background-color $red
143+
background-color var(--color-secondary)
116144
box-sizing content-box
117-
color #FAFAFA
145+
color var(--color-secondary-content)
118146
font-size 16px
119147
line-height 24px
120148
margin 0
@@ -127,13 +155,13 @@ body.aframe-inspector-opened
127155
justify-content center
128156

129157
.try-editor-btn:hover
130-
background-color rgb(228, 43, 90)
131-
color #FAFAFA
158+
background-color var(--color-secondary-hover)
159+
color var(--color-secondary-content)
132160

133161
.sponsor-btn
134-
background-color #ffffff
162+
background-color var(--color-neutral)
135163
box-sizing content-box
136-
color #000000
164+
color var(--color-neutral-content)
137165
font-size 13px
138166
left 127px
139167
line-height 16px
@@ -154,13 +182,13 @@ body.aframe-inspector-opened
154182
color rgb(219, 97, 162)
155183

156184
.sponsor-btn:hover
157-
background-color rgb(228, 43, 90)
158-
color #FAFAFA
185+
background-color var(--color-neutral-hover)
186+
color var(--color-neutral-content)
159187

160188
input
161189
background-color transparent
162-
border 1px solid #555
163-
color #fff
190+
border 1px solid var(--color-base-200)
191+
color var(--color-base-content)
164192

165193
input,
166194
.texture canvas
@@ -180,14 +208,14 @@ body.aframe-inspector-opened
180208
margin 0
181209
height 18px
182210
width 18px
183-
border 1px solid $white
211+
border 1px solid var(--color-base-300)
184212
border-radius 0
185-
background transparent
213+
background var(--color-base-300)
186214
position relative
187215

188216
&:checked
189-
border 1px solid $primary
190-
background $primary
217+
border 1px solid var(--color-base-300)
218+
background var(--color-primary)
191219

192220
&::after
193221
content ''
@@ -206,35 +234,35 @@ body.aframe-inspector-opened
206234
input.number
207235
background-color transparent !important
208236
border 0
209-
color #2cb7ff !important
237+
color var(--color-primary) !important
210238
cursor col-resize
211239
font-size 13px
212240
padding 2px
213241

214242
input.string:focus,
215243
input.number:focus
216-
border 1px solid $primary
244+
border 1px solid var(--color-primary)
217245

218246
input.error
219-
border 1px solid #a00
247+
border 1px solid var(--color-error)
220248

221249
#sidebar
222-
background $bg
250+
background var(--color-base-200)
223251
width 331px
224252

225253
input,
226254
textarea,
227255
select
228-
background $black
256+
background var(--color-base-300)
229257
border 1px solid transparent
230-
color #888
258+
color var(--color-base-content)
231259

232260
select
233-
background $bglighter
261+
background var(--color-base-lighter)
234262

235263
input[type=color]
236-
background-color #333
237-
border 1px solid #111
264+
background-color var(--color-base-100)
265+
border 1px solid var(--color-base-300)
238266
height 28px
239267
cursor pointer
240268

@@ -263,13 +291,13 @@ body.aframe-inspector-opened
263291
visibility hidden
264292

265293
a.button
266-
color #bcbcbc
294+
color var(--color-base-content)
267295
font-size 16px
268296
line-height 1em
269297
text-decoration none
270298

271299
&:hover
272-
color $primary
300+
color var(--color-primary)
273301

274302
@keyframes animateopacity
275303
from { opacity: 0 }
@@ -314,14 +342,14 @@ body.aframe-inspector-opened
314342
z-index 9998
315343

316344
a
317-
background-color #262626
318-
color #bcbcbc
345+
background-color var(--color-base-200)
346+
color var(--color-base-content)
319347
padding 5px
320348
z-index 9998
321349

322350
a.hover
323-
background-color #1faaf2
324-
color #fff
351+
background-color var(--color-primary)
352+
color var(--color-primary-content)
325353

326354
.toggle-sidebar.left
327355
top 0

0 commit comments

Comments
 (0)