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

fix: show default sized fabs in sample page #1294

Merged
merged 1 commit into from
Dec 12, 2023
Merged

fix: show default sized fabs in sample page #1294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/FabSamplePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSmallFabStyle}"
<Button Style="{StaticResource MaterialFabStyle}"
HorizontalAlignment="Center">
<um:ControlExtensions.Icon>
<PathIcon Data="M16 9.14286H9.14286V16H6.85714V9.14286H0V6.85714H6.85714V0H9.14286V6.85714H16V9.14286Z" />
Expand All @@ -186,7 +186,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Surface"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSurfaceSmallFabStyle}"
<Button Style="{StaticResource MaterialSurfaceFabStyle}"
HorizontalAlignment="Center">
<um:ControlExtensions.Icon>
<PathIcon Data="M16 9.14286H9.14286V16H6.85714V9.14286H0V6.85714H6.85714V0H9.14286V6.85714H16V9.14286Z" />
Expand All @@ -198,7 +198,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Secondary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSecondarySmallFabStyle}"
<Button Style="{StaticResource MaterialSecondaryFabStyle}"
HorizontalAlignment="Center">
<um:ControlExtensions.Icon>
<PathIcon Data="M16 9.14286H9.14286V16H6.85714V9.14286H0V6.85714H6.85714V0H9.14286V6.85714H16V9.14286Z" />
Expand All @@ -210,7 +210,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Tertiary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
HorizontalAlignment="Center">
<um:ControlExtensions.Icon>
<PathIcon Data="M16 9.14286H9.14286V16H6.85714V9.14286H0V6.85714H6.85714V0H9.14286V6.85714H16V9.14286Z" />
Expand All @@ -221,7 +221,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Disabled"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
IsEnabled="False"
HorizontalAlignment="Center">
<um:ControlExtensions.Icon>
Expand All @@ -241,7 +241,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Label"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSmallFabStyle}"
<Button Style="{StaticResource MaterialFabStyle}"
HorizontalAlignment="Center"
Content="Create">
<um:ControlExtensions.Icon>
Expand All @@ -255,7 +255,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Label_Surface"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSurfaceSmallFabStyle}"
<Button Style="{StaticResource MaterialSurfaceFabStyle}"
HorizontalAlignment="Center"
Content="Create">
<um:ControlExtensions.Icon>
Expand All @@ -268,7 +268,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Label_Secondary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSecondarySmallFabStyle}"
<Button Style="{StaticResource MaterialSecondaryFabStyle}"
HorizontalAlignment="Center"
Content="Create">
<um:ControlExtensions.Icon>
Expand All @@ -281,7 +281,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Label_Tertiary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
HorizontalAlignment="Center"
Content="Create">
<um:ControlExtensions.Icon>
Expand All @@ -294,7 +294,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Icon_Label_Disabled"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
HorizontalAlignment="Center"
IsEnabled="False"
Content="Create">
Expand All @@ -315,7 +315,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Label"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSmallFabStyle}"
<Button Style="{StaticResource MaterialFabStyle}"
HorizontalAlignment="Center"
Content="Create"/>
</smtx:XamlDisplay>
Expand All @@ -325,7 +325,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Label_Surface"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSurfaceSmallFabStyle}"
<Button Style="{StaticResource MaterialSurfaceFabStyle}"
HorizontalAlignment="Center"
Content="Create"/>
</smtx:XamlDisplay>
Expand All @@ -334,7 +334,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Label_Secondary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialSecondarySmallFabStyle}"
<Button Style="{StaticResource MaterialSecondaryFabStyle}"
HorizontalAlignment="Center"
Content="Create"/>
</smtx:XamlDisplay>
Expand All @@ -343,7 +343,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Label_Tertiary"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
HorizontalAlignment="Center"
Content="Create"/>
</smtx:XamlDisplay>
Expand All @@ -352,7 +352,7 @@
<smtx:XamlDisplay UniqueKey="M3_FabSamplePage_Default_Label_Disabled"
Style="{StaticResource XamlDisplayBelowStyle}"
Margin="{StaticResource XamlDisplayMargin}">
<Button Style="{StaticResource MaterialTertiarySmallFabStyle}"
<Button Style="{StaticResource MaterialTertiaryFabStyle}"
HorizontalAlignment="Center"
IsEnabled="False"
Content="Create" />
Expand Down
Loading