Merge branch 'main' into Coolkeke/main
This commit is contained in:
@@ -42,15 +42,15 @@
|
||||
<Style Selector="u|ButtonGroup.Tertiary Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultTertiaryForeground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Success Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultSuccessForeground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Warning Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultWarningForeground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Danger Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultDangerForeground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Success Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupDefaultSuccessForeground}" />
|
||||
</Style>
|
||||
|
||||
<Style Selector="u|ButtonGroup.Solid.Primary">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidPrimaryBackground}" />
|
||||
@@ -61,15 +61,15 @@
|
||||
<Style Selector="u|ButtonGroup.Solid.Tertiary">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidTertiaryBackground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Success">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessBackground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Warning">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidWarningBackground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Danger">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidDangerBackground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Success">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessBackground}" />
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid Button">
|
||||
<Setter Property="Foreground" Value="{DynamicResource ButtonGroupSolidForeground}" />
|
||||
</Style>
|
||||
@@ -100,6 +100,14 @@
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidTertiaryPressedBackground}" />
|
||||
</Style>
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Success Button">
|
||||
<Style Selector="^:pointerover">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPointeroverBackground}" />
|
||||
</Style>
|
||||
<Style Selector="^:pressed">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPressedBackground}" />
|
||||
</Style>
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Warning Button">
|
||||
<Style Selector="^:pointerover">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidWarningPointeroverBackground}" />
|
||||
@@ -116,13 +124,5 @@
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidDangerPressedBackground}" />
|
||||
</Style>
|
||||
</Style>
|
||||
<Style Selector="u|ButtonGroup.Solid.Success Button">
|
||||
<Style Selector="^:pointerover">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPointeroverBackground}" />
|
||||
</Style>
|
||||
<Style Selector="^:pressed">
|
||||
<Setter Property="Background" Value="{DynamicResource ButtonGroupSolidSuccessPressedBackground}" />
|
||||
</Style>
|
||||
</Style>
|
||||
|
||||
</Styles>
|
||||
|
||||
26
src/Ursa.Themes.Semi/Styles/ToolBar.axaml
Normal file
26
src/Ursa.Themes.Semi/Styles/ToolBar.axaml
Normal file
@@ -0,0 +1,26 @@
|
||||
<Styles xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:u="https://irihi.tech/ursa">
|
||||
<Design.PreviewWith>
|
||||
<Border Padding="20">
|
||||
<!-- Add Controls for Previewer Here -->
|
||||
</Border>
|
||||
</Design.PreviewWith>
|
||||
<Style Selector="u|ToolBar Button">
|
||||
<Setter Property="Theme" Value="{DynamicResource BorderlessButton}"></Setter>
|
||||
<Setter Property="FontWeight" Value="Regular" />
|
||||
<Setter Property="Foreground" Value="{DynamicResource SemiColorText0}"></Setter>
|
||||
</Style>
|
||||
<Style Selector="u|ToolBar CheckBox">
|
||||
<Setter Property="Margin" Value="8 0" />
|
||||
</Style>
|
||||
<Style Selector="u|ToolBar ToggleButton">
|
||||
<Setter Property="FontWeight" Value="Regular" />
|
||||
<Setter Property="Background" Value="Transparent"/>
|
||||
<Setter Property="Foreground" Value="{DynamicResource SemiColorText0}"/>
|
||||
</Style>
|
||||
<Style Selector="u|ToolBar ComboBox">
|
||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||
</Style>
|
||||
<!-- Add Styles Here -->
|
||||
</Styles>
|
||||
@@ -6,5 +6,6 @@
|
||||
</Design.PreviewWith>
|
||||
<StyleInclude Source="ButtonGroup.axaml" />
|
||||
<StyleInclude Source="Skeleton.axaml" />
|
||||
<StyleInclude Source="ToolBar.axaml"/>
|
||||
<!-- Add Styles Here -->
|
||||
</Styles>
|
||||
|
||||
Reference in New Issue
Block a user