Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

Commit 1c070c7

Browse files
BastogneBasBastogneBas
committed
Remove old ugly styling
1 parent f436646 commit 1c070c7

6 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎View/Authentication/LoginView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</Page.DataContext>
1313

1414
<Grid>
15-
<Border Background="#94D2E6" CornerRadius="10" Margin="10">
15+
<Border Background="{StaticResource BackgroundPrimary}" CornerRadius="10" Margin="10">
1616
<StackPanel Margin="10">
1717
<Label Content="E-mailadres van je schoolaccount" FontSize="14"/>
1818
<TextBox Margin="5 0" FontSize="14"
@@ -22,7 +22,7 @@
2222
<components:BindablePasswordBox Margin="5 0" FontSize="14"
2323
Password="{Binding Password}"/>
2424

25-
<Button Content="Inloggen" Margin="100 10" Background="#F16F6F" Foreground="White" FontSize="14" Command="{Binding LoginCommand}">
25+
<Button Content="Inloggen" Margin="100 10" Background="{StaticResource BackgroundTertiary}" Foreground="White" FontSize="14" Command="{Binding LoginCommand}">
2626
<Button.Resources>
2727
<Style TargetType="Border">
2828
<Setter Property="CornerRadius" Value="10"/>

‎View/Authentication/RegisterView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</Page.DataContext>
1313

1414
<Grid>
15-
<Border Background="#94D2E6" CornerRadius="10" Margin="10">
15+
<Border Background="{StaticResource BackgroundPrimary}" CornerRadius="10" Margin="10">
1616
<StackPanel Margin="10">
1717
<Label Content="E-mailadres van je schoolaccount" FontSize="14"/>
1818
<TextBox Margin="5 0" FontSize="14"
@@ -23,9 +23,9 @@
2323
Password="{Binding Password}"/>
2424

2525
<Label Content="Wachtwoordsterkte:" FontSize="14" HorizontalAlignment="Center" Margin="0,0,-5,0"/>
26-
<ProgressBar Maximum="5" Value="{Binding PasswordStrength}" Height="7" Background="#F16F6F" Foreground="#fff78f"/>
26+
<ProgressBar Maximum="5" Value="{Binding PasswordStrength}" Height="7" Background="{StaticResource BackgroundTertiary}" Foreground="{StaticResource BackgroundQuaternary}"/>
2727

28-
<Button Name="registerSubmit" Content="Registreren" Margin="100 10" Background="#F16F6F" Foreground="White" FontSize="14" Command="{Binding RegisterCommand}">
28+
<Button Name="registerSubmit" Content="Registreren" Margin="100 10" Background="{StaticResource BackgroundTertiary}" Foreground="White" FontSize="14" Command="{Binding RegisterCommand}">
2929
<Button.Resources>
3030
<Style TargetType="Border">
3131
<Setter Property="CornerRadius" Value="10"/>

‎View/Authentication/VerificationView.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
</Page.DataContext>
1313

1414
<Grid>
15-
<Border Background="#94D2E6" CornerRadius="10" Margin="10">
15+
<Border Background="{StaticResource BackgroundPrimary}" CornerRadius="10" Margin="10">
1616
<StackPanel Margin="10">
1717
<Label Content="Vul je verificatiecode in:" FontSize="14"/>
1818
<TextBox Margin="5 0" FontSize="14"
1919
Text="{Binding VerificationCode, UpdateSourceTrigger=PropertyChanged}"/>
2020

21-
<Button Name="VerifySubmit" Content="Verifiëren" Margin="100 10" Background="#F16F6F" Foreground="White" FontSize="14" Command="{Binding VerifyCommand}" Click="VerifySubmit_Click">
21+
<Button Name="VerifySubmit" Content="Verifiëren" Margin="100 10" Background="{StaticResource BackgroundTertiary}" Foreground="White" FontSize="14" Command="{Binding VerifyCommand}" Click="VerifySubmit_Click">
2222
<Button.Resources>
2323
<Style TargetType="Border">
2424
<Setter Property="CornerRadius" Value="10"/>

‎View/OpgevenRelaties.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<CheckBox Content="Zakelijk" Margin="79,36,0,0" Grid.Column="1" Height="15" VerticalAlignment="Top" HorizontalAlignment="Left" Width="99"/>
2727
<CheckBox Content="Vrienden" Margin="10,92,0,0" Grid.Column="1" Height="14" VerticalAlignment="Top" HorizontalAlignment="Left" Width="69"/>
2828
<CheckBox Content="Studiemaatje" Margin="79,92,0,0" Grid.Column="1" HorizontalAlignment="Left" Width="99" Height="14" VerticalAlignment="Top"/>
29-
<Frame Content="Hobby" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Background="Aqua" Source="HobbyOptionsView.xaml"/>
29+
<Frame Content="Hobby" Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="3" Background="{StaticResource BackgroundPrimary}" Source="HobbyOptionsView.xaml"/>
3030
<Button Content="Opslaan" Grid.Column="3" HorizontalAlignment="Center" Margin="0,24,0,0" VerticalAlignment="Top" Height="20" Width="59"/>
3131
<Button Content="Annuleren" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Top" Height="20" Width="59" Margin="0,65,0,0"/>
3232

