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

add Variables tokens and replace resources with them #519

Merged
merged 5 commits into from
Jan 2, 2025
Merged

add Variables tokens and replace resources with them #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fe4df3
feat: add basic Variables.
zdpcdt Jan 1, 2025
c55efe8
misc: format shared codes.
zdpcdt Jan 1, 2025
7600b18
feat: replace most resources in Shared folder with basic design tokens.
zdpcdt Jan 2, 2025
1200c9a
feat: index RadiusCardCornerRadius.
zdpcdt Jan 2, 2025
06d9e35
misc: delete Base.axaml file.
zdpcdt Jan 2, 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
5 changes: 3 additions & 2 deletions src/Semi.Avalonia/Index.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:semi="https://irihi.tech/semi">
<Styles.Resources>
<ResourceDictionary>
Expand All @@ -12,8 +13,8 @@
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
</ResourceDictionary.MergedDictionaries>
Expand Down
6 changes: 4 additions & 2 deletions src/Semi.Avalonia/SemiTheme.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<Styles x:Class="Semi.Avalonia.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
<Styles x:Class="Semi.Avalonia.SemiTheme"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:semi="https://irihi.tech/semi">
<Styles.Resources>
<ResourceDictionary>
Expand All @@ -12,8 +14,8 @@
</ResourceDictionary.ThemeDictionaries>
<ResourceDictionary.MergedDictionaries>
<ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
<ResourceInclude Source="avares://Semi.Avalonia/Icons/_index.axaml" />
</ResourceDictionary.MergedDictionaries>
Expand Down
13 changes: 0 additions & 13 deletions src/Semi.Avalonia/Themes/Base.axaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Semi.Avalonia/Themes/Dark/Window.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
<StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
</ResourceDictionary>
1 change: 1 addition & 0 deletions src/Semi.Avalonia/Themes/Light/Window.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
<StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Semi.Avalonia/Themes/Shared/AdornerLayer.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Thickness x:Key="AdornerLayerBorderThickness">2</Thickness>
<CornerRadius x:Key="AdornerLayerCornerRadius">3</CornerRadius>
<StaticResource x:Key="AdornerLayerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
</ResourceDictionary>
12 changes: 6 additions & 6 deletions src/Semi.Avalonia/Themes/Shared/AutoCompleteBox.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
<Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
<StaticResource x:Key="AutoCompleteBoxPopupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="AutoCompleteBoxPopupMargin" ResourceKey="SemiThicknessExtraTight" />
<Thickness x:Key="AutoCompleteBoxPopupPadding">0 4</Thickness>
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<x:Double x:Key="AutoCompleteBoxDefaultHeight">32</x:Double>
<x:Double x:Key="AutoCompleteBoxSmallHeight">24</x:Double>
<x:Double x:Key="AutoCompleteBoxLargeHeight">40</x:Double>
<StaticResource x:Key="AutoCompleteBoxPopupCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
<StaticResource x:Key="AutoCompleteBoxDefaultHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="AutoCompleteBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
<StaticResource x:Key="AutoCompleteBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
<x:Double x:Key="AutoCompleteMaxDropdownHeight">600</x:Double>
</ResourceDictionary>
8 changes: 4 additions & 4 deletions src/Semi.Avalonia/Themes/Shared/Border.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<CornerRadius x:Key="RadiusCardCornerRadius">4</CornerRadius>
<Thickness x:Key="ThicknessCardPadding">20</Thickness>
<Thickness x:Key="ThicknessCardMargin">4</Thickness>
<Thickness x:Key="ThicknessCardBorderThickness">1</Thickness>
<StaticResource x:Key="RadiusCardCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
<StaticResource x:Key="ThicknessCardPadding" ResourceKey="SemiThicknessBaseLoose" />
<StaticResource x:Key="ThicknessCardMargin" ResourceKey="SemiThicknessExtraTight" />
<StaticResource x:Key="ThicknessCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />
</ResourceDictionary>
19 changes: 7 additions & 12 deletions src/Semi.Avalonia/Themes/Shared/Button.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="ButtonDefaultFontSize">14</x:Double>
<FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>

<StaticResource x:Key="ButtonDefaultFontSize" ResourceKey="SemiFontSizeRegular" />
<StaticResource x:Key="ButtonDefaultFontWeight" ResourceKey="SemiFontWeightBold" />
<Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
<Thickness x:Key="ButtonLargePadding">16 10</Thickness>
<Thickness x:Key="ButtonSmallPadding">6 2</Thickness>

