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

Feature/color fixes #362

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Feature/color fixes #362

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
699f545
minor color changes
kandrelczyk Jan 7, 2025
b66921f
minor color changes
kandrelczyk Jan 7, 2025
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
35 changes: 33 additions & 2 deletions demo_markdown/docs/_guide/theme/customize_theme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ let on_customize_dark_theme = move |_| {
theme.set(Theme::custom_dark(&brand_colors.get()));
};
let value = RwSignal::new(0.0);
let page = RwSignal::new(1);
let selected_value = RwSignal::new(String::from("apple"));

view! {
<ConfigProvider theme>
Expand All @@ -64,13 +66,42 @@ view! {
<Button appearance=ButtonAppearance::Primary on_click=on_customize_light_theme>"Custom Light Theme"</Button>
<Button appearance=ButtonAppearance::Primary on_click=on_customize_dark_theme>"Custom Dark Theme"</Button>
</Space>
<Input/>
<Link href="https://react.fluentui.dev/?path=/docs/theme-theme-designer--docs">
"You can use this tool to generate brand color palette"
</Link>
<Checkbox />
<TabList selected_value>
<Tab value="apple">
"Apple"
</Tab>
<Tab value="pear">
"Pear"
</Tab>
</TabList>
<RadioGroup value=selected_value>
<Radio value="apple" label="Apple"/>
<Radio value="pear" label="Pear"/>
</RadioGroup>
<InfoLabel>
<InfoLabelInfo slot>
"This is example information for an InfoLabel. "
</InfoLabelInfo>
"Example label"
</InfoLabel>
<Badge appearance=BadgeAppearance::Filled>"10+"</Badge>
<Checkbox />
<Switch />
<Tag dismissible=true>"Tag"</Tag> //TODO make dismissable
<Input/>
<Select>
<option>"Red"</option>
<option>"Green"</option>
<option>"Blue"</option>
</Select>
<TimePicker />
<DatePicker/>
<Slider step=25.0 value/>
<ProgressBar value/>
<Pagination page page_count=10 />
</Card>
</ConfigProvider>
}
Expand Down
20 changes: 18 additions & 2 deletions thaw/src/radio/radio.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@
color: var(--colorCompoundBrandForeground1);
}

.thaw-radio__input:hover:checked ~ .thaw-radio__indicator {
color: var(--colorCompoundBrandForeground1Hover);
}

.thaw-radio__input:hover:active ~ .thaw-radio__indicator {
color: var(--colorCompoundBrandForeground1Pressed);
}

.thaw-radio__indicator::after {
position: absolute;
width: 16px;
Expand All @@ -74,11 +82,19 @@
line-height: var(--lineHeightBase300);
font-size: var(--fontSizeBase300);
font-family: var(--fontFamilyBase);
color: var(--colorNeutralForeground3);
}

.thaw-radio__input:enabled:hover ~ .thaw-radio__label {
color: var(--colorNeutralForeground2);
}

.thaw-radio__input:enabled:active ~ .thaw-radio__label {
color: var(--colorNeutralForeground1);
}

.thaw-radio__input:enabled:not(:checked) ~ .thaw-radio__label {
color: var(--colorNeutralForeground3);
.thaw-radio__input:enabled:checked ~ .thaw-radio__label {
color: var(--colorNeutralForeground1);
}

.thaw-radio__input:enabled ~ .thaw-radio__label {
Expand Down
8 changes: 8 additions & 0 deletions thaw/src/switch/switch.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
border-color: var(--colorTransparentStroke);
}

.thaw-switch__input:enabled:checked:hover ~ .thaw-switch__indicator {
background-color: var(--colorCompoundBrandBackgroundHover);
}

.thaw-switch__input:enabled:checked:active ~ .thaw-switch__indicator {
background-color: var(--colorCompoundBrandBackgroundPressed);
}

.thaw-switch__indicator > svg {
display: inline;
line-height: 0;
Expand Down
Loading