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

Jump to bottom

Fixed incorrect icon alignment in Office 2013 theme (issue #253) #290

Merged
merged 6 commits into from
Apr 5, 2016
Merged

Fixed incorrect icon alignment in Office 2013 theme (issue #253) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
206070a
Merge remote-tracking branch 'refs/remotes/fluentribbon/develop' into…
floele Jan 30, 2016
7137f06
Merge remote-tracking branch 'refs/remotes/fluentribbon/KeyTipRefacto…
floele Jan 30, 2016
2725e16
Menu navigation working for the post part
floele Jan 30, 2016
89dc8d9
Merge remote-tracking branch 'refs/remotes/fluentribbon/develop' into…
floele-ww Mar 29, 2016
2c539f1
Fixed icon alignment in DropDownButton, ToggleButton, Button (compare…
floele-ww Mar 29, 2016
e4a31ac
Reverted to upstream version
floele-ww Mar 29, 2016
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
4 changes: 2 additions & 2 deletions Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
Value="16" />
<Setter Property="Margin"
TargetName="iconImage"
Value="1,0,2,0" />
Value="2,0,2,0" />
<Setter Property="Content"
TargetName="iconImage"
Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
Expand Down Expand Up @@ -92,7 +92,7 @@
Value="16" />
<Setter Property="Margin"
TargetName="iconImage"
Value="1,0,2,0" />
Value="2,0,2,0" />
<Setter Property="Content"
TargetName="iconImage"
Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
Expand Down
4 changes: 2 additions & 2 deletions Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
Value="16" />
<Setter Property="Margin"
TargetName="iconImage"
Value="1,0,0,0" />
Value="2,0,0,0" />
<Setter Property="Margin"
TargetName="controlLabel"
Value="-2,0,2,1" />
Expand Down Expand Up @@ -256,7 +256,7 @@
Value="16" />
<Setter Property="Margin"
TargetName="iconImage"
Value="1,0,2,0" />
Value="2,0,2,0" />
<Setter Property="VerticalAlignment"
TargetName="controlLabel"
Value="Center" />
Expand Down
4 changes: 4 additions & 0 deletions Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@
Value="Middle">
<Setter Property="Height"
Value="22" />
<Setter Property="HorizontalAlignment"
Value="Left" />
</Trigger>
<Trigger Property="Size"
Value="Small">
<Setter Property="Height"
Value="22" />
<Setter Property="Width"
Value="22" />
<Setter Property="HorizontalAlignment"
Value="Left" />
</Trigger>
</Style.Triggers>
</Style>
Expand Down