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

Update MaterialDesignTheme.MahApps for MahApps v1.6.5 #898

Merged
merged 64 commits into from
Sep 5, 2018
Merged

Update MaterialDesignTheme.MahApps for MahApps v1.6.5 #898

Changes from 2 commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1b11a38
Update paket and dependencies for MahApps.Metro v1.6
punker76 Feb 16, 2018
1b2b48a
Update nuspec dependencies
punker76 Feb 16, 2018
c424061
Update Flyout style
punker76 Feb 16, 2018
5e6ca21
Simple Grammar Corrections
matheuscuba Jul 3, 2018
a07723b
Merge pull request #978 from MatheusMCuba/patch-1
Keboo Jul 16, 2018
e161e16
Merge pull request #769 from Joris8/master
Keboo Jul 17, 2018
5e5963f
Update MaterialDesignTheme.PasswordBox.xaml
Jul 9, 2018
e93d8b3
Update MaterialDesignTheme.PasswordBox.xaml
Jul 9, 2018
aa9de13
Merge pull request #981 from LeafyDev/patch-2
Keboo Jul 19, 2018
cd2a200
Move opacitymask from grid to adornerdecorater
CookiesAndCoffee May 28, 2018
d35eafd
Merge pull request #959 from CookiesAndCoffee/FixCardShadowRender
Keboo Jul 19, 2018
93e0b91
Replaced StackPanel with Grid to enable text wrapping in DataGridColu…
mgnslndh Mar 9, 2018
a46c613
Merge pull request #910 from mgnslndh/datagridcolumnheader-wrapping
Keboo Jul 19, 2018
2d05ee8
Added Scale and Offset to the combobox template
glen-nicol Feb 17, 2018
970216f
Merge pull request #899 from glen-nicol/combobox_hint_scaling
Keboo Jul 19, 2018
53904d2
Merge pull request #894 from ahausmann/patch-1
Keboo Jul 23, 2018
3645a8a
Merge pull request #880 from redstripes89/patch-1
Keboo Jul 23, 2018
3531c41
Merge pull request #780 from Alliance-Network/GridViewColumnHeader_Thumb
Keboo Jul 23, 2018
75b7341
Merge pull request #772 from cjvaughter/master
Keboo Jul 23, 2018
fdcc324
Merge pull request #952 from Keboo/fix929
Keboo Jul 24, 2018
de9126a
Merge pull request #887 from Keboo/fix885
Keboo Jul 25, 2018
8078bd4
Merge pull request #873 from Keboo/fixCursorMissing
Keboo Jul 25, 2018
67f068a
Merge pull request #951 from Keboo/fix950
Keboo Jul 25, 2018
53b0ed8
When parent window cannot be found the paired snackbar is still avail…
Keboo May 5, 2018
16b63b3
Merge pull request #949 from Keboo/fix946
Keboo Jul 25, 2018
0cc9777
Update appveyor.yml
Keboo Jul 25, 2018
6e65a50
Remove duplicate margine from cards (#948)
Keboo Jul 25, 2018
c2b597a
Added Documentation (#991)
ChinKX Jul 25, 2018
e227821
Update README.md
Keboo Jul 26, 2018
372589a
Adding support for floating scale and floating offset on DatePicker a…
Keboo Jul 26, 2018
8f6ffc0
Update appveyor.yml
Keboo Jul 30, 2018
871ecb0
Update appveyor.yml
Keboo Jul 30, 2018
b76e8ff
Update appveyor.yml
Keboo Aug 3, 2018
8a48c61
Update appveyor.yml
Keboo Aug 3, 2018
e547951
Update appveyor.yml
Keboo Aug 3, 2018
195c535
Update appveyor.yml
Keboo Aug 3, 2018
8b1bd20
Update appveyor.yml
Keboo Aug 3, 2018
970d6a2
Update appveyor.yml
Keboo Aug 3, 2018
0753898
Update appveyor.yml
Keboo Aug 3, 2018
f8c8c81
Update appveyor.yml
Keboo Aug 3, 2018
68479f6
Update appveyor.yml
Keboo Aug 3, 2018
8f41a11
Fixing spelling mistake. (#760)
Keboo Aug 3, 2018
d559b12
Update appveyor.yml
Keboo Aug 3, 2018
a790372
Fix Button template so that ContentStringFormat works (#1002)
jcummings2 Aug 7, 2018
2f649b2
Update MaterialDesignTheme.MahApps for MahApps v1.6.5 (#1006)
ahmed-abdelrazek Aug 12, 2018
74796ae
Update MaterialDesignTheme.Button.xaml (#874)
equimal Aug 12, 2018
449ecc5
Adding attached property to control the background color of the valid…
Keboo Aug 12, 2018
c65f4ee
Added MaterialDesignUserForegroundRadioButton (same idea as MaterialD…
bebenins Aug 12, 2018
113bcca
Indeterminate Progressbar on button #961 (#964)
Streissi Aug 12, 2018
c3e2d70
Fixing issue with botched nuspec merge.
Keboo Aug 14, 2018
8306466
Added .editorconfig file using IntelliCode (#1010)
cjbush Aug 17, 2018
c0e963a
Fixes #1014
Keboo Aug 17, 2018
1bb1508
Password field box #973 (#984)
Streissi Aug 17, 2018
934e103
Fixing duplicate key
Keboo Aug 17, 2018
77155f1
Clearing hard coded headers to get localized context menus on the pas…
Keboo Aug 17, 2018
d09695c
Corrected typo for MouseMoveEventHandler method. (#1015)
dhilmathy Aug 17, 2018
59f1b93
Merge branch 'master' into feature/MahApps_v1.6
punker76 Aug 24, 2018
0d36d20
update to latest paket
punker76 Aug 24, 2018
19cfd5d
paket update
punker76 Aug 24, 2018
3b4dc35
Added ValueChanged event for RatingBar - Fixes #1027 (#1029)
dhilmathy Aug 29, 2018
ce48305
Fix the background problem on Toolbar (#1031)
hv0905 Sep 4, 2018
e02f48a
Change DashedLine default visibility to collapsed (#1019)
jizc Sep 4, 2018
c6ec165
Update RangeSlider style
punker76 Sep 4, 2018
46efaa1
Adjust MahApps Dialog stuff
punker76 Sep 4, 2018
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
18 changes: 9 additions & 9 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Card.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<converters:ShadowEdgeConverter x:Key="ShadowEdgeConverter" />
</ControlTemplate.Resources>
<Grid Margin="{TemplateBinding Margin}" Background="Transparent">
<Grid.OpacityMask>
<MultiBinding Converter="{StaticResource ShadowEdgeConverter}">
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualWidth"/>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight"/>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:ShadowAssist.ShadowDepth)" />
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:ShadowAssist.ShadowEdges)" />
</MultiBinding>
</Grid.OpacityMask>
<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
<AdornerDecorator.OpacityMask>
<MultiBinding Converter="{StaticResource ShadowEdgeConverter}">
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualWidth"/>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ActualHeight"/>
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:ShadowAssist.ShadowDepth)" />
<Binding RelativeSource="{RelativeSource TemplatedParent}" Path="(wpf:ShadowAssist.ShadowEdges)" />
</MultiBinding>
</AdornerDecorator.OpacityMask>
<Border Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}"
CornerRadius="{TemplateBinding UniformCornerRadius}">
<Border Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}"
Expand All @@ -49,4 +49,4 @@
<Setter Property="Focusable" Value="False"/>
</Style>

</ResourceDictionary>
</ResourceDictionary>