‎View/ProfilePage.xaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
d:DesignHeight="1920" d:DesignWidth="1080"
99
Title="Profile">
1010

11-
<Grid x:Name="AllGrids" Background="White">
11+
<Grid x:Name="AllGrids">
1212
<Grid.RowDefinitions>
1313
<RowDefinition Height="5*"/>
1414
<RowDefinition Height="35*"/>
@@ -27,7 +27,7 @@
2727
<ColumnDefinition Width="5*"/>
2828
</Grid.ColumnDefinitions>
2929
<Canvas x:Name="PhotoCarousel" Grid.Column="1" Grid.Row ="1" Grid.ColumnSpan="3" Grid.RowSpan="1" Background="#23000000"/>
30-
<Grid x:Name="MainInfoGrid" Grid.Column="2" Grid.Row="2" Background="#220046FF">
30+
<Grid x:Name="MainInfoGrid" Grid.Column="2" Grid.Row="2" Background="{StaticResource BackgroundSecundary}">
3131
<Grid.ColumnDefinitions>
3232
<ColumnDefinition Width="25*"/>
3333
<ColumnDefinition Width="25*"/>
@@ -39,19 +39,19 @@
3939
<RowDefinition Height="40*"/>
4040
</Grid.RowDefinitions>
4141
<Label x:Name="NameLabel" HorizontalAlignment="Center" Content="PETER JANSEN" Grid.ColumnSpan="4" Grid.RowSpan="1" FontSize="48"/>
42-
<Label x:Name="AgeLabel" Content="24 jaar" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch" FontSize="20"/>
43-
<Label x:Name="LocationLabel" Content="Zwolle" Grid.Column="1" HorizontalAlignment="Center" Grid.Row="1" FontSize="20" VerticalAlignment="Stretch"/>
44-
<Label x:Name="SchoolNameLabel" Content="Windesheim" Grid.Column="2" HorizontalAlignment="Center" Grid.Row="1" FontSize="20" VerticalAlignment="Stretch"/>
45-
<Label x:Name="EducationLabel" Content="HBO-ICT" Grid.Column="3" HorizontalAlignment="Center" Grid.Row="1" FontSize="20" VerticalAlignment="Stretch"/>
42+
<Label x:Name="AgeLabel" Content="24 jaar" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
43+
<Label x:Name="LocationLabel" Content="Zwolle" Grid.Column="1" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
44+
<Label x:Name="SchoolNameLabel" Content="Windesheim" Grid.Column="2" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
45+
<Label x:Name="EducationLabel" Content="HBO-ICT" Grid.Column="3" HorizontalAlignment="Center" Grid.Row="1" VerticalAlignment="Stretch"/>
4646
</Grid>
47-
<Grid x:Name="InterestsGrid" Grid.Column="2" Grid.Row="3" Background="#220046FF"/>
48-
<Grid x:Name="InformationTextGrid" Grid.Column="2" Grid.Row="4" Background="#220046FF">
49-
<TextBlock x:Name="DescriptionTextBox" TextWrapping="WrapWithOverflow" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" FontSize="18" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."/>
47+
<Grid x:Name="InterestsGrid" Grid.Column="2" Grid.Row="3" Background="{StaticResource BackgroundSecundary}"/>
48+
<Grid x:Name="InformationTextGrid" Grid.Column="2" Grid.Row="4" Background="{StaticResource BackgroundSecundary}">
49+
<TextBlock x:Name="DescriptionTextBox" TextWrapping="WrapWithOverflow" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="10,10,10,10" Text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."/>
5050
</Grid>
5151
<Grid/>
52-
<Grid x:Name="QAGrid" Grid.Column="2" Grid.Row="5" Background="#220046FF"/>
52+
<Grid x:Name="QAGrid" Grid.Column="2" Grid.Row="5" Background="{StaticResource BackgroundSecundary}"/>
5353
<Grid/>
54-
<Grid x:Name="PriorityGrid" Grid.Column="2" Grid.Row="6" Background="#220046FF">
54+
<Grid x:Name="PriorityGrid" Grid.Column="2" Grid.Row="6" Background="{StaticResource BackgroundSecundary}">
5555
<Grid.ColumnDefinitions>
5656
<ColumnDefinition Width="2*"/>
5757
<ColumnDefinition Width="8*"/>
@@ -65,26 +65,26 @@
6565
<RowDefinition Height="1*"/>
6666
<RowDefinition Height="1*"/>
6767
</Grid.RowDefinitions>
68-
<Label x:Name="PriorityLabelIntelligence" Grid.Column="0" Grid.Row="0" Content="Intelligentie" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
69-
<ProgressBar x:Name="IntelligenceProgressBar" Grid.Column="1" Grid.Row="0" Background="#220046FF" Margin="10,10,10,10" Value="50" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
68+
<Label x:Name="PriorityLabelIntelligence" Grid.Column="0" Grid.Row="0" Content="Intelligentie" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
69+
<ProgressBar x:Name="IntelligenceProgressBar" Grid.Column="1" Grid.Row="0" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="50" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
7070

