Meik/CustomerPanel-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unify primary action button styling and ticket button placement

Browse Source
This commit is contained in:
Meik
2026-03-05 12:59:45 +01:00
parent feb531f9f0
commit f68f06f767
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainWindow.xaml
View File

@@ -192,6 +192,14 @@
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
<Style TargetType="Button"
x:Key="PrimaryActionButtonStyle"
BasedOn="{StaticResource ButtonStyle}">
<Setter Property="Background"
Value="{DynamicResource activeButtonColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource activeButtonColor}" />
</Style>
<Style TargetType="Button" <Style TargetType="Button"
x:Key="FlatButtonStyle2"> x:Key="FlatButtonStyle2">
<Setter Property="FontSize" <Setter Property="FontSize"

5
MainWindow.xaml.cs
View File

@@ -1117,9 +1117,8 @@ namespace C4IT_CustomerPanel
btn.Content = pair.Value; btn.Content = pair.Value;
btn.Width = 320; btn.Width = 320;
btn.Height = 40; btn.Height = 40;
btn.FontSize = 18; btn.FontSize = 16;
//btn.Background = ConfigSettings.GetInactiveButtonColor(); btn.Style = FindResource("PrimaryActionButtonStyle") as Style;
btn.Style = FindResource("ButtonStyle") as Style;
btn.Margin = new Thickness(15, 10, 0, 0); btn.Margin = new Thickness(15, 10, 0, 0);
btn.PreviewMouseDown += OnCustomButtonClick; btn.PreviewMouseDown += OnCustomButtonClick;
CustomLinksCtrl.AddLink(btn); CustomLinksCtrl.AddLink(btn);

3
UserControls/ComputerInformation.xaml
View File

@@ -334,8 +334,7 @@
Canvas.Top="0" Canvas.Top="0"
HorizontalContentAlignment="Center" /> HorizontalContentAlignment="Center" />
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
Style="{StaticResource ButtonStyle}" Style="{DynamicResource PrimaryActionButtonStyle}"
Background="{DynamicResource activeButtonColor}"
Width="250" Width="250"
Height="36" Height="36"
x:Name="BtnClientReport" x:Name="BtnClientReport"

13
UserControls/Incidents.xaml
View File

@@ -84,7 +84,7 @@
<ScrollViewer x:Name="CanvasIncident" <ScrollViewer x:Name="CanvasIncident"
Canvas.Top="56" Canvas.Top="56"
Canvas.Left="0" Canvas.Left="0"
MaxHeight="410" MaxHeight="448"
MinHeight="60" MinHeight="60"
HorizontalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"
@@ -107,14 +107,13 @@
</Border> </Border>
</StackPanel> </StackPanel>
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
Style="{StaticResource ButtonStyle}" Style="{DynamicResource PrimaryActionButtonStyle}"
Background="{DynamicResource activeButtonColor}" Canvas.Top="510"
Canvas.Top="476" Canvas.Left="15"
Canvas.Left="62" Width="320"
Width="250"
Height="40" Height="40"
Content="{x:Static resx:Resources.createNewTicket}" Content="{x:Static resx:Resources.createNewTicket}"
FontSize="18" FontSize="16"
x:Name="BtnCreateNewTicket" x:Name="BtnCreateNewTicket"
Click="OnCreateNewTicketClicked" Click="OnCreateNewTicketClicked"
Margin="0" /> Margin="0" />

6
UserControls/PortalSearch.xaml
View File

@@ -127,8 +127,7 @@
Canvas.Left="0" Canvas.Left="0"
Width="350" Width="350"
Height="360"> Height="360">
<Button Style="{StaticResource ButtonStyle}" <Button Style="{DynamicResource PrimaryActionButtonStyle}"
Background="{DynamicResource activeButtonColor}"
x:Name="BtnSspLink" x:Name="BtnSspLink"
x:FieldModifier="private" x:FieldModifier="private"
Width="320" Width="320"
@@ -141,8 +140,7 @@
<Button Foreground="{DynamicResource buttonTextColor}" <Button Foreground="{DynamicResource buttonTextColor}"
x:Name="BtnMyserviceLink" x:Name="BtnMyserviceLink"
x:FieldModifier="private" x:FieldModifier="private"
Style="{StaticResource ButtonStyle}" Style="{DynamicResource PrimaryActionButtonStyle}"
Background="{DynamicResource activeButtonColor}"
Width="320" Width="320"
Canvas.Left="15" Canvas.Left="15"
Height="40" Height="40"