EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2019.12-05'

Browse Source
This commit is contained in:
Björn Fromme
2019-12-13 09:56:51 +01:00
parent 4b7657eced 11959b39e7
commit a0c4bfe3e7
7 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composer.lock
Generated
+7 -6
View File
@@ -889,16 +889,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.4.1",
"version": "6.5.0",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "0895c932405407fd3a7368b6910c09a24d26db11"
"reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
"reference": "0895c932405407fd3a7368b6910c09a24d26db11",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
"reference": "dbc2bc3a293ed6b1ae08a3651e2bfd213d19b6a5",
"shasum": ""
},
"require": {
@@ -913,12 +913,13 @@
"psr/log": "^1.1"
},
"suggest": {
"ext-intl": "Required for Internationalized Domain Name (IDN) support",
"psr/log": "Required for using the Log middleware"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.3-dev"
"dev-master": "6.5-dev"
}
},
"autoload": {
@@ -951,7 +952,7 @@
"rest",
"web service"
],
"time": "2019-10-23T15:58:00+00:00"
"time": "2019-12-07T18:20:45+00:00"
},
{
"name": "guzzlehttp/promises",
public/typo3conf/ext/ep_products/Classes/Service/IcalService.php
+1 -1
View File
@@ -80,7 +80,7 @@ class IcalService implements SingletonInterface
$percentageBooked = 100;
if ($paxTotal > 0) {
if ($paxTotal > 0 && Contingent::STATUS_BLOCKED !== $event->getStatus()) {
$percentageBooked = 100 - round($paxAvaiable / $paxTotal * 100);
}
public/typo3conf/ext/ep_theme/Resources/Private/Assets/images/logo_snowzone_2019.svg
+1
View File
File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
+1
View File
@@ -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');
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_color-snowzone.scss
+5 -5
View File
@@ -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;
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/_events.scss
+6 -5
View File
@@ -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{
public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/remix/_colors_snowzone.scss
+3 -3
View File
@@ -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;