Skip to content

Commit

Permalink
Update sidebar token references. (#135)
Browse files Browse the repository at this point in the history
  • Loading branch information
@gjones
gjones authored Sep 12, 2023
1 parent b602011 commit 5f4e91e
Show file tree
Hide file tree
Showing 7 changed files with 626 additions and 275 deletions.
12 changes: 6 additions & 6 deletions src/components/SidebarNavigationItem/SidebarNavigationItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,23 @@ export const SidebarItemWrapper = styled.button<{
border-radius: ${theme.click.sidebar.navigation[itemType].radii.all};
font: ${theme.click.sidebar.navigation[itemType].typography.default};
background-color: ${
theme.click.sidebar.navigation[itemType].color.background.default
theme.click.sidebar.main.navigation[itemType].color.background.default
};
color: ${theme.click.sidebar.navigation[itemType].color.text.default};
color: ${theme.click.sidebar.main.navigation[itemType].color.text.default};
&:hover, &:focus {
font: ${theme.click.sidebar.navigation[itemType].typography.hover};
background-color: ${
theme.click.sidebar.navigation[itemType].color.background.hover
theme.click.sidebar.main.navigation[itemType].color.background.hover
};
color: ${theme.click.sidebar.navigation[itemType].color.text.hover};
color: ${theme.click.sidebar.main.navigation[itemType].color.text.hover};
}
&:active, &[data-selected="true"] {
font: ${theme.click.sidebar.navigation[itemType].typography.active};
background-color: ${
theme.click.sidebar.navigation[itemType].color.background.active
theme.click.sidebar.main.navigation[itemType].color.background.active
};
color: ${theme.click.sidebar.navigation[itemType].color.text.active};
color: ${theme.click.sidebar.main.navigation[itemType].color.text.active};
}
@media (max-width: 640px) {
gap: ${theme.click.sidebar.navigation[itemType].mobile.space.gap};
Expand Down
6 changes: 3 additions & 3 deletions src/components/SidebarNavigationTitle/SidebarNavigationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ export const SidebarTitleWrapper = styled.button<{ $collapsible?: boolean }>`
padding: 0;
padding-left: ${$collapsible ? 0 : theme.click.image.sm.size.width};
font: ${theme.click.sidebar.navigation.title.typography.default};
color: ${theme.click.sidebar.navigation.title.color.default};
color: ${theme.click.sidebar.main.navigation.title.color.default};
&:hover {
font: ${theme.click.sidebar.navigation.title.typography.hover};
color: ${theme.click.sidebar.navigation.title.color.hover};
color: ${theme.click.sidebar.main.navigation.title.color.hover};
}
&:active, &[data-state="open"], &[data-selected="true"] {
font: ${theme.click.sidebar.navigation.title.typography.active};
color: ${theme.click.sidebar.navigation.title.color.active};
color: ${theme.click.sidebar.main.navigation.title.color.active};
}
`}
Expand Down
185 changes: 130 additions & 55 deletions src/styles/types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,23 @@
"text": {
"default": string
}
},
"ghost": {
"background": {
"default": string,
"hover": string,
"active": string
},
"stroke": {
"default": string,
"hover": string,
"active": string
},
"text": {
"default": string,
"hover": string,
"active": string
}
}
}
},
Expand Down Expand Up @@ -538,10 +555,26 @@
}
}
},
"button-group": {
"group": {
"radii": {
"center": string,
"end": string
},
"color": {
"background": {
"default": string,
"hover": string,
"active": string,
"panel": string
},
"text": {
"default": string,
"hover": string,
"active": string
},
"stroke": {
"panel": string
}
}
},
"alignLeft": {
Expand Down Expand Up @@ -571,24 +604,6 @@
}
}
},
"group": {
"color": {
"background": {
"default": string,
"hover": string,
"active": string,
"panel": string
},
"text": {
"default": string,
"hover": string,
"active": string
},
"stroke": {
"panel": string
}
}
},
"alignedLeft": {
"color": {
"background": {
Expand Down Expand Up @@ -1425,22 +1440,6 @@
"height": string,
"width": string
}
},
"color": {
"background": {
"active": string,
"hover": string,
"default": string
},
"text": {
"default": string,
"hover": string,
"active": string,
"muted": string
},
"icon": {
"default": string
}
}
},
"title": {
Expand All @@ -1449,11 +1448,6 @@
"hover": string,
"active": string,
"disabled": string
},
"color": {
"default": string,
"hover": string,
"active": string
}
},
"subItem": {
Expand Down Expand Up @@ -1485,27 +1479,12 @@
"hover": string,
"active": string,
"disabled": string
},
"color": {
"text": {
"default": string,
"hover": string,
"active": string
},
"background": {
"default": string,
"hover": string,
"active": string
}
}
},
"dragControl": {
"separator": {
"size": {
"height": string
},
"color": {
"default": string
}
}
}
Expand All @@ -1522,6 +1501,54 @@
"stroke": {
"default": string
}
},
"navigation": {
"item": {
"color": {
"background": {
"active": string,
"hover": string,
"default": string
},
"text": {
"default": string,
"hover": string,
"active": string,
"muted": string
},
"icon": {
"default": string
}
}
},
"title": {
"color": {
"default": string,
"hover": string,
"active": string
}
},
"subItem": {
"color": {
"text": {
"default": string,
"hover": string,
"active": string
},
"background": {
"default": string,
"hover": string,
"active": string
}
}
},
"dragControl": {
"separator": {
"color": {
"default": string
}
}
}
}
},
"sqlSidebar": {
Expand All @@ -1532,6 +1559,54 @@
"stroke": {
"default": string
}
},
"navigation": {
"item": {
"color": {
"background": {
"active": string,
"hover": string,
"default": string
},
"text": {
"default": string,
"hover": string,
"active": string,
"muted": string
},
"icon": {
"default": string
}
}
},
"title": {
"color": {
"default": string,
"hover": string,
"active": string
}
},
"subItem": {
"color": {
"text": {
"default": string,
"hover": string,
"active": string
},
"background": {
"default": string,
"hover": string,
"active": string
}
}
},
"dragControl": {
"separator": {
"color": {
"default": string
}
}
}
}
}
},
Expand Down
Loading

1 comment on commit 5f4e91e

@vercel
Copy link

@vercel vercel bot commented on 5f4e91e Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

click-ui – ./

click-ui-git-main-clickhouse.vercel.app
click-ui.vercel.app
click-ui-clickhouse.vercel.app

Please sign in to comment.