Skip to content
Snippets Groups Projects
Commit 111c693e authored by Sandra Borst's avatar Sandra Borst
Browse files

added styles of startscreen except for button and pic

parent bb6c98ba
No related branches found
No related tags found
1 merge request!37added styles of startscreen except for button and pic
Showing
with 35 additions and 19 deletions
No preview for this file type
No preview for this file type
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:InnoLabProjektDektopApp" xmlns:local="clr-namespace:InnoLabProjektDektopApp"
StartupUri="Screens\Regulaer\Contact.xaml"> StartupUri="Screens\FirstLaunch\01Startscreen.xaml">
<Application.Resources> <Application.Resources>
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
... ...
......
...@@ -6,17 +6,24 @@ ...@@ -6,17 +6,24 @@
xmlns:local="clr-namespace:InnoLabProjektDektopApp" xmlns:local="clr-namespace:InnoLabProjektDektopApp"
xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates" xmlns:header="clr-namespace:InnoLabProjektDektopApp.Screens.Templates"
mc:Ignorable="d" mc:Ignorable="d"
Background="{StaticResource BACKGROUND_PRIMARY_BRUSH}"
> >
<ScrollViewer> <ScrollViewer>
<Grid> <Grid>
<Label Content="Are you ready to&#xA;work focused?" HorizontalAlignment="Left" Margin="76,102,0,0" VerticalAlignment="Top" Height="143" Width="432" FontSize="48" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/> <TextBlock Style="{StaticResource Header0}" Text="Are you ready to&#xA;work focused?" HorizontalAlignment="Left" Margin="117,102,0,0" VerticalAlignment="Top" Height="143" Width="432" FontSize="48"/>
<Button Content="Start now" HorizontalAlignment="Left" Height="31" Margin="117,385,0,0" VerticalAlignment="Top" Width="124" Click="Button_Click"/> <Button Content="Start now" HorizontalAlignment="Left" Height="31" Margin="117,385,0,0" VerticalAlignment="Top" Width="124" Click="Button_Click"/>
<TextBlock HorizontalAlignment="Left" Height="121" Margin="117,250,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="350"><Run 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"/><LineBreak/><Run/><LineBreak/><Run 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"/></TextBlock> <TextBlock HorizontalAlignment="Left" Height="121" Margin="117,250,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="350"><Run 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"/><LineBreak/><Run/><LineBreak/><Run 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"/></TextBlock>
<Rectangle HorizontalAlignment="Left" Height="269" Margin="587,0,0,0" Stroke="Black" VerticalAlignment="Center" Width="313" Fill="#FF828080"/> <Border HorizontalAlignment="Right"
Height="269"
Margin="587,0,0,0"
Width="313"
VerticalAlignment="Center"
Background="{StaticResource HIGHLIGHT_PRIMARY_BRUSH}"
BorderBrush="Black"
BorderThickness="1"
CornerRadius="20,0,0,20"/>
<Image HorizontalAlignment="Left" Height="197" Margin="668,174,0,0" VerticalAlignment="Top" Width="213" Source="/Screens/FirstLaunch/Mascott_InnoLab.jpg"/> <Image HorizontalAlignment="Left" Height="197" Margin="668,174,0,0" VerticalAlignment="Top" Width="213" Source="/Screens/FirstLaunch/Mascott_InnoLab.jpg"/>
<TextBlock HorizontalAlignment="Left" Height="121" Margin="117,500,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="350"><Run 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"/><LineBreak/><Run/><LineBreak/><Run 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"/></TextBlock>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</Page> </Page>
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<SolidColorBrush x:Key="TEXT_PRIMARY_BRUSH" Color="{StaticResource TEXT_PRIMARY_COLOR}" /> <SolidColorBrush x:Key="TEXT_PRIMARY_BRUSH" Color="{StaticResource TEXT_PRIMARY_COLOR}" />
<SolidColorBrush x:Key="TEXT_SECONDARY_BRUSH" Color="{StaticResource TEXT_SECONDARY_COLOR}" /> <SolidColorBrush x:Key="TEXT_SECONDARY_BRUSH" Color="{StaticResource TEXT_SECONDARY_COLOR}" />
<Style TargetType="ToolTip"> <Style TargetType="ToolTip">
<Setter Property="Background" Value="LightYellow" /> <Setter Property="Background" Value="LightYellow" />
...@@ -45,25 +47,33 @@ ...@@ -45,25 +47,33 @@
</Style> </Style>
<!-- Text -->
<Style TargetType="TextBlock"> <Style TargetType="TextBlock">
<Setter Property="ToolTipService.InitialShowDelay" Value="0" /> <Setter Property="ToolTipService.InitialShowDelay" Value="0" />
<Setter Property="FontFamily" Value="Segoe UI"/> <Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="Foreground" Value="{StaticResource TEXT_PRIMARY_BRUSH}"/>
<Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
<Style TargetType="TextBlock" x:Key="Header1"> <Style TargetType="TextBlock" x:Key="Header0" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="FontSize" Value="48"/>
<Setter Property="FontWeight" Value="Bold"/>
</Style>
<Style TargetType="TextBlock" x:Key="Header1" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="FontFamily" Value="Segoe UI"/> <Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="FontSize" Value="24"/> <Setter Property="FontSize" Value="24"/>
<Setter Property="FontWeight" Value="Bold"/> <Setter Property="FontWeight" Value="Bold"/>
<Setter Property="Foreground" Value="DarkBlue"/>
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
<!-- Style für Header 2 --> <!-- Style für Header 2 -->
<Style TargetType="TextBlock" x:Key="Header2"> <Style TargetType="TextBlock" x:Key="Header2" BasedOn="{StaticResource {x:Type TextBlock}}">
<Setter Property="FontFamily" Value="Segoe UI"/> <Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="FontSize" Value="20"/> <Setter Property="FontSize" Value="20"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Foreground" Value="DarkGray"/>
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
<Setter Property="ToolTipService.InitialShowDelay" Value="0"/> <Setter Property="ToolTipService.InitialShowDelay" Value="0"/>
</Style> </Style>
...@@ -73,7 +83,6 @@ ...@@ -73,7 +83,6 @@
<Setter Property="FontFamily" Value="Segoe UI"/> <Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="FontSize" Value="14"/> <Setter Property="FontSize" Value="14"/>
<Setter Property="FontWeight" Value="Normal"/> <Setter Property="FontWeight" Value="Normal"/>
<Setter Property="Foreground" Value="Black"/>
<Setter Property="TextWrapping" Value="Wrap"/> <Setter Property="TextWrapping" Value="Wrap"/>
</Style> </Style>
... ...
......
#pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5E39468647A7A113843EF58ACAC98DED8190104A" #pragma checksum "..\..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "7170D6747382882D77B2A3607A10686B9046184A"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
...@@ -56,11 +56,11 @@ namespace InnoLabProjektDektopApp { ...@@ -56,11 +56,11 @@ namespace InnoLabProjektDektopApp {
_contentLoaded = true; _contentLoaded = true;
#line 5 "..\..\..\App.xaml" #line 5 "..\..\..\App.xaml"
this.StartupUri = new System.Uri("Screens\\Regulaer\\Contact.xaml", System.UriKind.Relative); this.StartupUri = new System.Uri("Screens\\FirstLaunch\\01Startscreen.xaml", System.UriKind.Relative);
#line default #line default
#line hidden #line hidden
System.Uri resourceLocater = new System.Uri("/CoFlow;component/app.xaml", System.UriKind.Relative); System.Uri resourceLocater = new System.Uri("/CoFlow;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml" #line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater); System.Windows.Application.LoadComponent(this, resourceLocater);
... ...
......
...@@ -14,7 +14,7 @@ using System.Reflection; ...@@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")] [assembly: System.Reflection.AssemblyCompanyAttribute("CoFlow")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c8f7360dc8a60e36b54a14dca09e81eb52146c60")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bb6c98baa09bb806afe3f5c0352e621e22a4c2c4")]
[assembly: System.Reflection.AssemblyProductAttribute("CoFlow")] [assembly: System.Reflection.AssemblyProductAttribute("CoFlow")]
[assembly: System.Reflection.AssemblyTitleAttribute("CoFlow")] [assembly: System.Reflection.AssemblyTitleAttribute("CoFlow")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
... ...
......
b75dc553b38f3bc0d01be3cb1a93ad78fc35e7d86f6ae844b512a1f794b79bea cacc2287a2bdc00d139cf12036306063ffbc284619a96e2159bbeeb1bdb12363
#pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "52D38387AE7C10AE2B702C18286866184F19398F" #pragma checksum "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "51D3761E98A9662845761B21F9130FE29AB79E3D"
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
...@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp { ...@@ -75,7 +75,7 @@ namespace InnoLabProjektDektopApp {
{ {
case 1: case 1:
#line 14 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml" #line 15 "..\..\..\..\..\Screens\FirstLaunch\01Startscreen.xaml"
((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click); ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
#line default #line default
... ...
......
No preview for this file type
No preview for this file type
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment