Skip to content

Commit

Permalink
add variables for subnav, add video elements in content slider
Browse files Browse the repository at this point in the history
  • Loading branch information
seibtph committed Feb 10, 2020
1 parent a10aea2 commit 4abbd6b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Module/MateThemeSetup.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

class MateThemeSetup extends \BackendModule
{
const VERSION = '2.3.5';
const VERSION = '2.4.0';

protected $strTemplate = 'be_mateTheme_setup';

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/public/js/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -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("<li class='" + classList + "'>" + $(this).html() + "</li>");
});
Expand Down
9 changes: 9 additions & 0 deletions src/Resources/public/sass/_custom_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions src/Resources/public/sass/_mate_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 10 additions & 4 deletions src/Resources/public/sass/mate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 4abbd6b

Please sign in to comment.