mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-18 06:29:44 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Updated styling

Browse Source
This commit is contained in:
Niels Laute 2020-11-10 20:13:39 +01:00
parent 5056048ccd
commit 1e00d8cdaf
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/imageresizer/ui/Themes/Dark.xaml
View File

@ -15,8 +15,8 @@
<system:String x:Key="Theme.ColorScheme">Accent1</system:String> <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
<Color x:Key="Theme.PrimaryAccentColor">Black</Color> <Color x:Key="Theme.PrimaryAccentColor">Black</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF999999" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF999999" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>

4
src/modules/imageresizer/ui/Themes/HighContrast1.xaml
View File

@ -15,8 +15,8 @@
<system:String x:Key="Theme.ColorScheme">Accent2</system:String> <system:String x:Key="Theme.ColorScheme">Accent2</system:String>
<Color x:Key="Theme.PrimaryAccentColor">White</Color> <Color x:Key="Theme.PrimaryAccentColor">White</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FFffff00"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FFffff00"/>

4
src/modules/imageresizer/ui/Themes/HighContrast2.xaml
View File

@ -16,8 +16,8 @@
<Color x:Key="Theme.PrimaryAccentColor">White</Color> <Color x:Key="Theme.PrimaryAccentColor">White</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF00ff00" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF00ff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FF00ff00"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="#FF00ff00"/>

4
src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
View File

@ -15,8 +15,8 @@
<system:String x:Key="Theme.ColorScheme">Accent4</system:String> <system:String x:Key="Theme.ColorScheme">Accent4</system:String>
<Color x:Key="Theme.PrimaryAccentColor">White</Color> <Color x:Key="Theme.PrimaryAccentColor">White</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF1f1f1f" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FF3a3a3a" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF333333" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="White"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="White"/>

6
src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
View File

@ -15,9 +15,9 @@
<system:String x:Key="Theme.ColorScheme">Accent5</system:String> <system:String x:Key="Theme.ColorScheme">Accent5</system:String>
<Color x:Key="Theme.PrimaryAccentColor">White</Color> <Color x:Key="Theme.PrimaryAccentColor">White</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe6e6e6" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe5e5e5" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFf7f7f7" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF676666" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Black"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Black"/>
</ResourceDictionary> </ResourceDictionary>

6
src/modules/imageresizer/ui/Themes/Light.xaml
View File

@ -15,9 +15,9 @@
<system:String x:Key="Theme.ColorScheme">Accent1</system:String> <system:String x:Key="Theme.ColorScheme">Accent1</system:String>
<Color x:Key="Theme.PrimaryAccentColor">White</Color> <Color x:Key="Theme.PrimaryAccentColor">White</Color>
<SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe6e6e6" /> <SolidColorBrush x:Key="SecondaryBackgroundBrush" Color="#FFe5e5e5" />
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" /> <SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFf7f7f7" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" /> <SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" /> <SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF676666" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/> <SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary> </ResourceDictionary>

8
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@ -68,11 +68,11 @@
<ListBox.Resources> <ListBox.Resources>
<DataTemplate DataType="{x:Type m:ResizeSize}"> <DataTemplate DataType="{x:Type m:ResizeSize}">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Name}" FontWeight="Bold" Foreground="{DynamicResource PrimaryForegroundBrush}"/> <TextBlock Text="{Binding Name}" FontWeight="SemiBold" Foreground="{DynamicResource PrimaryForegroundBrush}"/>
<TextBlock Text="(" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="(" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Fit,Converter={StaticResource EnumValueConverter},ConverterParameter=ThirdPersonSingular}" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Fit,Converter={StaticResource EnumValueConverter},ConverterParameter=ThirdPersonSingular}" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Width,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Width,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="x" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="&#xE711;" FontSize="11" FontFamily="Segoe MDL2 Assets" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,5,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Height,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Height,Converter={StaticResource AutoDoubleConverter},ConverterParameter=Auto}" Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text="{Binding Unit,Converter={StaticResource EnumValueConverter},ConverterParameter=ToLower}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text="{Binding Unit,Converter={StaticResource EnumValueConverter},ConverterParameter=ToLower}" Margin="4,0,0,0" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
<TextBlock Text=")" Foreground="{DynamicResource SecondaryForegroundBrush}"/> <TextBlock Text=")" Foreground="{DynamicResource SecondaryForegroundBrush}"/>
@ -84,7 +84,7 @@
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Text="{Binding Name}" Text="{Binding Name}"
Foreground="{DynamicResource PrimaryForegroundBrush}" Foreground="{DynamicResource PrimaryForegroundBrush}"
FontWeight="Bold"/> FontWeight="SemiBold"/>
<ComboBox Margin="8,0,0,0" <ComboBox Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}" ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
Style="{StaticResource DisabledWhenUnselectedComboBoxStyle}" Style="{StaticResource DisabledWhenUnselectedComboBoxStyle}"
@ -115,7 +115,7 @@
Text="&#xE711;" Text="&#xE711;"
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
Width="25" Width="25"
Foreground="{DynamicResource PrimaryForegroundBrush}" Foreground="{DynamicResource SecondaryForegroundBrush}"
Name="Times_Symbol" Name="Times_Symbol"
AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}" AutomationProperties.Name="{x:Static p:Resources.Times_Symbol}"
TextAlignment="Center" TextAlignment="Center"