<x:Double x:Key="ButtonDefaultHeight">32</x:Double>
<x:Double x:Key="ButtonSmallHeight">24</x:Double>
<x:Double x:Key="ButtonLargeHeight">40</x:Double>

<Thickness x:Key="ButtonBorderThickness">1</Thickness>

<CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>

<StaticResource x:Key="ButtonDefaultHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="ButtonSmallHeight" ResourceKey="SemiHeightControlSmall" />
<StaticResource x:Key="ButtonLargeHeight" ResourceKey="SemiHeightControlLarge" />
<StaticResource x:Key="ButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="ButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="IconButtonClearData" ResourceKey="SemiIconClear" />
</ResourceDictionary>
9 changes: 4 additions & 5 deletions src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="ButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconChevronUp"/>
<StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown"/>

<CornerRadius x:Key="ButtonSpinnerButtonGroupCornerRadius">3</CornerRadius>
<Thickness x:Key="ButtonSpinnerButtonGroupBorderThickness">1</Thickness>
<StaticResource x:Key="ButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconChevronUp" />
<StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown" />
<StaticResource x:Key="ButtonSpinnerButtonGroupCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="ButtonSpinnerButtonGroupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
</ResourceDictionary>
16 changes: 7 additions & 9 deletions src/Semi.Avalonia/Themes/Shared/Calendar.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Thickness x:Key="CalendarBorderThickness">1</Thickness>
<CornerRadius x:Key="CalendarCornerRadius">6</CornerRadius>
<StaticResource x:Key="CalendarBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="CalendarCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
<GridLength x:Key="CalendarItemWeekDayNameHeight">40</GridLength>
<StaticResource x:Key="CalendarItemPreviousIconGlyph" ResourceKey="SemiIconChevronLeft"/>
<StaticResource x:Key="CalendarItemNextIconGlyph" ResourceKey="SemiIconChevronRight"/>

<FontWeight x:Key="CalendarItemCalendarButtonSelectedFontWeight">600</FontWeight>
<CornerRadius x:Key="CalendarItemCalendarButtonCornerRadius">3</CornerRadius>
<CornerRadius x:Key="CalendarItemCalendarDayButtonCornerRadius">3</CornerRadius>

<StaticResource x:Key="CalendarItemPreviousIconGlyph" ResourceKey="SemiIconChevronLeft" />
<StaticResource x:Key="CalendarItemNextIconGlyph" ResourceKey="SemiIconChevronRight" />
<StaticResource x:Key="CalendarItemCalendarButtonSelectedFontWeight" ResourceKey="SemiFontWeightBold" />
<StaticResource x:Key="CalendarItemCalendarButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="CalendarItemCalendarDayButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<x:Double x:Key="CalendarMinWidth">240</x:Double>
<x:Double x:Key="CalendarMinHeight">250</x:Double>
</ResourceDictionary>
12 changes: 6 additions & 6 deletions src/Semi.Avalonia/Themes/Shared/CalendarDatePicker.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="CalendarDatePickerIconGlyph" ResourceKey="SemiIconCalendar"/>
<Thickness x:Key="CalendarDatePickerBorderThickness">1</Thickness>
<CornerRadius x:Key="CalendarDatePickerCornerRadius">3</CornerRadius>
<x:Double x:Key="CalendarDatePickerDefaultHeight">32</x:Double>
<x:Double x:Key="CalendarDatePickerSmallHeight">24</x:Double>
<x:Double x:Key="CalendarDatePickerLargeHeight">40</x:Double>
<StaticResource x:Key="CalendarDatePickerIconGlyph" ResourceKey="SemiIconCalendar" />
<StaticResource x:Key="CalendarDatePickerBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="CalendarDatePickerCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="CalendarDatePickerDefaultHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="CalendarDatePickerSmallHeight" ResourceKey="SemiHeightControlSmall" />
<StaticResource x:Key="CalendarDatePickerLargeHeight" ResourceKey="SemiHeightControlLarge" />
</ResourceDictionary>
6 changes: 1 addition & 5 deletions src/Semi.Avalonia/Themes/Shared/Carousel.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="CarouselButtonGlyph" ResourceKey="SemiIconChevronLeft"/>

<StaticResource x:Key="CarouselButtonGlyph" ResourceKey="SemiIconChevronLeft" />
<x:Double x:Key="CarouselIndicatorDotWidth">8</x:Double>
<x:Double x:Key="CarouselIndicatorDotHeight">8</x:Double>

