From 4abbd6b0b8d0ce6cab6bcee5971bc89ba257fcb5 Mon Sep 17 00:00:00 2001 From: Philipp Seibt Date: Mon, 10 Feb 2020 13:31:42 +0100 Subject: [PATCH] add variables for subnav, add video elements in content slider --- src/Module/MateThemeSetup.php | 2 +- src/Resources/public/js/theme.js | 2 +- src/Resources/public/sass/_custom_variables.scss | 9 +++++++++ src/Resources/public/sass/_mate_variables.scss | 8 ++++++++ src/Resources/public/sass/mate.scss | 14 ++++++++++---- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/Module/MateThemeSetup.php b/src/Module/MateThemeSetup.php index 24f9593..1d8fb8b 100644 --- a/src/Module/MateThemeSetup.php +++ b/src/Module/MateThemeSetup.php @@ -4,7 +4,7 @@ class MateThemeSetup extends \BackendModule { - const VERSION = '2.3.5'; + const VERSION = '2.4.0'; protected $strTemplate = 'be_mateTheme_setup'; diff --git a/src/Resources/public/js/theme.js b/src/Resources/public/js/theme.js index 24863af..be1a172 100644 --- a/src/Resources/public/js/theme.js +++ b/src/Resources/public/js/theme.js @@ -46,7 +46,7 @@ jQuery.noConflict(); jQuery(document).ready(function($){ /* ===================== * * Content Slider * * ===================== */ - $( ".slides .ce_text, .slides .ce_image, .slides .ce_mateTextBackgroundElement" ).each(function( index ) { + $( ".slides .ce_text, .slides .ce_image, .slides .ce_mateTextBackgroundElement, .slides .ce_youtube, .slides .ce_player" ).each(function( index ) { var classList = $(this).attr('class'); $(this).replaceWith("
  • " + $(this).html() + "
  • "); }); diff --git a/src/Resources/public/sass/_custom_variables.scss b/src/Resources/public/sass/_custom_variables.scss index 58b1e0b..00b77af 100644 --- a/src/Resources/public/sass/_custom_variables.scss +++ b/src/Resources/public/sass/_custom_variables.scss @@ -132,6 +132,15 @@ //$slider-navigation-hover-headline-color: $secondary-text-color; //$slider-navigation-border-color: $mateColor1; +/* Subnav Navigation */ + +//$subnav-background: $mateColor2; +//$subnav-color: $secondary-text-color; +//$subnav-hover-background: $mateColor3; +//$subnav-hover-color: #fff; +//$subnav-active-background: $mateColor3; +//$subnav-active-color: #fff; + /* Tables */ //$table-odd-background: $mateColorWhite; //$table-even-background: $mateColorGreyLight; diff --git a/src/Resources/public/sass/_mate_variables.scss b/src/Resources/public/sass/_mate_variables.scss index 0425350..03ad77e 100644 --- a/src/Resources/public/sass/_mate_variables.scss +++ b/src/Resources/public/sass/_mate_variables.scss @@ -104,6 +104,14 @@ $navbar-mobile-color: $mateColorWhite; $navbar-mobile-dropdown-background: $mateColor1; $navbar-mobile-dropdown-color: $mateColorWhite; +/* Subnav Navigation */ +$subnav-background: $mateColor2; +$subnav-color: $secondary-text-color; +$subnav-hover-background: $mateColor3; +$subnav-hover-color: #fff; +$subnav-active-background: $mateColor3; +$subnav-active-color: #fff; + /* News Slider */ $slider-background: $mateColor2; $slider-subheadline-color: $secondary-text-color; diff --git a/src/Resources/public/sass/mate.scss b/src/Resources/public/sass/mate.scss index 36f9c9e..984a105 100644 --- a/src/Resources/public/sass/mate.scss +++ b/src/Resources/public/sass/mate.scss @@ -1062,14 +1062,20 @@ nav { display: block; > a, > span { - background: $mateColor2; + background: $subnav-background; padding: 10px 15px; - color: $secondary-text-color; + color: $subnav-color; margin: 2px 0; display: block; - &:hover, &.active { - background: $mateColor3; + &:hover { + background: $subnav-hover-background; + color: $subnav-hover-color; + } + + &.active { + background: $subnav-active-background; + color: $subnav-active-color; } }