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

Remove explicit sizes of InfoBar #3653

Merged
merged 4 commits into from
Nov 21, 2020
Merged

Remove explicit sizes of InfoBar #3653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10dfa2b
Remove explicit sizes of InfoBar
marcelwgn Nov 19, 2020
0f03564
Set minheight for centering
marcelwgn Nov 19, 2020
02af2c5
Switch to lightweight styling resources
marcelwgn Nov 20, 2020
dddce70
Merge branch 'master' into user/chingucoding/infobar-buttonhyperlink-…
marcelwgn Nov 20, 2020
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: 0 additions & 2 deletions dev/InfoBar/InfoBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
<Style TargetType="Button">
<Style.Setters>
<Setter Property="MinWidth" Value="{StaticResource InfoBarActionButtonMinWidth}"/>
<Setter Property="Height" Value="{StaticResource InfoBarActionButtonHeight}"/>
<Setter Property="Padding" Value="{StaticResource InfoBarActionButtonPadding}"/>
<contract7Present:Setter Property="CornerRadius" Value="{StaticResource InfoBarActionButtonCornerRadius}"/>
</Style.Setters>
Expand All @@ -181,7 +180,6 @@
<Style.Setters>
<Setter Property="FontSize" Value="{ThemeResource InfoBarHyperlinkButtonFontSize}"/>
<Setter Property="Foreground" Value="{ThemeResource InfoBarHyperlinkButtonForeground}"/>
<Setter Property="Height" Value="{StaticResource InfoBarHyperlinkButtonHeight}"/>
<Setter Property="Padding" Value="{StaticResource InfoBarHyperlinkButtonPadding}"/>
</Style.Setters>
</Style>
Expand Down
2 changes: 0 additions & 2 deletions dev/InfoBar/InfoBar_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,10 @@
<Thickness x:Key="InfoBarActionVerticalLayoutMargin">0,12,0,0</Thickness>

<x:Double x:Key="InfoBarActionButtonMinWidth">96</x:Double>
<x:Double x:Key="InfoBarActionButtonHeight">24</x:Double>
<Thickness x:Key="InfoBarActionButtonPadding">8,0,8,1</Thickness>
<CornerRadius x:Key="InfoBarActionButtonCornerRadius">2</CornerRadius>

<x:Double x:Key="InfoBarHyperlinkButtonFontSize">14</x:Double>
<x:Double x:Key="InfoBarHyperlinkButtonHeight">24</x:Double>
<Thickness x:Key="InfoBarHyperlinkButtonPadding">0,0,0,1</Thickness>

<Symbol x:Key="InfoBarCloseButtonSymbol">Cancel</Symbol>
Expand Down