<x:Double x:Key="CarouselIndicatorLineHeight">4</x:Double>

<x:Double x:Key="CarouselIndicatorColumnarWidth">4</x:Double>
<x:Double x:Key="CarouselIndicatorColumnarHeight">12</x:Double>
<x:Double x:Key="CarouselIndicatorColumnarSelectedHeight">20</x:Double>

<Thickness x:Key="CarouselButtonMargin">20</Thickness>
</ResourceDictionary>
18 changes: 7 additions & 11 deletions src/Semi.Avalonia/Themes/Shared/CheckBox.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="CheckBoxFontSize">14</x:Double>
<StaticResource x:Key="CheckBoxFontSize" ResourceKey="SemiFontSizeRegular" />
<x:Double x:Key="CheckBoxBoxWidth">16</x:Double>
<x:Double x:Key="CheckBoxBoxHeight">16</x:Double>
<Thickness x:Key="CheckBoxBoxMargin">0 2 0 0</Thickness>
<Thickness x:Key="CheckBoxContentMargin">8 0 0 0</Thickness>

<x:Double x:Key="CheckBoxBoxGlyphWidth">16</x:Double>
<x:Double x:Key="CheckBoxBoxGlyphHeight">16</x:Double>

<CornerRadius x:Key="CheckBoxBoxCornerRadius">3</CornerRadius>
<Thickness x:Key="CheckBoxBoxBorderThickness">1</Thickness>

<StaticResource x:Key="CheckBoxCheckGlyph" ResourceKey="SemiIconCheckBoxTick"/>
<StaticResource x:Key="CheckBoxIndeterminateGlyph" ResourceKey="SemiIconCheckBoxIndeterminate"/>

<Thickness x:Key="CheckBoxCardBorderThickness">1</Thickness>
<StaticResource x:Key="CheckBoxBoxCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="CheckBoxBoxBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="CheckBoxCheckGlyph" ResourceKey="SemiIconCheckBoxTick" />
<StaticResource x:Key="CheckBoxIndeterminateGlyph" ResourceKey="SemiIconCheckBoxIndeterminate" />
<StaticResource x:Key="CheckBoxCardBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<Thickness x:Key="CheckBoxCardPadding">16 12</Thickness>
<CornerRadius x:Key="CheckBoxCardCornerRadius">3</CornerRadius>
<StaticResource x:Key="CheckBoxCardCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
</ResourceDictionary>
23 changes: 9 additions & 14 deletions src/Semi.Avalonia/Themes/Shared/ComboBox.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<CornerRadius x:Key="ComboBoxSelectorCornerRadius">3</CornerRadius>
<Thickness x:Key="ComboBoxSelectorThickness">1</Thickness>

<StaticResource x:Key="ComboBoxSelectorCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
<StaticResource x:Key="ComboBoxSelectorThickness" ResourceKey="SemiBorderThicknessControl" />
<Thickness x:Key="ComboBoxItemDefaultPadding">12 8</Thickness>
<Thickness x:Key="ComboBoxSelectorDefaultPadding">12 0 0 0</Thickness>

<x:Double x:Key="ComboBoxPopupMaxDropDownHeight">504</x:Double>
<Thickness x:Key="ComboBoxPopupBorderThickness">1</Thickness>
<CornerRadius x:Key="ComboBoxPopupBoxCornerRadius">6</CornerRadius>

<StaticResource x:Key="ComboBoxPopupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="ComboBoxPopupBoxCornerRadius" ResourceKey="SemiBorderRadiusMedium" />
<x:Double x:Key="ComboBoxIconWidth">32</x:Double>
<StaticResource x:Key="ComboBoxIcon" ResourceKey="SemiIconChevronDown"/>

<Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
<StaticResource x:Key="ComboBoxIcon" ResourceKey="SemiIconChevronDown" />
<StaticResource x:Key="ComboBoxPopupBorderMargin" ResourceKey="SemiThicknessExtraTight" />
<Thickness x:Key="ComboBoxPopupBorderPadding">0 4</Thickness>

