Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotlnk colors #580

Merged
merged 2 commits into from
Sep 19, 2023
Merged

Hotlnk colors #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be8f462
color updates
Sep 18, 2023
5581195
hotlink updates
Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions code/src/ui/src/components/LeftNavTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@ import { ListSubheader, ListItemButton, ListItemText } from "@mui/material";
export const LeftNavHeader = styled(ListSubheader)(( {theme }) => ({
fontWeight: "bold",
textTransform: "uppercase",
background: "var(--leftNav)",
background: "transparent",
fontSize: "1em",
position: "unset",
}));

export const LeftNavText = styled(ListSubheader)(( {theme }) => ({
// textTransform: "uppercase",
background: "var(--leftNav)",
//color: "var(--on-leftNav)",
background: "transparent",
fontSize: "1em",
}));

Expand Down
189 changes: 118 additions & 71 deletions code/src/ui/src/mui-a11y-tb/themes/TB.css
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions code/src/ui/src/mui-a11y-tb/themes/Theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ body {
background: var(--body-bg);
}
.App {
background: var(--on-background);
background: var(--background);
color: var(--on-background);
}
.MuiGrid-container {
Expand Down Expand Up @@ -725,10 +725,10 @@ section:has( .quote) {
color: var(--hotlink);
font-family: var(--body2FontFamily) !important;
font-weight: var(--body2FontWeight) !important;
font-size: var(--body2FontWeightFontSize) !important;
line-height: var(--body2FontWeightLineHeight) !important;
letter-spacing: var(--body2FontWeightLetterSpacing) !important;
text-transform: var(--body2FontWeightTextTransform) !important;
font-size: var(--body2FontSize) !important;
line-height: var(--body2LineHeight) !important;
letter-spacing: var(--body2LetterSpacing) !important;
text-transform: var(--body2TextTransform) !important;
text-decoration: var(--hotlink-decoration);
}

Expand Down
8 changes: 4 additions & 4 deletions code/src/ui/src/mui-a11y-tb/themes/Theme.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,8 +407,8 @@ try {
PaperProps: {
sx: {
'& .MuiList-root.MuiMenu-list': {
WebkitBoxShadow: "var(--elevation) !important",
MozBoxShadow: "var(--elevation) !important",
WebkitBoxShadow: "var(--elevation-3) !important",
MozBoxShadow: "var(--elevation-3) !important",
borderRadius: "var(--spacing-half)",
marginLeft: "0",
},
Expand Down Expand Up @@ -820,7 +820,7 @@ try {
padding: "var(--spacing-1) calc(var(--toast-padding) * var(--spacing-1)) !important",
paddingLeft: "calc(calc(var(--toast-padding) * var(--spacing-1)) + var(--spacing-1) + var(--spacing-half)) !important",
borderRadius: "calc(var(--toast-radius) * var(--radius-1))",
boxShadow: "var(--toast-boxshadow)",
boxShadow: "var(--toast-shadow)",
position: "relative",
borderRadius: "calc(var(--toast-radius) * var(--radius-1))",
alignItems: "center",
Expand Down Expand Up @@ -994,7 +994,7 @@ try {
right: "0px",
content: '""',
background: "var(--transparent)",
boxShadow: "var(--chip-elevation)",
boxShadow: "var(--chip-shadow)",
color: "var(--on-button)",
borderRadius: "calc(var(--button-radius) * var(--radius-1) + 1.6px)",
zIndex: -1,
Expand Down
1 change: 1 addition & 0 deletions code/src/ui/src/pages/DesignSystemPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
.design-system-editor-left-nav:hover,
.design-system-editor-left-nav:focus {
visibility: visible;
background: transparent !important;
}
.design-system-editor-content {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion code/src/ui/src/pages/WelcomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const WelcomePage: React.FC<Props> = ({ user, storage, themeName }) => {
<WelcomeNavbar />
</MeasureDiv>
<div className="design-system-editor-content" style={divStyle}>
<div className="design-system-editor-left-nav">
<div className="design-system-editor-left-nav" data-background="alt">
<div className="design-system-editor-left-nav-scrollable">
<List
sx={{
Expand Down
13 changes: 0 additions & 13 deletions code/src/ui/src/pages/atoms/ElevationsAtom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,6 @@ export const ElevationsAtom: React.FC<Props> = ({ elevationSettings }) => {
<div className="container">
<div className="row">
<div className="col-6">
<div className="subtitle1">Shadow Color</div>
<div className="form-row">
<InputLabel htmlFor='hexValue'>Hex Value</InputLabel>
<TextField
sx={{maxWidth: 300}}
id='hexValue'
error={_addColorInputErrorTriggered}
onChange={handleShadowColorChange}
helperText={_addColorInputErrorTriggered ? "Please provide a 6-digit hexadecimal value" : ""}
value={shadowColor}
/>
<ChromePicker color={shadowColor} onChange={handleColorSelected} />
</div>
<div className="subtitle1">Based Shadow Settings</div>
<div className="form-row">
<label className="label-1">
Expand Down
2 changes: 1 addition & 1 deletion code/src/ui/src/pages/atoms/HotlinksAtom.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const HotlinksAtom: React.FC<Props> = ({ hotlinks }) => {
<a href="#" className="default-link">Sample Hotlink</a>
</LightModeSection>
<DarkModeSection>
<div className="row">
<div className="row" data-mode="dark">
<div className="col-6">
<div className="inputRow">
<div id="hotlink-color-darkmode-preview" className="Hex theme-link" style={{ background: 'var(--dm-hotlink)' }} />
Expand Down
4 changes: 2 additions & 2 deletions code/src/ui/src/pages/content/GeneratedCodeSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ export const GeneratedCodeSection: React.FC<Props> = ({ item }) => {
}

const tabBar = {
backgroundColor: "var(--leftNav)",
color: "var(--on-leftNav)",
backgroundColor: "var(--transparent)",
color: "var(--transparent)",
display: "flex",
}

Expand Down
4 changes: 2 additions & 2 deletions code/src/ui/src/pages/content/code/CodeContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export const CodeContent: React.FC<Props> = ({ user, designSystem }) => {

return (
<>
<div className="design-system-editor-left-nav">
<div className="design-system-editor-left-nav" >
<div className="design-system-editor-left-nav-scrollable">
<List
sx={{
Expand Down Expand Up @@ -136,7 +136,7 @@ export const CodeContent: React.FC<Props> = ({ user, designSystem }) => {
<li>For a design tool: <p>JSON tokens are generated. They can be copied and imported into your design tool such as Figma.</p></li>
</ul>
</Grid>
</Grid>
</Grid>
</>}
{showItem === "css" && <>
<HeadingSection title="Code Generators" heading="CSS Code" />
Expand Down
4 changes: 2 additions & 2 deletions code/src/ui/src/pages/content/components/ComponentsContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export const ComponentsContent: React.FC<Props> = ({ user, designSystem }) => {

return (
<>
<div className="design-system-editor-left-nav">
<div className="design-system-editor-left-nav" >
<div className="design-system-editor-left-nav-scrollable">
<List
sx={{
Expand Down Expand Up @@ -266,7 +266,7 @@ export const ComponentsContent: React.FC<Props> = ({ user, designSystem }) => {
</List>
</div>
</div>
<div className={"design-system-editor-right-content " + (darkMode ? "darkmode" : "")}>
<div className="design-system-editor-right-content" data-mode={darkMode ? "dark" : "light"}>
<div className="design-system-editor-right-content-scrollable">
{showComponent === "colorsCoreColors" &&
<CoreColorsComponent />
Expand Down
2 changes: 1 addition & 1 deletion code/src/ui/src/pages/content/molecules/MoleculeContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export const MoleculeContent: React.FC<Props> = ({ user, designSystem }) => {

return (
<>
<div className="design-system-editor-left-nav">
<div className="design-system-editor-left-nav" >
<div className="design-system-editor-left-nav-scrollable">
<List
sx={{
Expand Down