71-
<Label x:Name="FysicsLabel" Grid.Column="0" Grid.Row="1" Content="Fysieke Activiteiten" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
72-
<ProgressBar x:Name="FysicsProgressBar" Grid.Column="1" Grid.Row="1" Background="#220046FF" Margin="10,10,10,10" Value="20" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
71+
<Label x:Name="FysicsLabel" Grid.Column="0" Grid.Row="1" Content="Fysieke Activiteiten" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
72+
<ProgressBar x:Name="FysicsProgressBar" Grid.Column="1" Grid.Row="1" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="20" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
7373

74-
<Label x:Name="ClubbingLabel" Grid.Column="0" Grid.Row="2" Content="Uitgaansleven" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
75-
<ProgressBar x:Name="ClubbingProgressBar" Grid.Column="1" Grid.Row="2" Background="#220046FF" Margin="10,10,10,10" Value="90" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
74+
<Label x:Name="ClubbingLabel" Grid.Column="0" Grid.Row="2" Content="Uitgaansleven" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
75+
<ProgressBar x:Name="ClubbingProgressBar" Grid.Column="1" Grid.Row="2" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="90" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
7676

77-
<Label x:Name="NatureLabel" Grid.Column="0" Grid.Row="3" Content="Natuur" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
78-
<ProgressBar x:Name="NatureProgressBar" Grid.Column="1" Grid.Row="3" Background="#220046FF" Margin="10,10,10,10" Value="3" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
77+
<Label x:Name="NatureLabel" Grid.Column="0" Grid.Row="3" Content="Natuur" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
78+
<ProgressBar x:Name="NatureProgressBar" Grid.Column="1" Grid.Row="3" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="3" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
7979

80-
<Label x:Name="PoliticsLabel" Grid.Column="0" Grid.Row="4" Content="Politiek" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
81-
<ProgressBar x:Name="PoliticsProgressBar" Grid.Column="1" Grid.Row="4" Background="#220046FF" Margin="10,10,10,10" Value="65" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
80+
<Label x:Name="PoliticsLabel" Grid.Column="0" Grid.Row="4" Content="Politiek" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
81+
<ProgressBar x:Name="PoliticsProgressBar" Grid.Column="1" Grid.Row="4" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="65" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
8282

83-
<Label x:Name="WorkLabel" Grid.Column="0" Grid.Row="5" Content="Werk prestaties" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
84-
<ProgressBar x:Name="WorkProgressBar" Grid.Column="1" Grid.Row="5" Background="#220046FF" Margin="10,10,10,10" Value="45" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
83+
<Label x:Name="WorkLabel" Grid.Column="0" Grid.Row="5" Content="Werk prestaties" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
84+
<ProgressBar x:Name="WorkProgressBar" Grid.Column="1" Grid.Row="5" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="45" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
8585

86-
<Label x:Name="ClimateLabel" Grid.Column="0" Grid.Row="6" Content="Klimaat" HorizontalAlignment="Stretch" VerticalAlignment="Center" FontSize="18" Margin="10,0,0,0"/>
87-
<ProgressBar x:Name="ClimateProgressBar" Grid.Column="1" Grid.Row="6" Background="#220046FF" Margin="10,10,10,10" Value="10" Foreground="#FF0615B0" MaxHeight="12" MinHeight="12"/>
86+
<Label x:Name="ClimateLabel" Grid.Column="0" Grid.Row="6" Content="Klimaat" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0,0,0"/>
87+
<ProgressBar x:Name="ClimateProgressBar" Grid.Column="1" Grid.Row="6" Background="{StaticResource BackgroundSecundary}" Margin="10,10,10,10" Value="10" Foreground="{StaticResource BackgroundQuaternary}" MaxHeight="12" MinHeight="12"/>
8888
</Grid>
8989

9090
</Grid>

‎View/Styling/Main.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</DataTrigger>
4848
</Style.Triggers>
4949
</Style>
50-
50+
5151
<Style TargetType="Button">
5252
<Style.Resources>
5353
<Style TargetType="Border">
@@ -56,5 +56,5 @@
5656
</Style.Resources>
5757
<Setter Property="Background" Value="{StaticResource BackgroundTertiary}"/>
5858
</Style>
59-
59+
6060
</ResourceDictionary>

0 commit comments

Comments
 (0)