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: Updated font colors in the Properties window #12795

Merged
merged 3 commits into from
Jun 29, 2023
Merged

Feature: Updated font colors in the Properties window #12795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98359b7
Feature: Updated font colors in the Properties window
yaira2 Jun 29, 2023
5e8f326
Update HashesPage.xaml
yaira2 Jun 29, 2023
9e2a30b
Update SecurityAdvancedPage.xaml
yaira2 Jun 29, 2023
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
2 changes: 2 additions & 0 deletions src/Files.App/ResourceDictionaries/PropertiesStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<Style x:Key="PropertyName" TargetType="TextBlock">
<Setter Property="Margin" Value="{StaticResource PropertyNameMargin}" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You kept these margins. I probably would have removed them. Are they really needed?

<Setter Property="FontSize" Value="14" />
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
<Setter Property="VerticalAlignment" Value="{StaticResource PropertyValueVerticalAlignment}" />
<Setter Property="FontWeight" Value="SemiBold" />
</Style>

Expand Down
5 changes: 1 addition & 4 deletions src/Files.App/Views/Properties/DetailsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@
<DataTemplate x:DataType="vm:FileProperty">
<Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
<Grid.ColumnDefinitions>
<ColumnDefinition
Width="Auto"
MinWidth="100"
MaxWidth="240" />
<ColumnDefinition Width="140" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>

Expand Down
6 changes: 5 additions & 1 deletion src/Files.App/Views/Properties/HashesPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

<vm:BasePropertiesPage.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
</ResourceDictionary.MergedDictionaries>

<toolkitconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
<toolkitconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
</ResourceDictionary>
Expand Down Expand Up @@ -142,7 +146,7 @@
<!-- Algorithm Name -->
<TextBlock
VerticalAlignment="Center"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now redundant

Style="{StaticResource BodyTextBlockStyle}"
Style="{StaticResource PropertyName}"
Text="{x:Bind Algorithm}" />

<!-- Calculating -->
Expand Down
12 changes: 6 additions & 6 deletions src/Files.App/Views/Properties/SecurityAdvancedPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,23 +636,23 @@
TextWrapping="Wrap" />

<!-- (Divider) -->
<Border
<!--<Border
Grid.Row="3"
Height="1"
Margin="-12,0,-12,8"
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
Background="{ThemeResource DividerStrokeColorDefaultBrush}" />-->

<!-- Inheritance Actions -->
<Grid
<!--<Grid
Grid.Row="4"
Margin="0,4,0,0"
ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
</Grid.ColumnDefinitions>-->

<!--<SplitButton
<!--<SplitButton
x:Name="SplitButton"
MaxWidth="196"
Command="{x:Bind SecurityAdvancedViewModel.DisableInheritanceCommand, Mode=OneWay}"
Expand Down Expand Up @@ -694,7 +694,7 @@
<TextBlock Text="{helpers:ResourceString Name=SecurityAdvancedReplaceChildPermissions/Text}" TextTrimming="CharacterEllipsis" />
</Button>-->

</Grid>
<!--</Grid>-->

</Grid>

Expand Down