Merge branch 'branding' into develop

This commit is contained in:
Xenomporio 2022-06-29 11:28:55 +02:00
commit d8ef4c1606
4 changed files with 429 additions and 431 deletions

View File

@ -377,7 +377,7 @@ class Player {
else{ else{
$this->app->Tpl->Set( $this->app->Tpl->Set(
'LOGINSLIDER', 'LOGINSLIDER',
'<div class="slide" style="background-image: url(\'./themes/new/templates/white-cup-filled-by-coffee.jpg\');"> '<div class="slide" style="background-image: url(\'./themes/new/images/login_screen_picture.jpg\');">
</div>' </div>'
); );
} }

View File

@ -66,17 +66,17 @@ body {
#login-slider-wrapper { #login-slider-wrapper {
width: 61.13%; width: 61.13%;
background: pink;
position: relative; position: relative;
} }
#login-slider { #login-slider {
position: fixed; position: fixed;
background: #4a738c;
width: 61.13%; width: 61.13%;
height: 100vh; height: 100vh;
} }
#login-slider .slide { #login-slider .slide {
height: 100vh; height: 100vh;
background-size: cover; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center center; background-position: center center;
position: relative; position: relative;

Binary file not shown.

After

Width:  |  Height:  |  Size: 515 KiB

View File

@ -10,10 +10,8 @@
<link rel="icon" type="image/png" href="./themes/new/images/favicon/favicon-32x32.png" sizes="32x32"> <link rel="icon" type="image/png" href="./themes/new/images/favicon/favicon-32x32.png" sizes="32x32">
<script type="text/javascript" src="./js/jquery/jquery-3.5.0.min.js"></script> <script type="text/javascript" src="./js/jquery/jquery-3.5.0.min.js"></script>
<script type="text/javascript" src="[JQUERYMIGRATESRC]"></script> <script type="text/javascript" src="[JQUERYMIGRATESRC]"></script>
<script src="themes/new/js/slick.min.js"></script>
<script src="themes/new/js/scripts_login.js"></script> <script src="themes/new/js/scripts_login.js"></script>
<link rel="stylesheet" href="themes/new/css/normalize.min.css?v=5"> <link rel="stylesheet" href="themes/new/css/normalize.min.css?v=5">
<link rel="stylesheet" href="themes/new/css/slick.css">
<link rel="stylesheet" href="themes/new/css/login_styles.css?v=3"> <link rel="stylesheet" href="themes/new/css/login_styles.css?v=3">
</head> </head>