Merge branch 'main' of https://git.bib.de/PBA3H22APE/bib_Talk_Chatprogramm
This commit is contained in:
		@@ -49,6 +49,14 @@
 | 
			
		||||
                </Setter.Value>
 | 
			
		||||
            </Setter>
 | 
			
		||||
        </Style>
 | 
			
		||||
        <Style x:Key="HoverUnderlineTextBlockStyle" TargetType="TextBlock">
 | 
			
		||||
            <Setter Property="TextDecorations" Value="None"/>
 | 
			
		||||
            <Style.Triggers>
 | 
			
		||||
                <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Button}}" Value="True">
 | 
			
		||||
                    <Setter Property="TextDecorations" Value="Underline"/>
 | 
			
		||||
                </DataTrigger>
 | 
			
		||||
            </Style.Triggers>
 | 
			
		||||
        </Style>
 | 
			
		||||
    </Window.Resources>
 | 
			
		||||
 | 
			
		||||
    <Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828">
 | 
			
		||||
@@ -121,8 +129,8 @@
 | 
			
		||||
                           Foreground="#FF6332A0"
 | 
			
		||||
                           FontSize="12"
 | 
			
		||||
                           Width="66"
 | 
			
		||||
                           Margin="8,5,0,0"/>
 | 
			
		||||
 | 
			
		||||
                           Margin="8,5,0,0"
 | 
			
		||||
                           Style="{StaticResource HoverUnderlineTextBlockStyle}"/>
 | 
			
		||||
                </Button>
 | 
			
		||||
 | 
			
		||||
            </StackPanel>
 | 
			
		||||
 
 | 
			
		||||
@@ -87,6 +87,17 @@
 | 
			
		||||
                </Setter.Value>
 | 
			
		||||
            </Setter>
 | 
			
		||||
        </Style>
 | 
			
		||||
        <Style x:Key="HoverUnderlineTextBlockStyle" TargetType="TextBlock">
 | 
			
		||||
            <Setter Property="TextDecorations" Value="None"/>
 | 
			
		||||
            <Style.Triggers>
 | 
			
		||||
                <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=Button}}" Value="True">
 | 
			
		||||
                    <Setter Property="TextDecorations" Value="Underline"/>
 | 
			
		||||
                </DataTrigger>
 | 
			
		||||
            </Style.Triggers>
 | 
			
		||||
        </Style>
 | 
			
		||||
        <Style TargetType="Hyperlink">
 | 
			
		||||
            <EventSetter Event="RequestNavigate" Handler="Hyperlink_RequestNavigate"/>
 | 
			
		||||
        </Style>
 | 
			
		||||
    </Window.Resources>
 | 
			
		||||
 | 
			
		||||
    <Border CornerRadius="15" BorderThickness="20" BorderBrush="#FF282828">
 | 
			
		||||
@@ -196,25 +207,25 @@
 | 
			
		||||
                </StackPanel>
 | 
			
		||||
 | 
			
		||||
                <!-- Checkbox -->
 | 
			
		||||
                <StackPanel Orientation="Horizontal" Margin="0,20,0,0" Height="29">
 | 
			
		||||
                    <CheckBox x:Name="checkboxAGB" Style="{StaticResource CustomCheckBoxStyle}" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked"/>
 | 
			
		||||
                    <TextBlock FontSize="9" TextWrapping="Wrap" VerticalAlignment="Center" Height="24" Width="269">
 | 
			
		||||
                <Grid Margin="0,20,0,0" Height="30.1" Width="250">
 | 
			
		||||
                    <CheckBox x:Name="checkboxAGB" Style="{StaticResource CustomCheckBoxStyle}" Checked="CheckBox_Checked" Unchecked="CheckBox_Unchecked" Margin="-25,0,235,0"/>
 | 
			
		||||
                    <TextBlock FontSize="9" TextWrapping="Wrap" VerticalAlignment="Center" Height="24" Margin="15,0,-28,0">
 | 
			
		||||
                        <Run Text="Ich habe die " Foreground="White"/>
 | 
			
		||||
                    <Run Text="Nutzungsbedingungen" Foreground="#FF6332A0"/>
 | 
			
		||||
                        <Run x:Name="nutzungsbedingungenRun" Text="Nutzungsbedingungen" Foreground="#FF6332A0"/>
 | 
			
		||||
                        <Run Text=" und die " Foreground="White"/>
 | 
			
		||||
                    <Run Text="Datenschutzerklärung" Foreground="#FF6332A0"/>
 | 
			
		||||
                        <Run x:Name="datenschutzRun" Text="Datenschutzerklärung" Foreground="#FF6332A0"/>
 | 
			
		||||
                        <Run Text=" von bib-talk gelesen und akzeptiert." Foreground="White"/>
 | 
			
		||||
                    </TextBlock>
 | 
			
		||||
                </Grid>
 | 
			
		||||
                    
 | 
			
		||||
                </StackPanel>
 | 
			
		||||
                <Button x:Name="weiterbutton" Content="Weiter" Foreground="Gray"  Background="#FF323134" BorderThickness="0" Margin="0,20,0,0" Height="30" BorderBrush="{x:Null}" Click="WeiterButton_Click" Style="{StaticResource NoHoverButtonStyle}"/>
 | 
			
		||||
                <Button Style="{StaticResource InvisibleButtonStyle}" Click="Login_Click">
 | 
			
		||||
                    <TextBlock Text="Ich habe bereits einen Account"
 | 
			
		||||
                           Foreground="#FF6332A0"
 | 
			
		||||
                           FontSize="12"
 | 
			
		||||
                           Width="167"
 | 
			
		||||
                           Margin="-130,5,0,0"/>
 | 
			
		||||
 | 
			
		||||
                           Margin="-130,5,0,0"
 | 
			
		||||
                           Style="{StaticResource HoverUnderlineTextBlockStyle}"/>
 | 
			
		||||
                </Button>
 | 
			
		||||
            </StackPanel>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
using Newtonsoft.Json;
 | 
			
		||||
using System;
 | 
			
		||||
using System.Collections.Generic;
 | 
			
		||||
using System.Diagnostics;
 | 
			
		||||
using System.Linq;
 | 
			
		||||
using System.Net.Http;
 | 
			
		||||
using System.Text;
 | 
			
		||||
@@ -25,6 +26,12 @@ namespace bib_talk
 | 
			
		||||
            InitializeComponent();
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
 | 
			
		||||
		{
 | 
			
		||||
			Process.Start(new ProcessStartInfo(e.Uri.AbsoluteUri) { UseShellExecute = true });
 | 
			
		||||
			e.Handled = true;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		private void CloseButton_Click(object sender, RoutedEventArgs e)
 | 
			
		||||
        {
 | 
			
		||||
            this.Close();
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +0,0 @@
 | 
			
		||||
erik stinkt
 | 
			
		||||
		Reference in New Issue
	
	Block a user