Skip to content

Commit 4c2b399

Browse files
author
Luke Bowerman
authored
feat: Add aliases for text color to allow for upstream flexibility (#1862)
* Export AliasTextColors
1 parent 3016432 commit 4c2b399

File tree

21 files changed

+61
-44
lines changed

21 files changed

+61
-44
lines changed
0 Bytes
Loading
0 Bytes
Loading
3 Bytes
Loading
113 Bytes
Loading
139 Bytes
Loading
134 Bytes
Loading
113 Bytes
Loading
136 Bytes
Loading
3.94 KB
Loading

packages/components/src/OrderedList/OrderedList.tsx

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,6 @@
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
SOFTWARE.
2424
25-
*/
26-
/*
27-
28-
MIT License
29-
30-
Copyright (c) 2020 Looker Data Sciences, Inc.
31-
32-
Permission is hereby granted, free of charge, to any person obtaining a copy
33-
of this software and associated documentation files (the "Software"), to deal
34-
in the Software without restriction, including without limitation the rights
35-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
36-
copies of the Software, and to permit persons to whom the Software is
37-
furnished to do so, subject to the following conditions:
38-
39-
The above copyright notice and this permission notice shall be included in all
40-
copies or substantial portions of the Software.
41-
42-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
43-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
44-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
45-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
46-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
47-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
48-
SOFTWARE.
49-
5025
*/
5126

5227
import {
@@ -55,6 +30,8 @@ import {
5530
space,
5631
SpaceProps,
5732
shouldForwardProp,
33+
textColor,
34+
TextColorProps,
5835
typography,
5936
TypographyProps,
6037
PositionProps,
@@ -70,6 +47,7 @@ export interface OrderedListProps
7047
PositionProps,
7148
LayoutProps,
7249
SpaceProps,
50+
TextColorProps,
7351
TypographyProps {
7452
/**
7553
* Specify the type of marker to place next to list items.
@@ -106,11 +84,13 @@ export const OrderedList = styled.div
10684
.withConfig({
10785
shouldForwardProp,
10886
})
109-
.attrs<OrderedListProps>(({ type = 'none' }) => ({
87+
.attrs<OrderedListProps>(({ color = 'body', type = 'none' }) => ({
11088
as: 'ol',
89+
color,
11190
type,
11291
}))<OrderedListProps>`
11392
${reset}
93+
${textColor}
11494
${typography}
11595
${typeVariant}
11696
${space}

0 commit comments

Comments
 (0)