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 overlapping disclaimer text in Profiles' Defaults section #16602

Merged
merged 1 commit into from
Jan 25, 2024
Merged

Fix overlapping disclaimer text in Profiles' Defaults section #16602

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
Margin="{StaticResource StandardIndentMargin}"
Style="{StaticResource DisclaimerStyle}"
Visibility="{x:Bind Profile.IsBaseLayer}" />
<StackPanel Style="{StaticResource SettingsStackStyle}">
<StackPanel Grid.Row="1"
Style="{StaticResource SettingsStackStyle}">
<!-- Suppress Application Title -->
<local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
Expand Down
5 changes: 3 additions & 2 deletions src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@
Margin="{StaticResource StandardIndentMargin}"
Style="{StaticResource DisclaimerStyle}"
Visibility="{x:Bind Profile.IsBaseLayer}" />
<StackPanel Style="{StaticResource SettingsStackStyle}">
<StackPanel Grid.Row="1"
Style="{StaticResource SettingsStackStyle}">
<!-- Control Preview -->
<Border MaxWidth="{StaticResource StandardControlMaxWidth}">
<Border x:Name="ControlPreview"
Width="400"
Height="180"
Margin="0,0,0,12"
Margin="0,12,0,12"
Copy link
Contributor Author

@tusharsnx tusharsnx Jan 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

The live profile demo container had an inconsistent gap in the top and bottom. (Too close to disclaimer text, too far from the main content)

To fix that I applied the same amount of margin on both the top and bottom. Lmk if this is not what we want to do.

Copy link
Member

Choose a reason for hiding this comment

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

THANK YOU

HorizontalAlignment="Left"
BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
BorderThickness="1" />
Expand Down
3 changes: 2 additions & 1 deletion src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
Margin="{StaticResource StandardIndentMargin}"
Style="{StaticResource DisclaimerStyle}"
Visibility="{x:Bind Profile.IsBaseLayer}" />
<StackPanel Style="{StaticResource SettingsStackStyle}">
<StackPanel Grid.Row="1"
Style="{StaticResource SettingsStackStyle}">

<!-- Name -->
<!--
Expand Down
Loading