Skip to content

Commit 006f3c7

Browse files
ButchersBoyButchersBoy
committed
Hyperlink colour/structure.
As a colour blind user I found the difference between dark and mid to subtle when I loaded up the change. Yet I found the dark to light to brash. So I stuck with dark to mid but with the added underline hint on mouse-over. Introduced some style inheritence to reduce the duplication.
1 parent bc06dca commit 006f3c7

File tree

1 file changed

+27
-144
lines changed

1 file changed

+27
-144
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Hyperlink.xaml‎

Lines changed: 27 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignCaptionHyperlink">
4-
<Setter Property="FontSize" Value="12"/>
5-
<Setter Property="FontWeight" Value="Regular"/>
6-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
7-
<Setter Property="TextDecorations" Value="None" />
8-
<Style.Triggers>
9-
<Trigger Property="IsMouseOver" Value="true">
10-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
11-
</Trigger>
12-
<Trigger Property="IsEnabled" Value="false">
13-
<Setter Property="Foreground"
14-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
15-
</Trigger>
16-
<Trigger Property="IsEnabled" Value="true">
17-
<Setter Property="Cursor" Value="Hand" />
18-
</Trigger>
19-
</Style.Triggers>
20-
</Style>
213
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignBody1Hyperlink">
224
<Setter Property="FontSize" Value="13"/>
235
<Setter Property="FontWeight" Value="Regular"/>
@@ -34,150 +16,51 @@
3416
<Trigger Property="IsEnabled" Value="true">
3517
<Setter Property="Cursor" Value="Hand" />
3618
</Trigger>
19+
<MultiTrigger>
20+
<MultiTrigger.Conditions>
21+
<Condition Property="IsEnabled" Value="True" />
22+
<Condition Property="IsMouseOver" Value="True" />
23+
</MultiTrigger.Conditions>
24+
<Setter Property="TextDecorations" Value="Underline" />
25+
</MultiTrigger>
3726
</Style.Triggers>
3827
</Style>
39-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignBody2Hyperlink">
40-
<Setter Property="FontSize" Value="13"/>
28+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignCaptionHyperlink"
29+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
30+
<Setter Property="FontSize" Value="12"/>
31+
</Style>
32+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignBody2Hyperlink"
33+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
4134
<Setter Property="FontWeight" Value="Medium"/>
42-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
43-
<Setter Property="TextDecorations" Value="None" />
44-
<Style.Triggers>
45-
<Trigger Property="IsMouseOver" Value="true">
46-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
47-
</Trigger>
48-
<Trigger Property="IsEnabled" Value="false">
49-
<Setter Property="Foreground"
50-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
51-
</Trigger>
52-
<Trigger Property="IsEnabled" Value="true">
53-
<Setter Property="Cursor" Value="Hand" />
54-
</Trigger>
55-
</Style.Triggers>
5635
</Style>
57-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignSubheadingHyperlink">
36+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignSubheadingHyperlink"
37+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
5838
<Setter Property="FontSize" Value="15"/>
59-
<Setter Property="FontWeight" Value="Regular"/>
60-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
61-
<Setter Property="TextDecorations" Value="None" />
62-
<Style.Triggers>
63-
<Trigger Property="IsMouseOver" Value="true">
64-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
65-
</Trigger>
66-
<Trigger Property="IsEnabled" Value="false">
67-
<Setter Property="Foreground"
68-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
69-
</Trigger>
70-
<Trigger Property="IsEnabled" Value="true">
71-
<Setter Property="Cursor" Value="Hand" />
72-
</Trigger>
73-
</Style.Triggers>
7439
</Style>
75-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignTitleHyperlink">
40+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignTitleHyperlink"
41+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
7642
<Setter Property="FontSize" Value="20"/>
7743
<Setter Property="FontWeight" Value="Medium"/>
78-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
79-
<Setter Property="TextDecorations" Value="None" />
80-
<Style.Triggers>
81-
<Trigger Property="IsMouseOver" Value="true">
82-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
83-
</Trigger>
84-
<Trigger Property="IsEnabled" Value="false">
85-
<Setter Property="Foreground"
86-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
87-
</Trigger>
88-
<Trigger Property="IsEnabled" Value="true">
89-
<Setter Property="Cursor" Value="Hand" />
90-
</Trigger>
91-
</Style.Triggers>
9244
</Style>
93-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignHeadlineHyperlink">
45+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignHeadlineHyperlink"
46+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
9447
<Setter Property="FontSize" Value="24"/>
95-
<Setter Property="FontWeight" Value="Regular"/>
96-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
97-
<Setter Property="TextDecorations" Value="None" />
98-
<Style.Triggers>
99-
<Trigger Property="IsMouseOver" Value="true">
100-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
101-
</Trigger>
102-
<Trigger Property="IsEnabled" Value="false">
103-
<Setter Property="Foreground"
104-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
105-
</Trigger>
106-
<Trigger Property="IsEnabled" Value="true">
107-
<Setter Property="Cursor" Value="Hand" />
108-
</Trigger>
109-
</Style.Triggers>
11048
</Style>
111-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay1Hyperlink">
49+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay1Hyperlink"
50+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
11251
<Setter Property="FontSize" Value="34"/>
113-
<Setter Property="FontWeight" Value="Regular"/>
114-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
115-
<Setter Property="TextDecorations" Value="None" />
116-
<Style.Triggers>
117-
<Trigger Property="IsMouseOver" Value="true">
118-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
119-
</Trigger>
120-
<Trigger Property="IsEnabled" Value="false">
121-
<Setter Property="Foreground"
122-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
123-
</Trigger>
124-
<Trigger Property="IsEnabled" Value="true">
125-
<Setter Property="Cursor" Value="Hand" />
126-
</Trigger>
127-
</Style.Triggers>
12852
</Style>
129-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay2Hyperlink">
53+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay2Hyperlink"
54+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
13055
<Setter Property="FontSize" Value="45"/>
131-
<Setter Property="FontWeight" Value="Regular"/>
132-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
133-
<Setter Property="TextDecorations" Value="None" />
134-
<Style.Triggers>
135-
<Trigger Property="IsMouseOver" Value="true">
136-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
137-
</Trigger>
138-
<Trigger Property="IsEnabled" Value="false">
139-
<Setter Property="Foreground"
140-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
141-
</Trigger>
142-
<Trigger Property="IsEnabled" Value="true">
143-
<Setter Property="Cursor" Value="Hand" />
144-
</Trigger>
145-
</Style.Triggers>
14656
</Style>
147-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay3Hyperlink">
57+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay3Hyperlink"
58+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
14859
<Setter Property="FontSize" Value="56"/>
149-
<Setter Property="FontWeight" Value="Regular"/>
150-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
151-
<Setter Property="TextDecorations" Value="None" />
152-
<Style.Triggers>
153-
<Trigger Property="IsMouseOver" Value="true">
154-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
155-
</Trigger>
156-
<Trigger Property="IsEnabled" Value="false">
157-
<Setter Property="Foreground"
158-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
159-
</Trigger>
160-
<Trigger Property="IsEnabled" Value="true">
161-
<Setter Property="Cursor" Value="Hand" />
162-
</Trigger>
163-
</Style.Triggers>
16460
</Style>
165-
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay4Hyperlink">
61+
<Style TargetType="{x:Type Hyperlink}" x:Key="MaterialDesignDisplay4Hyperlink"
62+
BasedOn="{StaticResource MaterialDesignBody1Hyperlink}">
16663
<Setter Property="FontSize" Value="112"/>
16764
<Setter Property="FontWeight" Value="Light"/>
168-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkBrush}" />
169-
<Setter Property="TextDecorations" Value="None" />
170-
<Style.Triggers>
171-
<Trigger Property="IsMouseOver" Value="true">
172-
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}" />
173-
</Trigger>
174-
<Trigger Property="IsEnabled" Value="false">
175-
<Setter Property="Foreground"
176-
Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type FrameworkElement}}, Path=(TextElement.Foreground)}" />
177-
</Trigger>
178-
<Trigger Property="IsEnabled" Value="true">
179-
<Setter Property="Cursor" Value="Hand" />
180-
</Trigger>
181-
</Style.Triggers>
18265
</Style>
18366
</ResourceDictionary>

0 commit comments

Comments
 (0)