<x:Double x:Key="ComboBoxDefaultHeight">32</x:Double>
<x:Double x:Key="ComboBoxSmallHeight">24</x:Double>
<x:Double x:Key="ComboBoxLargeHeight">40</x:Double>
<StaticResource x:Key="ComboBoxDefaultHeight" ResourceKey="SemiHeightControlDefault" />
<StaticResource x:Key="ComboBoxSmallHeight" ResourceKey="SemiHeightControlSmall" />
<StaticResource x:Key="ComboBoxLargeHeight" ResourceKey="SemiHeightControlLarge" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Semi.Avalonia/Themes/Shared/DataValidationErrors.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Semi.Avalonia/Themes/Shared/DatePicker.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="DatePickerIconGlyph" ResourceKey="SemiIconCalendar"/>
<StaticResource x:Key="DatePickerIconGlyph" ResourceKey="SemiIconCalendar" />
</ResourceDictionary>
19 changes: 7 additions & 12 deletions src/Semi.Avalonia/Themes/Shared/DateTimePickerShared.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
<StaticResource x:Key="DateTimePickerButtonDownGlyph" ResourceKey="SemiIconCaretDown" />
<StaticResource x:Key="DateTimePickerAcceptGlyph" ResourceKey="SemiIconTick" />
<StaticResource x:Key="DateTimePickerDismissGlyph" ResourceKey="SemiIconClose" />

<x:Double x:Key="DateTimePickerListBoxItemHeight">36</x:Double>


<Thickness x:Key="DateTimePickerFlyoutPadding">0</Thickness>
<Thickness x:Key="DateTimePickerFlyoutBorderMargin">8</Thickness>

<x:Double x:Key="DateTimePickerButtonSmallHeight">24</x:Double>
<x:Double x:Key="DateTimePickerButtonDefaultHeight">32</x:Double>
<x:Double x:Key="DateTimePickerButtonLargeHeight">40</x:Double>

<Thickness x:Key="DateTimePickerButtonBorderThickness">1</Thickness>
<CornerRadius x:Key="DateTimePickerButtonCornerRadius">3</CornerRadius>
<StaticResource x:Key="DateTimePickerFlyoutPadding" ResourceKey="SemiThicknessNone" />
<StaticResource x:Key="DateTimePickerFlyoutBorderMargin" ResourceKey="SemiThicknessTight" />
<StaticResource x:Key="DateTimePickerButtonSmallHeight" ResourceKey="SemiFontSizeHeader3" />
<StaticResource x:Key="DateTimePickerButtonDefaultHeight" ResourceKey="SemiFontSizeHeader1" />
<StaticResource x:Key="DateTimePickerButtonLargeHeight" ResourceKey="SemiHeightControlLarge" />
<StaticResource x:Key="DateTimePickerButtonBorderThickness" ResourceKey="SemiBorderThicknessControl" />
<StaticResource x:Key="DateTimePickerButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
</ResourceDictionary>
2 changes: 1 addition & 1 deletion src/Semi.Avalonia/Themes/Shared/DropDownButton.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<StaticResource x:Key="DropDownButtonIconGlyph" ResourceKey="SemiIconChevronDown"/>
<StaticResource x:Key="DropDownButtonIconGlyph" ResourceKey="SemiIconChevronDown" />
</ResourceDictionary>
9 changes: 4 additions & 5 deletions src/Semi.Avalonia/Themes/Shared/Expander.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<FontWeight x:Key="ExpanderHeaderFontWeight">600</FontWeight>
<x:Double x:Key="ExpanderIconSize">8</x:Double>
<StaticResource x:Key="ExpanderHeaderFontWeight" ResourceKey="SemiFontWeightBold" />
<StaticResource x:Key="ExpanderIconSize" ResourceKey="SemiWidthIconExtraSmall" />
<Thickness x:Key="ExpanderIconMargin">8 0 0 0</Thickness>
<StaticResource x:Key="ExpanderIcon" ResourceKey="SemiIconChevronDown"/>

<StaticResource x:Key="ExpanderIcon" ResourceKey="SemiIconChevronDown" />
<Thickness x:Key="ExpanderHeaderMargin">8 4</Thickness>
<Thickness x:Key="ExpanderHeaderPadding">8</Thickness>
<StaticResource x:Key="ExpanderHeaderPadding" ResourceKey="SemiThicknessTight" />
<Thickness x:Key="ExpanderContentMargin">16 4 16 8</Thickness>
<Thickness x:Key="ExpanderDownContentBorderThickness">0 0 0 1</Thickness>
<Thickness x:Key="ExpanderUpContentBorderThickness">0 1 0 0</Thickness>
Expand Down
Loading