Merge branch 'feature/snowzone-brand-update' into develop

This commit is contained in:
Björn Fromme committed 2019-12-13 09:55:34 +01:00
commit ed188acc4f
5 files changed
+16 -13

No files matched your search

@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 330 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"><g id="star"><g><g><path d="M27.732,120.059l-2.21,5.727c-2.713,-1.005 -6.13,-1.809 -9.546,-1.809c-4.119,0 -6.23,1.508 -6.23,3.618c0,6.33 19.493,3.617 19.493,14.971c0,6.129 -5.526,10.852 -14.368,10.852c-5.225,0 -10.751,-1.608 -14.871,-4.12l3.115,-5.627c3.517,2.211 7.737,3.517 11.655,3.517c4.823,0 6.933,-1.909 6.933,-3.919c0,-6.129 -19.492,-3.918 -19.492,-15.172c0,-5.828 5.023,-10.148 13.966,-10.148c4.622,0.1 8.943,1.205 11.555,2.11Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M71.039,130.81l0,21.703l-7.436,0l0,-19.191c0,-6.23 -1.005,-9.043 -7.335,-9.043c-3.617,0 -6.933,0.603 -10.249,1.607l0,26.527l-7.536,0l0,-30.244c4.221,-2.01 11.757,-4.22 18.388,-4.22c9.244,0.1 14.168,4.722 14.168,12.861Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M79.579,135.733c0,-9.947 7.938,-17.583 18.69,-17.583c11.354,0 18.689,7.636 18.689,17.583c0,10.048 -7.938,17.685 -18.689,17.685c-11.254,0 -18.69,-7.637 -18.69,-17.685Zm29.742,0.101c0,-6.33 -4.119,-11.555 -11.052,-11.555c-6.934,0 -10.953,5.225 -10.953,11.555c0,6.33 4.321,11.454 10.953,11.454c6.631,0 11.052,-5.124 11.052,-11.454Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M176.441,118.953l-16.981,34.163l-1.808,0l-8.642,-18.689l-8.942,18.689l-1.909,0l-16.378,-34.163l8.44,0l9.344,21.905l6.13,-13.364l-3.919,-8.541l7.837,0l9.244,21.905l9.747,-21.905l7.837,0Z" style="fill:#64c2c8;fill-rule:nonzero;"/></g><g><path d="M94.149,192.705l19.593,0l0,6.129l-31.952,0l-0.101,-0.703l20.398,-27.029l-17.785,0l0.301,-5.828l29.541,0l0.101,0.704l-20.096,26.727Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M119.671,181.954c0,-9.948 7.937,-17.584 18.689,-17.584c11.354,0 18.689,7.636 18.689,17.584c0,10.048 -7.938,17.684 -18.689,17.684c-11.354,0 -18.689,-7.636 -18.689,-17.684Zm29.741,0.201c0,-6.33 -4.119,-11.555 -11.052,-11.555c-6.933,0 -10.953,5.225 -10.953,11.555c0,6.33 4.321,11.454 10.953,11.454c6.631,0 11.052,-5.124 11.052,-11.454Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M198.245,177.131l0,21.703l-7.435,0l0,-19.191c0,-6.23 -1.005,-9.043 -7.335,-9.043c-3.617,0 -6.933,0.602 -10.249,1.607l0,26.527l-7.536,0l0,-30.244c4.22,-2.01 11.756,-4.221 18.388,-4.221c9.344,0.101 14.167,4.622 14.167,12.862Z" style="fill:#64c2c8;fill-rule:nonzero;"/><path d="M226.48,193.408c4.119,0 6.43,-0.301 11.856,-1.607l1.005,5.325c-1.909,0.904 -7.536,2.613 -13.364,2.613c-11.957,0 -19.091,-7.838 -19.091,-17.584c0,-10.249 6.833,-17.785 18.087,-17.785c10.349,0 16.378,6.732 16.378,15.775c0,1.306 -0.101,3.316 -0.302,4.421l-26.325,0c0.904,5.627 4.823,8.842 11.756,8.842Zm-11.857,-14.469l19.292,0c-0.201,-4.722 -2.411,-8.54 -9.244,-8.54c-6.229,0 -9.244,3.315 -10.048,8.54Z" style="fill:#64c2c8;fill-rule:nonzero;"/></g><g><path d="M146.699,82.982l4.622,1.005l0.101,0c0.201,0 0.402,-0.201 0.502,-0.402c0.101,-0.302 -0.1,-0.503 -0.402,-0.603l-4.622,-1.005c-0.301,-0.1 -0.502,0.101 -0.602,0.402c-0.101,0.301 0.1,0.502 0.401,0.603Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M149.111,73.838l12.459,4.019l0.101,0c0.1,0 0.201,-0.1 0.201,-0.201c0,-0.1 0,-0.301 -0.201,-0.301l-12.46,-4.019c-0.1,0 -0.301,0 -0.301,0.201c0,0.1 0,0.301 0.201,0.301Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M165.991,62.786l6.13,3.516c0.1,0 0.201,0.101 0.201,0.101c0.201,0 0.301,-0.101 0.402,-0.201c0.1,-0.201 0.1,-0.503 -0.201,-0.703l-6.13,-3.517c-0.201,-0.101 -0.502,-0.101 -0.703,0.201c0,0.201 0,0.502 0.301,0.603Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M189.805,69.92l0.1,0c0.101,0 0.101,0 0.201,-0.101c0.101,-0.1 0.101,-0.301 -0.1,-0.301l-23.01,-16.68c-0.1,-0.1 -0.301,-0.1 -0.301,0.101c-0.101,0.1 -0.101,0.301 0.1,0.301l23.01,16.68Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M163.982,51.13l0.1,0c0.101,0 0.101,0 0.201,-0.1c0.101,-0.101 0.101,-0.302 -0.1,-0.302l-2.512,-1.809c-0.101,-0.1 -0.302,-0.1 -0.302,0.101c-0.1,0.1 -0.1,0.301 0.101,0.301l2.512,1.809Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M180.058,43.293c0.101,0.201 0.302,0.201 0.503,0.201c0.201,0 0.402,-0.101 0.502,-0.201c0.302,-0.302 0.302,-0.704 0.101,-1.005l-6.632,-7.335c-0.301,-0.302 -0.703,-0.302 -1.005,-0.101c-0.301,0.302 -0.301,0.704 -0.1,1.005l6.631,7.436Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M207.791,47.111c0.201,0.402 0.502,0.603 0.904,0.603c0.101,0 0.301,0 0.402,-0.101c0.502,-0.201 0.703,-0.804 0.502,-1.306l-13.062,-29.239c-0.201,-0.503 -0.804,-0.704 -1.306,-0.503c-0.503,0.201 -0.704,0.804 -0.503,1.306l13.063,29.24Z" style="fill:#b0def1;fill-rule:nonzero;"/><path d="M192.216,12.144c0.201,0.402 0.503,0.603 0.905,0.603c0.1,0 0.301,0 0.402,-0.1c0.502,-0.201 0.703,-0.804 0.502,-1.307l-4Line truncated

