diff --git a/Resources/Public/Stylesheet/Sass/_base.scss b/Resources/Public/Stylesheet/Sass/_base.scss index db470a1..35d4fd8 100755 --- a/Resources/Public/Stylesheet/Sass/_base.scss +++ b/Resources/Public/Stylesheet/Sass/_base.scss @@ -2,108 +2,108 @@ // Variables: // Relative path to original EXT:we_cookie_consent - Ver 2.1.0 -gf20211124 -$path-to-wcc : "../../../../"; -$path-to-ext : "../"; -$path-to-wcc-images : $path-to-wcc + "we_cookie_consent/Resources/Public/Images/"; -$path-to-wcc-icons : $path-to-wcc + "we_cookie_consent/Resources/Public/Icons/"; +$path-to-wcc : "../../../../" !default; +$path-to-ext : "../" !default; +$path-to-wcc-images : $path-to-wcc + "we_cookie_consent/Resources/Public/Images/" !default; +$path-to-wcc-icons : $path-to-wcc + "we_cookie_consent/Resources/Public/Icons/" !default; // Relative path to current EXT -$path-to-ext-images : $path-to-ext + "Images/"; -$path-to-ext-icons : $path-to-ext + "Icons/"; +$path-to-ext-images : $path-to-ext + "Images/" !default; +$path-to-ext-icons : $path-to-ext + "Icons/" !default; -$base-font-size:14px; +$base-font-size:14px !default; -$color-default : #161f57; -$color-black : #000; -$color-white : #FFF; -$color-none : transparent; -$color-grey : #EFEFEF; -$color-white-90-percent : #FFFFFFE0; +$color-default : #161f57 !default; +$color-black : #000 !default; +$color-white : #FFF !default; +$color-none : transparent !default; +$color-grey : #EFEFEF !default; +$color-white-90-percent : #FFFFFFE0 !default; -$opacity-hover : .7; // Ver 2.1.0 -gf20211125 +$opacity-hover : .7 !default; // Ver 2.1.0 -gf20211125 // Icons Buttons -$icon-edit: url( $path-to-ext-icons + "icon-pen.svg"); -$icon-accept: url( $path-to-ext-icons + "icon-check-dark.svg"); -$icon-success: url( $path-to-ext-icons + "icon-check-dark.svg"); -$icon-decline: url( $path-to-ext-icons + "icon-close.svg"); +$icon-edit: url( $path-to-ext-icons + "icon-pen.svg") !default; +$icon-accept: url( $path-to-ext-icons + "icon-check-dark.svg") !default; +$icon-success: url( $path-to-ext-icons + "icon-check-dark.svg") !default; +$icon-decline: url( $path-to-ext-icons + "icon-close.svg") !default; // Icons Buttons bei Hover: -$icon-hover-edit: url( $path-to-ext-icons + "icon-pen.svg"); -$icon-hover-accept: url( $path-to-ext-icons + "icon-check-dark.svg"); -$icon-hover-success: url( $path-to-ext-icons + "icon-check-dark.svg"); -$icon-hover-decline: url( $path-to-ext-icons + "icon-close.svg"); +$icon-hover-edit: url( $path-to-ext-icons + "icon-pen.svg") !default; +$icon-hover-accept: url( $path-to-ext-icons + "icon-check-dark.svg") !default; +$icon-hover-success: url( $path-to-ext-icons + "icon-check-dark.svg") !default; +$icon-hover-decline: url( $path-to-ext-icons + "icon-close.svg") !default; // Icons Settings -$icon-slider-yes: url( $path-to-ext-icons + "icon-yes.svg"); -$icon-slider-no: url( $path-to-ext-icons + "icon-no.svg"); -$icon-slider-locked: url( $path-to-ext-icons + "icon-locked.svg"); -$icon-settings-close: '\00d7'; -$icon-settings-close-size: 4em; -$icon-settings-close-color: #FFF; +$icon-slider-yes: url( $path-to-ext-icons + "icon-yes.svg") !default; +$icon-slider-no: url( $path-to-ext-icons + "icon-no.svg") !default; +$icon-slider-locked: url( $path-to-ext-icons + "icon-locked.svg") !default; +$icon-settings-close: '\00d7' !default; +$icon-settings-close-size: 4em !default; +$icon-settings-close-color: #FFF !default; // Backgroud colors: // Background Popup: -$color-bg: #FFF; +$color-bg: #FFF !default; // Background colours Buttons -$color-bg-edit: #FFF; -$color-bg-accept: #FFF; -$color-bg-accept-all: transparent; -$color-bg-success: #FFF; -$color-bg-decline: #FFF; -$color-bg-link: transparent; -$color-bg-primary: #F7A925; +$color-bg-edit: #FFF !default; +$color-bg-accept: #FFF !default; +$color-bg-accept-all: transparent !default; +$color-bg-success: #FFF !default; +$color-bg-decline: #FFF !default; +$color-bg-link: transparent !default; +$color-bg-primary: #F7A925 !default; // Font colours buttons -$color-font-edit: #00AFCB; -$color-font-accept: #161f57; -$color-font-success: #161f57; -$color-font-decline: #161f57; -$color-font-primary: #FFF; +$color-font-edit: #00AFCB !default; +$color-font-accept: #161f57 !default; +$color-font-success: #161f57 !default; +$color-font-decline: #161f57 !default; +$color-font-primary: #FFF !default; // Border Colors -$color-border: #00AFCB; -$color-hover-border: #00AFCB; +$color-border: #00AFCB !default; +$color-hover-border: #00AFCB !default; // Border properties: -$border-width: 2px; -$border-radius: 4px; -$border-style: $border-width solid $color-border; -$border-hover-style: $border-width solid rgba(0,0,0,.1); +$border-width: 2px !default; +$border-radius: 4px !default; +$border-style: $border-width solid $color-border !default; +$border-hover-style: $border-width solid rgba(0,0,0,.1) !default; // Sliders and Locker icon -$color-slider:#EFEFEF; -$color-slider-half-active:#DADADA; -$color-slider-active:#C9C9C9; -$color-slider-knop:#B1D6E8; // rgb(177,214,232) -$color-slider-knop-half-active: #63ADD1; // rgb(99,173,209) -$color-slider-knop-active: #008000; // rgb(0,128,0); [#63ADD1; // rgb(99,173,209)] +$color-slider:#EFEFEF !default; +$color-slider-half-active:#DADADA !default; +$color-slider-active:#C9C9C9 !default; +$color-slider-knop:#B1D6E8 !default; // rgb(177,214,232) +$color-slider-knop-half-active: #63ADD1 !default; // rgb(99,173,209) +$color-slider-knop-active: #008000 !default; // rgb(0,128,0) !default; [#63ADD1 !default; // rgb(99,173,209)] // Assignment colours/properties to buttons: -$cm-btn-color: $color-default; -$cm-btn-color-bg: $color-grey; -$cm-btn-color-border: $color-border; -$cm-btn-border: $border-style; +$cm-btn-color: $color-default !default; +$cm-btn-color-bg: $color-grey !default; +$cm-btn-color-border: $color-border !default; +$cm-btn-border: $border-style !default; -$cm-link-bg : $color-bg-link; -$cm-link-border : none; +$cm-link-bg : $color-bg-link !default; +$cm-link-border : none !default; -$cm-btn-color-success: $color-font-success; -$cm-btn-color-bg-success: $color-bg-success; -$cm-btn-color-bg-decline: $color-bg-decline; -$cm-btn-color-bg-primary: $color-bg-primary; +$cm-btn-color-success: $color-font-success !default; +$cm-btn-color-bg-success: $color-bg-success !default; +$cm-btn-color-bg-decline: $color-bg-decline !default; +$cm-btn-color-bg-primary: $color-bg-primary !default; -$border-top-purpose: $border-hover-style; +$border-top-purpose: $border-hover-style !default; -$video-overlay-bg : $color-white-90-percent; +$video-overlay-bg : $color-white-90-percent !default; // Table colours (privacy page) -$table-headline-color : $color-default; -$table-bg-color : $color-none; -$table-row-bg-color : $color-slider; -$table-border-color : #ABABAB; +$table-headline-color : $color-default !default; +$table-bg-color : $color-none !default; +$table-row-bg-color : $color-slider !default; +$table-border-color : #ABABAB !default; // Paddings und Margins -$spacing-top-bottom : 20px; -$spacing-left-right : 30px; +$spacing-top-bottom : 20px !default; +$spacing-left-right : 30px !default; /* @@ -151,10 +151,10 @@ To do: .klaro.we_cookie_consent .cookie-modal { h1, h2, - li, + li, p, - a, - strong, + a, + strong, ul { color: $color-default; font-size: 1em; diff --git a/Resources/Public/Stylesheet/Sass/_cookie-modal.scss b/Resources/Public/Stylesheet/Sass/_cookie-modal.scss index 3fe000d..bee123c 100755 --- a/Resources/Public/Stylesheet/Sass/_cookie-modal.scss +++ b/Resources/Public/Stylesheet/Sass/_cookie-modal.scss @@ -1,13 +1,13 @@ .klaro.we_cookie_consent { // "Settings": .cookie-modal { - box-shadow:1px 2px 5px rgba(0,0,0,0.2); - z-index: 9999; + box-shadow:1px 2px 5px rgba(0,0,0,0.2); + z-index: 9999; a:hover{ opacity: $opacity-hover; } - .slider { - box-shadow: none; + .slider { + box-shadow: none; } .cm-bg { background: rgba(0,0,0,$opacity-hover); @@ -22,7 +22,7 @@ &.cm-services, &.cm-purposes { li { - &.cm-service, + &.cm-service, &.cm-purpose { padding-left: 72px; } @@ -34,33 +34,33 @@ } } } - &.cm-services li.cm-purpose .cm-services .cm-content, + &.cm-services li.cm-purpose .cm-services .cm-content, &.cm-purposes li.cm-purpose .cm-services .cm-content { margin-left: -72px; - } + } } } - // ACTIVATE grouping of services by category: + // ACTIVATE grouping of services by category: .cm-purpose { padding-left: 92px; border-top: $border-top-purpose; padding-top: .5em; > { - .cm-list-label .slider, - .cm-list-input:checked + .cm-list-label .slider, + .cm-list-label .slider, + .cm-list-input:checked + .cm-list-label .slider, .cm-list-input.required:checked + .cm-list-label .slider{ background-color: $color-slider; top: 2px; width: 72px; } - .cm-list-label .slider::before { - background-color: $color-slider-knop; - bottom: 2px; - height: 24px; - left: 2px; + .cm-list-label .slider::before { + background-color: $color-slider-knop; + bottom: 2px; + height: 24px; + left: 2px; width: 24px; - transition:.2s ease 0s; + transition:.2s ease 0s; } .cm-list-input.half-checked:checked + .cm-list-label .slider, .cm-list-input.only-required + .cm-list-label .slider { @@ -78,7 +78,7 @@ .cm-list-input + .cm-list-label .disabled .slider::before, .cm-list-input:checked + .cm-list-label .disabled .slider::before, .cm-list-input.required + .cm-list-label .slider::before, - .cm-list-input.required:checked + .cm-list-label .slider::before { + .cm-list-input.required:checked + .cm-list-label .slider::before { background-color: $color-slider-active; display:none; } @@ -101,7 +101,7 @@ .cm-list-input:not(.half-checked):checked + .cm-list-label > .cm-list-title + .cm-switch::before { content: $icon-slider-yes; // Slider-Symbol "no" } - .cm-list-label .cm-required ~ .cm-cswitch .slider, + .cm-list-label .cm-required ~ .cm-cswitch .slider, .cm-list-input:checked + .cm-list-label .cm-required ~ .cm-switch .slider { background: $icon-slider-locked no-repeat transparent; // Icon "active + not changable" border-radius: unset; @@ -118,13 +118,13 @@ } } } - - - // NO grouping of services by category - just listing: + + + // NO grouping of services by category - just listing: .cm-service > div > { // .cm-service.cm-toggle-all > div > { - .cm-list-label .slider, - .cm-list-input:checked + .cm-list-label .slider, + .cm-list-label .slider, + .cm-list-input:checked + .cm-list-label .slider, .cm-list-input.required:checked + .cm-list-label .slider{ background-color: $color-slider; top: 2px; @@ -133,7 +133,7 @@ .cm-list-label .cm-required { margin-left:.5em; } - + .cm-list-label .slider::before { background-color: $color-slider-knop; bottom: 2px; @@ -181,7 +181,7 @@ padding: 2px; width: 16px; } - .cm-list-label .cm-required ~ .cm-cswitch .slider, + .cm-list-label .cm-required ~ .cm-cswitch .slider, .cm-list-input:checked + .cm-list-label .cm-required ~ .cm-switch .slider { background: $icon-slider-locked no-repeat transparent; // Icon "active + not changable" border-radius: unset; @@ -194,63 +194,63 @@ padding-top:10px; } - .cm-modal.cm-klaro { + .cm-modal.cm-klaro { background:$color-bg; - border-radius: $border-radius; - bottom: 220px; - height: auto; - max-height: calc(100vh - 220px); - max-width:100%; - overflow-x: hidden; - padding: 0; - position: absolute; - top: auto; - transform: inherit; - transition: unset; + border-radius: $border-radius; + bottom: 220px; + height: auto; + max-height: calc(100vh - 220px); + max-width:100%; + overflow-x: hidden; + padding: 0; + position: absolute; + top: auto; + transform: inherit; + transition: unset; width: 100%; - .hide { - background-color:$color-bg; - color: $icon-settings-close-color; - cursor: default; - display: block !important; - font-size: $icon-settings-close-size; - height: 60px; - line-height: 20px; - overflow: hidden; - padding: 20px; - top: 0; - right: 0; - } - .hide svg { - display:none; - } - .hide:after { + .hide { + background-color:$color-bg; + color: $icon-settings-close-color; + cursor: default; + display: block !important; + font-size: $icon-settings-close-size; + height: 60px; + line-height: 20px; + overflow: hidden; + padding: 20px; + top: 0; + right: 0; + } + .hide svg { + display:none; + } + .hide:after { content: $icon-settings-close; } - .cm-header { - border-bottom: none; - margin: 0; - padding: $spacing-top-bottom $spacing-left-right; + .cm-header { + border-bottom: none; + margin: 0; + padding: $spacing-top-bottom $spacing-left-right; } - .cm-header h1 { - font-size: 2em; + .cm-header h1 { + font-size: 2em; } - .cm-body { - margin:0; - padding:$spacing-top-bottom $spacing-left-right; + .cm-body { + margin:0; + padding:$spacing-top-bottom $spacing-left-right; ul.cm-purposes li.cm-purpose { padding-left:92px; - &.cm-toggle-all { + &.cm-toggle-all { border-top: $border-top-purpose; - padding-left:0; + padding-left:0; // .cm-list-input, - // .cm-list-label { - // display:none; + // .cm-list-label { + // display:none; // } } } } - .cm-toggle-all { + .cm-toggle-all { .cm-purpose-description { display: block; } @@ -258,23 +258,23 @@ display: none; } } - .cm-footer { - background: $color-bg; - border: none; + .cm-footer { + background: $color-bg; + border: none; bottom: 0; - height: 220px; - left: 0; - margin: 0; - padding:$spacing-top-bottom $spacing-left-right; - position: fixed; + height: 220px; + left: 0; + margin: 0; + padding:$spacing-top-bottom $spacing-left-right; + position: fixed; width: 100%; z-index:10; > * { - align-content:flex-end; + align-content:flex-end; display: flex; flex-wrap:wrap; height:calc(100% - 2em); - justify-content:end; + justify-content:flex-end; margin: 0; width:100%; max-width:100%; @@ -335,59 +335,59 @@ font-size: 1em; } } - .cm-toggle-all .cm-purpose-description { - display: none; + .cm-toggle-all .cm-purpose-description { + display: none; } @media screen and (min-width:576px) { - .cm-modal.cm-klaro { - max-height: calc(100vh - 150px); - bottom: 150px; - .cm-footer { - height:150px; + .cm-modal.cm-klaro { + max-height: calc(100vh - 150px); + bottom: 150px; + .cm-footer { + height:150px; } .cm-footer > * { flex-wrap:unset; height:auto; margin: .5em -10px; max-width:calc(100% + 20px); - width:calc(100% + 20px); + width:calc(100% + 20px); .cm-btn { margin: .5em 10px; } } .cm-footer .cm-powered-by{ float: right; - height:50px; + height:50px; line-height:50px } } } - @media screen and (min-width:768px) { - .cm-modal { - max-height: 100vh; - bottom: 0; - .hide { - right: 10px; - top: 5px; - } - .cm-header h1 { - font-size: 2em; - } - .cm-footer { - margin: 0; - padding: 20px 0; - position: relative; + @media screen and (min-width:768px) { + .cm-modal { + max-height: 100vh; + bottom: 0; + .hide { + right: 10px; + top: 5px; + } + .cm-header h1 { + font-size: 2em; + } + .cm-footer { + margin: 0; + padding: 20px 0; + position: relative; width: 100%; > * { - justify-content:end; - } + justify-content:flex-end; + } } - .cm-header { - padding: $spacing-top-bottom $spacing-left-right; + .cm-header { + padding: $spacing-top-bottom $spacing-left-right; } - .cm-body { - padding: $spacing-top-bottom $spacing-left-right; + .cm-body { + padding: $spacing-top-bottom $spacing-left-right; } .cm-btn { padding: 1em 1.5em; @@ -399,15 +399,15 @@ } } } - @media screen and (min-width:1024px) { + @media screen and (min-width:1024px) { .cm-modal.cm-klaro { &.cm-klaro { max-height: calc(100vh - 100px); bottom: 100px; } .cm-footer { - height:100px; - max-width: 100%; + height:100px; + max-width: 100%; padding: 20px 10px; > * { justify-content:left; @@ -418,7 +418,7 @@ .cm-btn { width:25%; min-width:240px; - } + } .cm-powered-by{ padding: 15px 10px; position:absolute; @@ -427,11 +427,11 @@ } } } - + } &.notice--center, - &.notice--center-floated { + &.notice--center-floated { @media screen and (min-width:768px) { height: 0; overflow: visible; @@ -440,58 +440,58 @@ width: 100%; z-index: 10000; } - .cookie-modal { + .cookie-modal { @media screen and (min-width:576px) {} - @media screen and (min-width:768px) { - align-items: center; - background: unset; - bottom: unset; - display: flex; - flex-direction: column; - justify-content: center; - max-height: unset; - max-width: unset; - padding: unset; - right: unset; - overflow: visible; - top: 0; + @media screen and (min-width:768px) { + align-items: center; + background: unset; + bottom: unset; + display: flex; + flex-direction: column; + justify-content: center; + max-height: unset; + max-width: unset; + padding: unset; + right: unset; + overflow: visible; + top: 0; .cm-modal, - .cm-modal.cm-klaro { - bottom: auto; - box-shadow: 1px 2px 5px rgba(0,0,0,0.2); - height: auto; - max-height: 100vh; - max-width: 768px; - overflow-y: auto; - padding: 20px; - position: relative; - top:auto; - width: 100%; - .cm-footer { - margin: 0 -20px -20px -20px; + .cm-modal.cm-klaro { + bottom: auto; + box-shadow: 1px 2px 5px rgba(0,0,0,0.2); + height: auto; + max-height: 100vh; + max-width: 768px; + overflow-y: auto; + padding: 20px; + position: relative; + top:auto; + width: 100%; + .cm-footer { + margin: 0 -20px -20px -20px; position: relative; - width: calc(100% + 40px); + width: calc(100% + 40px); } } } - @media screen and (min-width:1024px) { + @media screen and (min-width:1024px) { .cm-modal, .cm-modal.cm-klaro { bottom: auto; max-height: calc(100vh - 150px); - .cm-footer { - height:150px; - margin: 0 -20px -20px; - max-width: calc(100% + 40px); - padding-bottom:0; - width: calc(100% + 40px); + .cm-footer { + height:150px; + margin: 0 -20px -20px; + max-width: calc(100% + 40px); + padding-bottom:0; + width: calc(100% + 40px); } .cm-footer { - > * { - display: flex; + > * { + display: flex; margin: 0 auto; - max-width:100%; - position:relative; + max-width:100%; + position:relative; width: auto; } .cm-btn { @@ -503,11 +503,11 @@ } } } - // .cm-footer .cm-powered-by { - // float:unset; + // .cm-footer .cm-powered-by { + // float:unset; // height: 40px; // line-height: 40px; - // } + // } } } } @@ -587,11 +587,11 @@ // Ver 2.0.2 - gf20210922 END. } } -// Ver 2.0.1 -gf20210921 END. -// ************************** +// Ver 2.0.1 -gf20210921 END. +// ************************** -// Ver 3.0.2 - gf20220517 -// Anpassungen spez. für Safari +// Ver 3.0.2 - gf20220517 +// Anpassungen spez. für Safari .safari { .klaro.we_cookie_consent .cookie-modal .cm-modal.cm-klaro { bottom: 0; diff --git a/Resources/Public/Stylesheet/Sass/_cookie-notice.scss b/Resources/Public/Stylesheet/Sass/_cookie-notice.scss index 156b821..d71e32c 100755 --- a/Resources/Public/Stylesheet/Sass/_cookie-notice.scss +++ b/Resources/Public/Stylesheet/Sass/_cookie-notice.scss @@ -64,8 +64,8 @@ color:$color-default; } } - - + + .cm-btn { background: $cm-btn-color-bg; border-radius: $border-radius; @@ -107,7 +107,7 @@ text-align:center; width:100%; } - + @media screen and (min-width:768px) { .cn-body { .cn-ok { @@ -120,7 +120,7 @@ display: contents; max-width: 75%; width: 100%; - + } } } @@ -160,7 +160,7 @@ background: $color-bg-success; color:$color-font-success; order:-1; - } + } &.cm-btn-info { color: $color-font-edit; display:block; @@ -173,7 +173,7 @@ } } } - + &.notice--top { .cookie-notice:not(.cookie-modal-notice) { bottom:auto; @@ -183,10 +183,10 @@ } } } - + /* Center 1 und Center 2: */ - + &.notice--center, &.notice--center-floated { .cookie-notice:not(.cookie-modal-notice) .cn-body .cn-ok { @@ -207,7 +207,7 @@ max-width: calc(50% - 10px); position:absolute; right:0; - z-index: 100; + z-index: 100; } .cm-btn-danger { max-width: calc(50% - 10px); @@ -218,7 +218,7 @@ } // we_cookie_consent: - // Due to new button group "cn-buttons" the former arrangement isn't possible any longer. + // Due to new button group "cn-buttons" the former arrangement isn't possible any longer. // Nevertheless, if you like to initiate another order try this: // @media screen and (min-width:576px) { // &.notice--center-floated { @@ -291,7 +291,7 @@ } } } - + &.notice--center { .cookie-notice .cn-body .cn-ok .cm-btn.cm-btn-info, @@ -317,7 +317,7 @@ } } } - + &.notice--top .cookie-notice .cm-btn.cm-btn-success { order:2; } @@ -366,7 +366,7 @@ background: $color-none; border-radius: $border-radius; font-weight:500; - margin: calc(.5em - $border-width) 0; + margin: calc(.5em - #{$border-width}) 0; &.cm-btn-danger { background: $cm-btn-color-bg-decline; &::before { @@ -474,7 +474,7 @@ margin: 0.5em 33.333333%; } } - + } .cm-btn { &.cm-btn-info { @@ -526,7 +526,7 @@ .cn-body { .cn-ok { .cm-link { // neu seit V2.0.0 (gilt jetzt für center und center-floated gleichermaßen) - margin: 70px 0 0; + margin: 70px 0 0; max-width: 100%; } .cn-buttons {