Skip to content

Commit b9aeedc

Browse files
authored
Merge pull request #155 from lumihq/bethany/color-changes
Added a new accent color - Accent 2 - 15%
2 parents c4694f1 + 0be0059 commit b9aeedc

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

docs/Examples/Color.example.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ links"""
8686
selected table row background color"""
8787
, colorPanel _.accent1 "Accent 1" """Indicates good or complete status"""
8888
, colorPanel _.accent2 "Accent 2" """Indicates pending, needs attention"""
89+
, colorPanel _.accent23 "Accent 2 - 15%" """Faded for focus borders/backgrounds"""
8990
, colorPanel _.accent3 "Accent 3" """Indicates a problem, warning"""
9091
, colorPanel _.accent33 "Accent 3 - 15%" """Faded for focus borders/backgrounds"""
9192
, colorPanel _.white "White" """Primary button text"""

src/Lumi/Components/Button.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ styles = jss
266266
, "&[data-color=\"primary-4\"]": buttonColorHoverMixin colors.primary4
267267
, "&[data-color=\"accent-1\"]": buttonColorHoverMixin colors.accent1
268268
, "&[data-color=\"accent-2\"]": buttonColorHoverMixin colors.accent2
269+
, "&[data-color=\"accent-2-3\"]": buttonColorHoverMixin colors.accent23
269270
, "&[data-color=\"accent-3\"]": buttonColorHoverMixin colors.accent3
270271
, "&[data-color=\"accent-3-3\"]": buttonColorHoverMixin colors.accent33
271272
, "&[data-color=\"white\"]": buttonColorHoverMixin colors.white

src/Lumi/Components/Color.purs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ type ColorMap a =
3434
, secondary :: a
3535
, accent1 :: a
3636
, accent2 :: a
37+
, accent23 :: a
3738
, accent3 :: a
3839
, accent33 :: a
3940
, white :: a
@@ -59,6 +60,7 @@ colors =
5960
, secondary: rgb 0x91 0x90 0x8d
6061
, accent1: rgb 0x49 0xb8 0x60
6162
, accent2: rgb 0xff 0xa5 0x02
63+
, accent23: rgb 0xff 0xee 0xd9
6264
, accent3: rgb 0xf1 0x50 0x0d
6365
, accent33: rgb 0xfd 0xe5 0xdb
6466
, white: rgb 0xff 0xff 0xff
@@ -84,6 +86,7 @@ colorNames =
8486
, secondary: ColorName "secondary"
8587
, accent1: ColorName "accent-1"
8688
, accent2: ColorName "accent-2"
89+
, accent23: ColorName "accent-2-3"
8790
, accent3: ColorName "accent-3"
8891
, accent33: ColorName "accent-3-3"
8992
, white: ColorName "white"

src/Lumi/Components/Text.purs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ styles =
195195
, "&[data-color=\"primary-4\"]": { color: cssStringHSLA colors.primary4 }
196196
, "&[data-color=\"accent-1\"]": { color: cssStringHSLA colors.accent1 }
197197
, "&[data-color=\"accent-2\"]": { color: cssStringHSLA colors.accent2 }
198+
, "&[data-color=\"accent-2-3\"]": { color: cssStringHSLA colors.accent23 }
198199
, "&[data-color=\"accent-3\"]": { color: cssStringHSLA colors.accent3 }
199200
, "&[data-color=\"accent-3-3\"]": { color: cssStringHSLA colors.accent33 }
200201
, "&[data-color=\"white\"]": { color: cssStringHSLA colors.white }

0 commit comments

Comments
 (0)