Skip to content

Commit

Permalink
update css/js and add custom variables for black, blue and yellow layout
Browse files Browse the repository at this point in the history
  • Loading branch information
seibtph authored and Philipp Seibt committed Nov 5, 2018
1 parent 095ba69 commit 57972f9
Show file tree
Hide file tree
Showing 8 changed files with 707 additions and 229 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 = '1.3.3';
const VERSION = '1.3.4';

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 @@ -168,7 +168,7 @@ $(document).ready(function(){
/* =================== *
* Smooth Scroll *
* =================== */
$('a[href*=\\#]').on('click', function(event){
$('a[href*=\\#]:not(.modal-trigger)').on('click', function(event){
var href = $(this).attr('href');
href = href.substr(0,href.indexOf('#'));
href = href.replace('./','');
Expand Down
97 changes: 65 additions & 32 deletions src/Resources/public/sass/_custom_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
* use _custom_variables.scss for update safe overwrites
*/

//@import '_custom_variables_black.scss';
//@import '_custom_variables_blue.scss';
//@import '_custom_variables_yellow.scss';

//$font1: 'Lato Light';
//$font2: 'Old Standard';
//$font3: 'Lato Regular';
Expand All @@ -24,7 +28,6 @@
//$mateColor2: #86af49;
//$mateColor3: #476a30;
//$mateColor4: #58774e;
//$mateColor5: #5f5c4d;
//$mateColor6: #abbdb1;
//$mateColorWhite: #fff;
//$mateColorBlack: #000;
Expand All @@ -35,49 +38,47 @@
*/

//$primary-color: $mateColor2;
//$primary-text-color: $mateColor4;
//$secondary-color: $mateColor3;
//$navbar-font-color: $secondary-color;

/*
* calculated colors
*/

//$primary-color-light: lighten($primary-color, 15%);
//$primary-color-dark: darken($primary-color, 15%);
//$primary-text-color: $mateColorBlack;
//$secondary-text-color: $mateColorWhite;

/*
* mate theme specific variables
*/

/*
* header image headline
*/
/* Boxen */
//$boxes-background: $mateColorWhite;
//$boxes-text-color: $primary-text-color;

/* header image headline */
//$headerHeadlineBackground: rgba(134, 175, 73, 0.84);
//$headerHeadlineColor: #fff;
//$headerHeadlineColor: $secondary-text-color;

/* Links */
//$primary-link-font-color: $mateColor2;
//$primary-link-hover-font-color: $mateColor3;

/* Header Navigation */
/* Header - Navigation */
//$header-top-color: $secondary-text-color;

//$navbar-bg-color: $mateColorWhite;
//$navbar-color: $mateColorBlack;
//$navbar-color: $primary-text-color;
//$navbar-active-color: $mateColor2;
//$navbar-dropdown-hover-bg-color: $mateColor1;
//$navbar-dropdown-hover-color: $mateColorWhite;
//$navbar-dropdown-hover-color: $secondary-text-color;
//$navbar-dropdown-bg: $mateColorWhite;
//$navbar-dropdown-color: $mateColorBlack;
//$navbar-dropdown-color: $primary-text-color;
//$navbar-stuck-bg-color: rgba(134,175,73,0.9);
//$navbar-stuck-color: $mateColorWhite;
//$navbar-stuck-color: $secondary-text-color;
//$navbar-stuck-active-color: $mateColor3;
//$navbar-stuck-dropdown-hover-bg-color: rgba(255,255,255,0.5);
//$navbar-stuck-dropdown-hover-color: $mateColorBlack;
//$navbar-stuck-dropdown-color: $mateColorWhite;
//$navbar-stuck-dropdown-hover-color: $primary-text-color;
//$navbar-stuck-dropdown-color: $secondary-text-color;
//$navbar-stuck-dropdown-bg: $navbar-stuck-bg-color;

/* Buttons */
//$button-flat-color: $mateColorWhite;
//$button-flat-color: $secondary-text-color;
//$button-floating-background: $mateColor2;
//$button-floating-background-hover: $mateColor3;

Expand All @@ -86,34 +87,66 @@
//$download-faqlist-color-odd: $mateColor2;
//$download-faqlist-color-odd-hover: $mateColor3;

//$download-faqlist-background-even: #fff;
//$download-faqlist-background-even: $mateColorWhite;
//$download-faqlist-color-even: $mateColor2;
//$download-faqlist-color-even-hover: $mateColor3;

/* Events */
//$calendar-background: $mateColorWhite;
//$calendar-border-color: $mateColorWhite;
//$calendar-text-color: $mateColor2;

/* Footer */
//$footer-text-color: $mateColorWhite;
//$footer-text-color: $secondary-text-color;
//$footer-headline-border-color: $footer-text-color;
//$footer-secondary-bg-color: $secondary-color;
//$footer-news-events-time-color: $mateColor3;

//$footer-primary-link-color: $secondary-text-color;
//$footer-primary-link-color-hover: $primary-link-hover-font-color;
//$footer-secondary-link-color: $secondary-text-color;
//$footer-secondary-link-color-hover: $secondary-text-color;

/* News Slider */
//$slider-background: $mateColor2;
//$slider-subheadline-color: #fff;
//$slider-headline-color: #fff;
//$slider-teaser-color: #fff;
//$slider-subheadline-color: $secondary-text-color;
//$slider-headline-color: $secondary-text-color;
//$slider-teaser-color: $secondary-text-color;

//$slider-button-background: $mateColor1;
//$slider-button-color: $mateColor3;
//$slider-button-color-hover: #fff;
//$slider-button-color-hover: $secondary-text-color;
//$slider-button-background-hover: $mateColor3;

//$slider-arrows-background: $mateColor4;
//$slider-arrows-border-color: $mateColor2;
//$slider-arrows-color: $mateColor2;
//$slider-navigation-background: #fff;

//$slider-navigation-background: $mateColorWhite;
//$slider-navigation-subheadline-color: $mateColor2;
//$slider-navigation-headline-color: $mateColorBlack;
//$slider-navigation-headline-color: $primary-text-color;
//$slider-navigation-active-background: $mateColor1;
//$slider-navigation-active-subheadline-color: #fff;
//$slider-navigation-active-subheadline-color: $secondary-text-color;
//$slider-navigation-active-headline-color: $mateColor3;
//$slider-navigation-hover-background: $mateColor1;
//$slider-navigation-hover-subheadline-color: #fff;
//$slider-navigation-hover-headline-color: #fff;
//$slider-navigation-hover-subheadline-color: $secondary-text-color;
//$slider-navigation-hover-headline-color: $secondary-text-color;
//$slider-navigation-border-color: $mateColor1;

/* Content Box */
//$contentbox-first-background: rgba(255,255,255,0.95);
//$contentbox-first-color: $boxes-text-color;
//$contentbox-second-background: rgba(255, 255, 255, 0.65);
//$contentbox-second-color: $boxes-text-color;

/* Tables */
//$table-odd-background: $mateColorWhite;
//$table-even-background: #f5f5f5;
//$table-border-color: #e6e6e6;

/* Accordion */
//$accordion-headline-background: $mateColor2;
//$accordion-headline-color: $secondary-text-color;
//$accordion-content-background: $mateColorWhite;
//$accordion-content-color: $primary-text-color;
//$accordion-border-color: $mateColorWhite;
127 changes: 127 additions & 0 deletions src/Resources/public/sass/_custom_variables_black.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
/****
**** mate theme files / mate_variables
**** overrides materialize variables
****
*/

/*
* please do not edit this file.
*
* use _custom_variables.scss for update safe overwrites
*/

$font1: 'Lato Light';
$font2: 'Old Standard';
$font3: 'Lato Regular';

$mateColor1: #AB9C89;
$mateColor2: #C7A47A;
$mateColor3: #7F684F;
$mateColor4: #211F20;
$mateColor6: #323232;
$mateColorWhite: #fff;
$mateColorBlack: #211F20;
$pageBackground: $mateColorBlack;

/*
* colors
*/

$primary-color: $mateColor2;
$secondary-color: $mateColor3;
$text-color: $mateColorWhite;

/*
* mate theme specific variables
*/

/* Boxen */
$boxes-background: #080808;
$boxes-text-color: $mateColorWhite;

/* header image headline */
$headerHeadlineBackground: rgba(199, 164, 122, 0.8);
$headerHeadlineColor: #fff;

/* Links */
$primary-link-font-color: $mateColor2;
$primary-link-hover-font-color: $mateColor3;

/* Header Navigation */
$navbar-bg-color: $mateColorWhite;
$navbar-color: $mateColorBlack;
$navbar-active-color: $mateColor2;
$navbar-dropdown-hover-bg-color: $mateColor1;
$navbar-dropdown-hover-color: $mateColorWhite;
$navbar-dropdown-bg: $mateColorWhite;
$navbar-dropdown-color: $mateColorBlack;
$navbar-stuck-bg-color: rgba(199, 164, 122, 0.8);
$navbar-stuck-color: $mateColorWhite;
$navbar-stuck-active-color: $mateColor3;
$navbar-stuck-dropdown-hover-bg-color: rgba(255,255,255,0.5);
$navbar-stuck-dropdown-hover-color: $mateColorBlack;
$navbar-stuck-dropdown-color: $mateColorWhite;
$navbar-stuck-dropdown-bg: $navbar-stuck-bg-color;

/* Buttons */
$button-flat-color: $mateColorWhite;
$button-floating-background: $mateColor2;
$button-floating-background-hover: $mateColor3;

/* Download and FAQ Elements */
$download-faqlist-background-odd: $boxes-background;
$download-faqlist-color-odd: $mateColorWhite;
$download-faqlist-color-odd-hover: #f2f2f2;

$download-faqlist-background-even: $mateColor6;
$download-faqlist-color-even: $mateColorWhite;
$download-faqlist-color-even-hover: #f2f2f2;

/* Footer */
$footer-text-color: $mateColorWhite;
$footer-headline-border-color: $footer-text-color;
$footer-secondary-bg-color: $secondary-color;

/* News Slider */
$slider-background: $mateColor2;
$slider-subheadline-color: #fff;
$slider-headline-color: #fff;
$slider-teaser-color: #fff;

$slider-button-background: $mateColor1;
$slider-button-color: $mateColor3;
$slider-button-color-hover: #fff;
$slider-button-background-hover: $mateColor3;

$slider-arrows-background: $mateColor4;
$slider-arrows-border-color: $mateColor2;
$slider-arrows-color: #fff;

$slider-navigation-background: $mateColor2;
$slider-navigation-subheadline-color: $mateColorWhite;
$slider-navigation-headline-color: $mateColorWhite;
$slider-navigation-active-background: $mateColor1;
$slider-navigation-active-subheadline-color: #fff;
$slider-navigation-active-headline-color: #fff;
$slider-navigation-hover-background: $mateColor1;
$slider-navigation-hover-subheadline-color: #fff;
$slider-navigation-hover-headline-color: #fff;
$slider-navigation-border-color: $mateColor1;

/* Content Box */
$contentbox-first-background: $boxes-background;
$contentbox-first-color: $boxes-text-color;
$contentbox-second-background: $mateColor6;
$contentbox-second-color: $boxes-text-color;

/* Tables */
$table-odd-background: $boxes-background;
$table-even-background: $mateColor6;
$table-border-color: #3c3c3c;

/* Accordion */
$accordion-headline-background: $mateColor2;
$accordion-headline-color: $mateColorWhite;
$accordion-content-background: $boxes-background;
$accordion-content-color: $mateColorWhite;
$accordion-border-color: $boxes-background;
Loading

0 comments on commit 57972f9

Please sign in to comment.