@@ -31,113 +31,113 @@ mkGlobal ∷ Maybe DarkOrLightMode -> Style
31mkGlobal maybeMode =
31mkGlobal maybeMode =
33 { "body, html":
33 { "body, html":
36− { minHeight: 100.0 # vh
36+ { minHeight: 100.0 # vh
37− , minWidth: 100.0 # vw
37+ , minWidth: 100.0 # vw
38− , lineHeight: str "1.15"
38+ , lineHeight: str "1.15"
39− , "WebkitTextSizeAdjust": _100percent
39+ , "WebkitTextSizeAdjust": _100percent
40− , transition: str "background,color 0.33s ease-in"
40+ , transition: str "background,color 0.33s ease-in"
42 , ":root":
42 , ":root":
43− nested $ variables
43+ nested $ variables
44− <> fontVariables { main: "Inter", mono: "Victor Mono, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console" }
44+ <> fontVariables { main: "Inter", mono: "Victor Mono, Menlo, Consolas, Monaco, Liberation Mono, Lucida Console" }
48− { boxSizing: str "border-box"
48+ { boxSizing: str "border-box"
53− { fontFamily: str "var(--main-font)"
53+ { fontFamily: str "var(--main-font)"
54− , background: str colour.background
54+ , background: str colour.background
55− , color: str colour.text
55+ , color: str colour.text
56− , margin: str "0"
56+ , margin: str "0"
58− <> case maybeMode of
58+ <> case maybeMode of
59− Nothing -> autoSwitchColourTheme
59+ Nothing -> autoSwitchColourTheme
60− Just DarkMode -> darkModeStyle
60+ Just DarkMode -> darkModeStyle
61− Just LightMode -> lightModeStyle
61+ Just LightMode -> lightModeStyle
62 , "pre,code":
62 , "pre,code":
64− { fontFamily: str "var(--mono-font)"
64+ { fontFamily: str "var(--mono-font)"
66 , "h1,h2,h3,h4":
66 , "h1,h2,h3,h4":
68− { lineHeight: var "--line-height-small"
68+ { lineHeight: var "--line-height-small"
69− , fontWeight: str "700"
69+ , fontWeight: str "700"
70− , marginTop: str "var(--s-3)"
70+ , marginTop: str "var(--s-3)"
75− { "--h1size": str "calc( min( var(--s2) + 2vw , var(--s4) ) )"
75+ { "--h1size": str "calc( min( var(--s2) + 2vw , var(--s4) ) )"
76− , fontSize: var "--h1size"
76+ , fontSize: var "--h1size"
77− , letterSpacing: str "calc(var(--h1size) * -0.04)"
77+ , letterSpacing: str "calc(var(--h1size) * -0.04)"
82− { "--h2size": str "calc( min( var(--s1) + 2vw , var(--s3) ) )"
82+ { "--h2size": str "calc( min( (var(--s1)*1.1) + 2vw , var(--s3) ) )"
83− , fontSize: var "--h2size"
83+ , fontSize: var "--h2size"
84− , letterSpacing: str "calc(var(--h2size) * -0.035)"
84+ , letterSpacing: str "calc(var(--h2size) * -0.035)"
89− { "--h3size": str "calc( min( var(--s0) + 2vw , var(--s2) ) )"
89+ { "--h3size": str "calc( min( var(--s0) + 2vw , var(--s2) ) )"
90− , fontSize: var "--h3size"
90+ , fontSize: var "--h3size"
91− , letterSpacing: str "calc(var(--h3size) * -0.03)"
91+ , letterSpacing: str "calc(var(--h3size) * -0.03)"
96− { "--psize": str "calc( min( var(--s-2) + 2.7vw , var(--s0)*1.1 ) )"
96+ { "--psize": str "calc( min( (var(--s-1) * 1.7) + 0.7vw , var(--s0)*1.1 ) )"
97− , fontSize: var "--psize"
97+ , fontSize: var "--psize"
98− , letterSpacing: str "calc(var(--psize) * -0.03)"
98+ , letterSpacing: str "calc(var(--psize) * -0.03)"
102− { color: str colour.text
102+ { color: str colour.text
103− , textDecorationColor: str colour.text
103+ , textDecorationColor: str colour.text
104− , "&:hover":
104+ , "&:hover":
106− { color: str colour.text
106+ { color: str colour.text
107− , textDecorationColor: str colour.highlight
107+ , textDecorationColor: str colour.highlight
109− , "&:visited":
109+ , "&:visited":
111− { color: str colour.text
111+ { color: str colour.text
112− , textDecorationColor: str colour.backgroundLayer1
112+ , textDecorationColor: str colour.backgroundLayer1
115 , "::selection":
115 , "::selection":
117− { color: str colour.highlightText
117+ { color: str colour.highlightText
118− , background: str colour.highlight
118+ , background: str colour.highlight
120 , "*, *:before, *:after":
120 , "*, *:before, *:after":
123− { boxSizing: str "inherit"
123+ { boxSizing: str "inherit"
124− , "::selection":
124+ , "::selection":
126− { color: str colour.highlightText
126+ { color: str colour.highlightText
127− , background: str colour.highlight
127+ , background: str colour.highlight
129− , fontFeatureSettings:
129+ , fontFeatureSettings:
131− $ intercalate ","
131+ $ intercalate ","
133− <$> [ "ss03" -- curved r
133+ <$> [ "ss03" -- curved r
134− , "cv03" -- open six
134+ , "cv03" -- open six
135− , "cv04" -- open nine
135+ , "cv04" -- open nine
136− -- , "cv05" -- lower case l with tail
136+ -- , "cv05" -- lower case l with tail
137− , "cv07" -- German double-s
137+ , "cv07" -- German double-s
138− , "cv09" -- Flat top three
138+ , "cv09" -- Flat top three
143withAlpha ∷ Number -> Color -> Color
143withAlpha ∷ Number -> Color -> Color
@@ -148,74 +148,74 @@ withAlpha alpha c1 = Color.rgba' r g b alpha
148defaultColours ∷ Colours
148defaultColours ∷ Colours
149defaultColours =
149defaultColours =
151− { background: lightBg
151+ { background: lightBg
152− , backgroundLayer1: darken 0.20 >>> saturate 0.04 $ lightBg
152+ , backgroundLayer1: darken 0.12 >>> rotateHue (0.0) >>> saturate 0.01 $ lightBg
153− , backgroundLayer2: darken 0.15 >>> saturate 0.07 $ lightBg
153+ , backgroundLayer2: darken 0.09 >>> rotateHue (0.0) >>> saturate 0.02 $ lightBg
154− , backgroundLayer3: darken 0.10 >>> saturate 0.09 $ lightBg
154+ , backgroundLayer3: darken 0.06 >>> rotateHue (0.0) >>> saturate 0.03 $ lightBg
155− , backgroundLayer4: darken 0.05 >>> saturate 0.12 $ lightBg
155+ , backgroundLayer4: darken 0.03 >>> rotateHue (0.0) >>> saturate 0.04 $ lightBg
156− , backgroundLayer5: lightBg
156+ , backgroundLayer5: lightBg
157− , backgroundInverted: darken 0.85 lightBg
157+ , backgroundInverted: darken 0.85 lightBg
158− , textInverted: lightBg
158+ , textInverted: lightBg
159− , success
159+ , success
160− , successText
160+ , successText
161− , invalid
161+ , invalid
162− , invalidText
162+ , invalidText
163− , required
163+ , required
164− , interfaceBackground
164+ , interfaceBackground
165− , interfaceBackgroundDangerous
165+ , interfaceBackgroundDangerous
166− , interfaceDangerousText
166+ , interfaceDangerousText
167− , interfaceBackgroundDisabled: darken 0.03 lightBg
167+ , interfaceBackgroundDisabled: darken 0.03 lightBg
168− , interfaceTextDisabled: darken 0.30 lightBg
168+ , interfaceTextDisabled: darken 0.30 lightBg
169− , interfaceBackgroundHighlight: lighten 0.05 lightBg
169+ , interfaceBackgroundHighlight: lighten 0.05 lightBg
170− , highlightDisabled: (desaturate 0.80 >>> lighten 0.28) highlight
170+ , highlightDisabled: (desaturate 0.80 >>> lighten 0.28) highlight
171− , interfaceBackgroundShadow: darken 0.04 lightBg
171+ , interfaceBackgroundShadow: darken 0.04 lightBg
172− , inputBackground: lightBg
172+ , inputBackground: lightBg
173− , inputBorder: darken 0.1 lightBg
173+ , inputBorder: darken 0.1 lightBg
174− , highlight
174+ , highlight
175− , highlightLighter: withAlpha 0.2 (Color.lighten 0.5 highlight)
175+ , highlightLighter: withAlpha 0.2 (Color.lighten 0.5 highlight)
176− , highlightDarker: withAlpha 0.15 (Color.darken 0.5 highlight)
176+ , highlightDarker: withAlpha 0.15 (Color.darken 0.5 highlight)
177− , highlightRotatedForwards: highlight # rotateHue 30.0
177+ , highlightRotatedForwards: highlight # rotateHue 30.0
178− , highlightRotatedBackwards: highlight # rotateHue (-30.0)
178+ , highlightRotatedBackwards: highlight # rotateHue (-30.0)
179− , highlightText
179+ , highlightText
180− , text: textLightTheme
180+ , text: textLightTheme
181− , placeholderText: lighten 0.4 darkBg
181+ , placeholderText: lighten 0.4 darkBg
184− { background: darkBg
184+ { background: darkBg
185− , backgroundLayer1: lighten 0.30 >>> saturate 0.07 $ darkBg
185+ , backgroundLayer5: lighten 0.30 >>> saturate 0.07 $ darkBg
186− , backgroundLayer2: lighten 0.21 >>> saturate 0.08 $ darkBg
186+ , backgroundLayer4: lighten 0.21 >>> saturate 0.08 $ darkBg
187− , backgroundLayer3: lighten 0.14 >>> saturate 0.12 $ darkBg
187+ , backgroundLayer3: lighten 0.14 >>> saturate 0.12 $ darkBg
188− , backgroundLayer4: lighten 0.07 >>> saturate 0.18 $ darkBg
188+ , backgroundLayer2: lighten 0.07 >>> saturate 0.18 $ darkBg
189− , backgroundLayer5: darkBg
189+ , backgroundLayer1: darkBg
190− , textInverted: darkBg
190+ , textInverted: darkBg
191− , backgroundInverted: lightBg
191+ , backgroundInverted: lightBg
192− , interfaceBackground: interfaceBackgroundDark
192+ , interfaceBackground: interfaceBackgroundDark
193− , interfaceBackgroundDangerous: interfaceBackgroundDangerousDark
193+ , interfaceBackgroundDangerous: interfaceBackgroundDangerousDark
194− , interfaceDangerousText: interfaceDangerousTextDark
194+ , interfaceDangerousText: interfaceDangerousTextDark
195− , interfaceBackgroundDisabled: darken 0.3 interfaceBackgroundDark
195+ , interfaceBackgroundDisabled: darken 0.3 interfaceBackgroundDark
196− , interfaceTextDisabled: (desaturate 0.3 >>> lighten 0.25) interfaceBackgroundDark
196+ , interfaceTextDisabled: (desaturate 0.3 >>> lighten 0.25) interfaceBackgroundDark
197− , interfaceBackgroundHighlight: lighten 0.1 interfaceBackgroundDark
197+ , interfaceBackgroundHighlight: lighten 0.1 interfaceBackgroundDark
198− , interfaceBackgroundShadow: darken 0.1 interfaceBackgroundDark
198+ , interfaceBackgroundShadow: darken 0.1 interfaceBackgroundDark
199− , inputBackground: darkBg
199+ , inputBackground: darkBg
200− , inputBorder: lighten 0.17 darkBg
200+ , inputBorder: lighten 0.17 darkBg
201− , success: successDark
201+ , success: successDark
202− , successText
202+ , successText
203− , required
203+ , required
204− , invalid
204+ , invalid
205− , invalidText
205+ , invalidText
206− , highlight: highlightDark
206+ , highlight: highlightDark
207− , highlightDisabled: (desaturate 0.76 >>> darken 0.32) highlightDark
207+ , highlightDisabled: (desaturate 0.76 >>> darken 0.32) highlightDark
208− , highlightLighter: withAlpha 0.2 (Color.lighten 0.5 highlightDark)
208+ , highlightLighter: withAlpha 0.2 (Color.lighten 0.5 highlightDark)
209− , highlightDarker: withAlpha 0.4 (Color.darken 0.5 highlightDark)
209+ , highlightDarker: withAlpha 0.4 (Color.darken 0.5 highlightDark)
210− , highlightRotatedForwards: highlightDark # rotateHue 30.0
210+ , highlightRotatedForwards: highlightDark # rotateHue 30.0
211− , highlightRotatedBackwards: highlightDark # rotateHue (-30.0)
211+ , highlightRotatedBackwards: highlightDark # rotateHue (-30.0)
212− , highlightText
212+ , highlightText
213− , text: lightBg
213+ , text: lightBg
214− , placeholderText: darken 0.4 lightBg
214+ , placeholderText: darken 0.4 lightBg
218− highlight = Color.hsl 270.0 0.90 0.62
218+ highlight = Color.hsl 320.0 0.62 0.49
220 highlightDark = Color.rgb 0x88 0x33 0xFF
220 highlightDark = Color.rgb 0x88 0x33 0xFF
@@ -247,48 +247,48 @@ defaultColours =
248 textLightTheme = Color.rgb 16 16 32
248 textLightTheme = Color.rgb 16 16 32
250− darkBg = Color.hsl 240.0 0.07 0.14
250+ darkBg = Color.hsl 240.0 0.07 0.10
252− lightBg = Color.hsl 240.0 0.05 0.97
252+ lightBg = Color.hsl 5.0 0.27 0.99
254−type FlatTheme a
254+type FlatTheme a =
255− = { background ∷ a
255+ { background ∷ a
256− , backgroundLayer1 ∷ a
256+ , backgroundLayer1 ∷ a
257− , backgroundLayer2 ∷ a
257+ , backgroundLayer2 ∷ a
258− , backgroundLayer3 ∷ a
258+ , backgroundLayer3 ∷ a
259− , backgroundLayer4 ∷ a
259+ , backgroundLayer4 ∷ a
260− , backgroundLayer5 ∷ a
260+ , backgroundLayer5 ∷ a
261− , backgroundInverted ∷ a
261+ , backgroundInverted ∷ a
262− , interfaceBackground ∷ a
262+ , interfaceBackground ∷ a
263− , interfaceBackgroundDangerous ∷ a
263+ , interfaceBackgroundDangerous ∷ a
264− , interfaceDangerousText ∷ a
264+ , interfaceDangerousText ∷ a
265− , interfaceBackgroundDisabled ∷ a
265+ , interfaceBackgroundDisabled ∷ a
266− , interfaceTextDisabled ∷ a
266+ , interfaceTextDisabled ∷ a
267− , interfaceBackgroundHighlight ∷ a
267+ , interfaceBackgroundHighlight ∷ a
268− , interfaceBackgroundShadow ∷ a
268+ , interfaceBackgroundShadow ∷ a
269− , inputBackground ∷ a
269+ , inputBackground ∷ a
270− , inputBorder ∷ a
270+ , inputBorder ∷ a
271− , highlight ∷ a
271+ , highlight ∷ a
272− , highlightRotatedBackwards ∷ a
272+ , highlightRotatedBackwards ∷ a
273− , highlightRotatedForwards ∷ a
273+ , highlightRotatedForwards ∷ a
274− , highlightDarker ∷ a
274+ , highlightDarker ∷ a
275− , highlightLighter ∷ a
275+ , highlightLighter ∷ a
276− , highlightDisabled ∷ a
276+ , highlightDisabled ∷ a
277− , highlightText ∷ a
277+ , highlightText ∷ a
278− , success ∷ a
278+ , success ∷ a
279− , successText ∷ a
279+ , successText ∷ a
280− , invalid ∷ a
280+ , invalid ∷ a
281− , invalidText ∷ a
281+ , invalidText ∷ a
282− , required ∷ a
282+ , required ∷ a
283− , text ∷ a
283+ , text ∷ a
284− , textInverted ∷ a
284+ , textInverted ∷ a
285− , placeholderText ∷ a
285+ , placeholderText ∷ a
288−type Colours
288+type Colours =
289− = { dark ∷ FlatTheme Color
289+ { dark ∷ FlatTheme Color
290− , light ∷ FlatTheme Color
290+ , light ∷ FlatTheme Color
293data MakeCSSVarLabels
293data MakeCSSVarLabels
294 = MakeCSSVarLabels
294 = MakeCSSVarLabels