After

Width:  |  Height:  |  Size: 16 KiB

@@ -49,6 +49,7 @@ require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png');
require('../images/logo_boarderweek.svg');
require('../images/favicon_sbw.ico');
require('../images/logo_snowzone.svg');
require('../images/logo_snowzone_2019.svg');
require('../images/favicon_sz.ico');
require('../images/logo_uni_champ.svg');
require('../images/favicon_uch.ico');
@@ -5,21 +5,21 @@
========================================================================== */
//hover/active/link
$link:#c31b63;
$bg:#9f0d4c;
$link:#82C3C6;
$bg:#82C3C6;
$bg_second: #3995DF;
$overlay:0.25;
$overlayMid: 0.8;
$hover_low:0.15;
$color-overlay:rgba($bg, $overlayMid);
$darkButton: #9f0d4c;
$darkButton: #82C3C6;
$darkButtonLine: rgba($darkButton, 0.8);
$color-bg-second:rgba($darkButton, 0.5);
$button: #ffe900;
$button: #f9c33d;
$bgAlpha: rgba($link, 0.5);
$buttonActiveHover: #e9d504;
$buttonActiveHover: #f9c33d;
$buttonInfoHover:#04578e;
$colorBlack: #404040;
$typoWhite: #ffffff;
@@ -16,8 +16,7 @@
&.snowzone{
.navbar-main-wrapper .navbar-main .logo{
height: 55px;
margin-top: 30px;
height: 100px;
margin-left: 10%;
@media (max-width: $smartphoneWidth) {
height: 100%;
@@ -27,13 +26,15 @@
}
.btn,
.btn {
color: white;
}
.ep-has-error-bar,
.checkbox label input[type="checkbox"] + .cr > .cr-icon{
color:$bg;
color: white;
}
.topnavi .container .row a{
color:$typoWhite;
color: white;
}
.ep-disturber-last-chance{
@@ -1,5 +1,5 @@
$color-brand-primary: #9f0d4c;
$color-brand-primary: #82C3C6;
$color-button-background: #ffe900;
$color-button-foreground: $color-brand-primary;
$color-button-background: #f9c33d;
$color-button-foreground: white;
$color-button-booking: $color-label-success;