git.iko.soy/rowtype-yoga/ry-blocks
on main help sign in
Enough already
commit4a00ac00fe09855db04b62208e019a2d5e456e88 authorMark Eibes <mark.eibes@gmail.com> dateSun 3 Jul 2022, 23:11 (4 years ago) parentef317eb
2 files changed+20−19
compare with main
unifiedsplit
src/Yoga/Block/Atom/Button/Style.purs+11−10 src/Yoga/Block/Container/Style.purs+9−9
src/Yoga/Block/Atom/Button/Style.purs+11−10
@@ -7,10 +7,10 @@ import Fahrtwind (background', hover, zIndex)
77import Yoga.Block.Container.Style (col, colour, size)
88
99type Props :: forall k. (Type -> k) -> Row k -> Row k
10−type Props f r
11− = ( css ∷ f Style
12− | r
13− )
10+type Props f r =
11+ ( css ∷ f Style
12+ | r
13+ )
1414
1515gradientBackground ∷ StyleProperty
1616gradientBackground =
@@ -30,7 +30,8 @@ gradientBackground =
3030backgroundAnimation ∷ StyleProperty
3131backgroundAnimation =
3232 keyframes
33− $ { "from": css { backgroundPosition: str "0% 50%" }
33+ $
34+ { "from": css { backgroundPosition: str "0% 50%" }
3435 , "to": css { backgroundPosition: str "100% 50%" }
3536 }
3637
@@ -63,16 +64,16 @@ button =
6364 nested $ hover (background' col.highlightAlpha10) <> css
6465 { background: str "transparent"
6566 , boxShadow: none
66− , color: str colour.highlight
67+ , color: str colour.highlightTextOnBackground
6768 , "&:active":
6869 nest
6970 { boxShadow: none
7071 }
7172 , """&[data-button-type="primary"]""":
72− nest {
73− background: str colour.highlight,
74− boxShadow: none
75− }
73+ nest
74+ { background: str colour.highlight
75+ , boxShadow: none
76+ }
7677 }
7778 , """&[data-button-shape="pill"]""":
7879 nest
src/Yoga/Block/Container/Style.purs+9−9
@@ -265,7 +265,7 @@ defaultColours =
265265 , highlightRotatedBackwards: highlight # rotateHue (-13.0) # darken 0.05
266266 , highlightRotatedForwards: highlight # rotateHue 3.0 # lighten 0.05 # saturate 0.1
267267 , highlightText
268− , highlightTextOnBackground: highlight # rotateHue (-10.0) # darken 0.15 # saturate 0.1
268+ , highlightTextOnBackground: highlight # darken 0.1 # saturate 0.1
269269 , inputBackground: lightBg
270270 , inputBorder: darken 0.07 >>> desaturate 0.2 $ lightBg
271271 , interfaceBackground
@@ -327,10 +327,10 @@ defaultColours =
327327 , highlightDarker: withAlpha 0.4 (Color.darken 0.5 highlightDark)
328328 , highlightDisabled: (desaturate 0.76 >>> darken 0.32) highlightDark
329329 , highlightLighter: withAlpha 0.2 (Color.lighten 0.5 highlightDark)
330− , highlightRotatedBackwards: highlightDark # rotateHue (-30.0)
331− , highlightRotatedForwards: highlightDark # rotateHue 30.0
332− , highlightText
333− , highlightTextOnBackground: highlightDark # rotateHue (-20.0) # lighten 0.14 # saturate 0.8
330+ , highlightRotatedBackwards: highlightDark # rotateHue (-10.0)
331+ , highlightRotatedForwards: highlightDark # rotateHue 50.0
332+ , highlightText: highlightDark # lighten 0.3
333+ , highlightTextOnBackground: highlightDark # lighten 0.09 # saturate 1.0
334334 , inputBackground: darkBg # saturate 0.1 # lighten 0.2
335335 , inputBorder: darkBg # saturate 0.1 # lighten 0.25
336336 , interfaceBackground: interfaceBackgroundDark
@@ -367,15 +367,15 @@ defaultColours =
367367 -- highlightBase = Color.hsla 275.0 0.82 0.4
368368 -- brightPurpleBase = Color.hsla 275.0 0.82 0.4
369369 -- highlightMurmurasBase = Color.hsla 220.0 0.60 0.5
370− highlightBase = Color.hsla 259.0 1.00 0.6
370+ highlightBase = Color.hsla 244.0 0.9 0.62
371371
372372 highlight = highlightBase 1.0
373373
374− highlightDarkBase = Color.hsla 265.0 1.00 0.6
374+ highlightDarkBase = Color.hsla 240.0 1.00 0.6
375375
376− highlightDark = Color.hsla 258.0 1.00 0.63 1.0
376+ highlightDark = Color.hsla 240.0 1.00 0.63 1.0
377377
378− highlightText = Color.rgb 0xFF 0xFF 0xFF
378+ highlightText = highlight # lighten 0.36 # saturate 0.4
379379
380380 interfaceBackground = lightBg
381381