2021-03-30 00:09:38 +02:00
|
|
|
<!--
|
|
|
|
Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
|
|
|
|
the MIT License. See LICENSE in the project root for license information.
|
|
|
|
-->
|
|
|
|
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
|
|
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
|
|
|
|
|
|
|
|
<!-- Merge SettingContainerStyle here to give every page access to the SettingContainer -->
|
2021-02-08 19:04:43 +01:00
|
|
|
<ResourceDictionary.MergedDictionaries>
|
2021-03-30 00:09:38 +02:00
|
|
|
<ResourceDictionary Source="SettingContainerStyle.xaml" />
|
2021-02-08 19:04:43 +01:00
|
|
|
</ResourceDictionary.MergedDictionaries>
|
|
|
|
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [x] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
<x:Double x:Key="StandardIconSize">14.0</x:Double>
|
|
|
|
<Thickness x:Key="StandardIndentMargin">13,0,0,0</Thickness>
|
|
|
|
<Thickness x:Key="StandardControlMargin">0,24,0,0</Thickness>
|
2020-12-24 01:22:18 +01:00
|
|
|
<x:Double x:Key="StandardBoxMinWidth">250</x:Double>
|
2020-12-11 22:34:21 +01:00
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!--
|
|
|
|
This is for styling the entire items control used on the
|
|
|
|
color schemes page
|
|
|
|
-->
|
|
|
|
<Style x:Key="ItemsControlStyle"
|
|
|
|
TargetType="ItemsControl">
|
|
|
|
<Setter Property="Margin" Value="{StaticResource StandardControlMargin}" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Used to stack a group of settings -->
|
|
|
|
<Style x:Key="SettingsStackStyle"
|
|
|
|
TargetType="StackPanel">
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
|
|
<Setter Property="Margin" Value="13,0,0,48" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Used to stack a group of settings inside a pivot -->
|
|
|
|
<Style x:Key="PivotStackStyle"
|
|
|
|
TargetType="StackPanel">
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
|
|
<Setter Property="Margin" Value="0,0,0,48" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Combo Box -->
|
|
|
|
<Style x:Key="ComboBoxSettingStyle"
|
|
|
|
BasedOn="{StaticResource DefaultComboBoxStyle}"
|
|
|
|
TargetType="ComboBox">
|
|
|
|
<Setter Property="MinWidth" Value="{StaticResource StandardBoxMinWidth}" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Text Box -->
|
|
|
|
<Style x:Key="TextBoxSettingStyle"
|
|
|
|
BasedOn="{StaticResource DefaultTextBoxStyle}"
|
|
|
|
TargetType="TextBox">
|
|
|
|
<Setter Property="Width" Value="{StaticResource StandardBoxMinWidth}" />
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
|
|
<Setter Property="TextWrapping" Value="Wrap" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Used for disclaimers -->
|
|
|
|
<Style x:Key="DisclaimerStyle"
|
|
|
|
TargetType="TextBlock">
|
|
|
|
<Setter Property="FontStyle" Value="Italic" />
|
|
|
|
<Setter Property="TextWrapping" Value="WrapWholeWords" />
|
2020-12-18 00:14:07 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Used for flyout messages -->
|
|
|
|
<Style x:Key="CustomFlyoutTextStyle"
|
|
|
|
BasedOn="{StaticResource BaseTextBlockStyle}"
|
|
|
|
TargetType="TextBlock">
|
|
|
|
<Setter Property="FontWeight" Value="Bold" />
|
|
|
|
<Setter Property="Margin" Value="0,0,0,10" />
|
2020-12-18 00:14:07 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Number Box -->
|
|
|
|
<Style x:Key="NumberBoxSettingStyle"
|
|
|
|
TargetType="muxc:NumberBox">
|
|
|
|
<Setter Property="SpinButtonPlacementMode" Value="Compact" />
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Button-Related Styling -->
|
|
|
|
<Style x:Key="BaseButtonStyle"
|
|
|
|
BasedOn="{StaticResource DefaultButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="VerticalAlignment" Value="Center" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="BrowseButtonStyle"
|
|
|
|
BasedOn="{StaticResource BaseButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="Margin" Value="10,0,0,0" />
|
|
|
|
<Setter Property="Height" Value="33" />
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [x] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="DeleteButtonStyle"
|
|
|
|
BasedOn="{StaticResource BaseButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="Margin" Value="0,0,0,10" />
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [x] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="SmallButtonStyle"
|
|
|
|
BasedOn="{StaticResource BrowseButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="Height" Value="33" />
|
|
|
|
<Setter Property="Width" Value="33" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="AccentBrowseButtonStyle"
|
|
|
|
BasedOn="{StaticResource AccentButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="Margin" Value="10,0,0,0" />
|
|
|
|
<Setter Property="VerticalAlignment" Value="Bottom" />
|
2020-12-18 00:14:07 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="AccentSmallButtonStyle"
|
|
|
|
BasedOn="{StaticResource AccentButtonStyle}"
|
|
|
|
TargetType="Button">
|
|
|
|
<Setter Property="Margin" Value="10,0,0,0" />
|
|
|
|
<Setter Property="VerticalAlignment" Value="Bottom" />
|
|
|
|
<Setter Property="Height" Value="33" />
|
|
|
|
<Setter Property="Width" Value="33" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="IconButtonTextBlockStyle"
|
|
|
|
TargetType="TextBlock">
|
|
|
|
<Setter Property="Margin" Value="10,0,0,0" />
|
Include UWP styling guidance in settings UI (#8831)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
The settings UI was _close_ to looking just right, it just needed some tweaks to adhere to the proper guidance: https://docs.microsoft.com/en-us/windows/uwp/design/controls-and-patterns/forms
This PR changes the font sizes, spacing, and layout of all of the pages to align with guidance.
Some pics:
![image](https://user-images.githubusercontent.com/48369326/105241313-58194980-5b22-11eb-9f18-524cc988ec33.png)
![image](https://user-images.githubusercontent.com/48369326/105241331-60718480-5b22-11eb-8698-b9fadf3c3016.png)
![image](https://user-images.githubusercontent.com/48369326/105244413-57ce7d80-5b25-11eb-87c3-ee5f19417318.png)
![image](https://user-images.githubusercontent.com/48369326/105241384-73845480-5b22-11eb-9517-4010b145ffc2.png)
Min width:
![image](https://user-images.githubusercontent.com/48369326/105241406-7aab6280-5b22-11eb-9c59-ffc72f66509d.png)
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #8816
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [x] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx
<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
* Removed custom font sizing, WinUI adheres to guidance anyway
* 24px spacing between controls and 48px between groupings
* Controls shouldn't be next to each other (see Launch size)
* Technically Launch size is a grouping, so it gets upgraded to subtitle status
* Left margins for pages have been fixed to left align with the page titles
* Single checkboxes have been changed to toggle switches
<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
2021-01-20 23:42:39 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<!-- Slider-Related Styling -->
|
|
|
|
<Style x:Key="SliderValueLabelStyle"
|
|
|
|
TargetType="TextBlock">
|
|
|
|
<Setter Property="Width" Value="35" />
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
|
|
|
<Setter Property="VerticalAlignment" Value="Center" />
|
|
|
|
<Setter Property="Margin" Value="5,0,0,0" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
|
2021-03-30 00:09:38 +02:00
|
|
|
<Style x:Key="CustomSliderControlGridStyle"
|
|
|
|
TargetType="Grid">
|
|
|
|
<Setter Property="Width" Value="{StaticResource StandardBoxMinWidth}" />
|
|
|
|
<Setter Property="HorizontalAlignment" Value="Left" />
|
2020-12-11 22:34:21 +01:00
|
|
|
</Style>
|
|
|
|
</ResourceDictionary>
|