Skip to content

Commit

Permalink
Showing 13 changed files with 103 additions and 7,261 deletions.
25 changes: 15 additions & 10 deletions src/Module/MateThemeSetup.php
Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ protected function compile()
switch (\Input::get('act')) {
case 'syncFolder':
$path = TL_ROOT . '/web/bundles/matetheme';
if(!file_exists("files/mate")) {
new \Folder("files/mate");
if(!file_exists("files/mate1")) {
new \Folder("files/mate1");
}
$this->getFiles($path);
$this->Template->message = true;
@@ -28,19 +28,24 @@ protected function getFiles($path) {
foreach (scan($path) as $dir) {
if(!is_dir($path."/".$dir)) {
$pos = strpos($path,"matetheme");
$filesFolder = "files/mate".str_replace("matetheme","",substr($path,$pos))."/".$dir;
if(!file_exists(TL_ROOT."/".$filesFolder)) {
$objFile = new \File("web/bundles/".substr($path,$pos)."/".$dir, true);
$objFile->copyTo($filesFolder);
$filesFolder = "files/mate1".str_replace("matetheme","",substr($path,$pos))."/".$dir;

if($dir != "_mate_variables.scss" && $dir != "backend.css" && $dir != "mate.scss" && $dir != "materialize.scss") {
if(!file_exists(TL_ROOT."/".$filesFolder)) {
$objFile = new \File("web/bundles/".substr($path,$pos)."/".$dir, true);
$objFile->copyTo($filesFolder);
}
}
} else {
$folder = $path."/".$dir;
$pos = strpos($path,"matetheme");
$filesFolder = "files/mate".str_replace("matetheme","",substr($path,$pos))."/".$dir;
if(!file_exists($filesFolder)) {
new \Folder($filesFolder);
$filesFolder = "files/mate1".str_replace("matetheme","",substr($path,$pos))."/".$dir;
if($dir != "fonts" && $dir != "js" && $dir != "components") {
if(!file_exists($filesFolder)) {
new \Folder($filesFolder);
}
$this->getFiles($folder);
}
$this->getFiles($folder);
}
}
}
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
<link rel="stylesheet" type="text/css" media="all" href="<?php
// add stylesheets
$combiner = new Combiner();
$combiner->add('files/mate/sass/mate.scss');
$combiner->add('bundles/matetheme/sass/mate.scss');
echo $combiner->getCombinedFile(); ?>">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">

@@ -42,7 +42,7 @@
$combiner = new Combiner();
$combiner->add('bundles/matetheme/js/materialize/materialize.min.js');
$combiner->add('bundles/matetheme/js/headroom/headroom.min.js');
$combiner->add('files/mate/js/theme.js');
$combiner->add('bundles/matetheme/js/theme.js');
echo $combiner->getCombinedFile();
?>"></script>
<?php $this->endblock(); ?>
Binary file modified src/Resources/public/img/meissen/slider/goetterfelsen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/Resources/public/img/meissen/slider/meissen-juchhoeh.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions src/Resources/public/sass/_custom_variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/****
**** mate theme files / custom_variables
**** uncomment to override materialize variables
****
*/

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

//$mateColor1: #b6cf92 !default;
//$mateColor2: #86af49 !default;
//$mateColor3: #476a30 !default;
//$mateColor4: #58774e !default;
//$mateColor5: #5f5c4d !default;
//$mateColor6: #abbdb1 !default;
//$mateColorWhite: #fff !default;
//$mateColorBlack: #000 !default;

/*
* colors
*/

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

/*
* calculated colors
*/

//$primary-color-light: lighten($primary-color, 15%) !default;
//$primary-color-dark: darken($primary-color, 15%) !default;

/*
* mate theme specific variables
*/

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

/* Header Navigation */
//$navbar-bg-color: $mateColorWhite !default;
//$navbar-color: $mateColorBlack !default;
//$navbar-active-color: $mateColor2 !default;
//$navbar-dropdown-hover-bg-color: $mateColor1 !default;
//$navbar-dropdown-hover-color: $mateColorWhite !default;
//$navbar-dropdown-bg: $mateColorWhite !default;
//$navbar-dropdown-color: $mateColorBlack !default;
//$navbar-stuck-bg-color: rgba(134,175,73,0.9) !default;
//$navbar-stuck-color: $mateColorWhite !default;
//$navbar-stuck-active-color: $mateColor3 !default;
//$navbar-stuck-dropdown-hover-bg-color: rgba(255,255,255,0.5) !default;
//$navbar-stuck-dropdown-hover-color: $mateColorBlack !default;
//$navbar-stuck-dropdown-color: $mateColorWhite !default;
//$navbar-stuck-dropdown-bg: $navbar-stuck-bg-color !default;

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

/* Footer */
//$footer-text-color: $mateColorWhite !default;
//$footer-headline-border-color: $footer-text-color !default;
//$footer-secondary-bg-color: $secondary-color !default;
68 changes: 0 additions & 68 deletions src/Resources/public/sass/_custom_variables.scss.example

This file was deleted.

File renamed without changes.
8 changes: 4 additions & 4 deletions src/Resources/public/sass/mate.scss
Original file line number Diff line number Diff line change
@@ -2,17 +2,17 @@

@font-face {
font-family: "Lato Light";
src: url("/files/mate/fonts/Lato/Lato-Light.ttf");
src: url("../fonts/Lato/Lato-Light.ttf");
}

@font-face {
font-family: "Lato Regular";
src: url("/files/mate/fonts/Lato/Lato-Regular.ttf");
src: url("../fonts/Lato/Lato-Regular.ttf");
}

@font-face {
font-family: "Old Standard";
src: url("/files/mate/fonts/Old_Standard_TT/OldStandard-Regular.ttf");
src: url("../fonts/Old_Standard_TT/OldStandard-Regular.ttf");
}

::-moz-selection { background: $mateColor2; color: #fff; }
@@ -3397,4 +3397,4 @@ textarea {
}
}

@import 'custom';
@import '../../../../../../../files/mate/sass/custom';
2 changes: 1 addition & 1 deletion src/Resources/public/sass/materialize.scss
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
@import "components/color";

// Variables;
@import "custom_variables";
@import "../../../../../../../files/mate/sass/_custom_variables";
@import "mate_variables";
@import "components/variables";

7,189 changes: 13 additions & 7,176 deletions src/templates/mate/mate_theme_contao_demo.sql

Large diffs are not rendered by default.

0 comments on commit 9cbfe31

Please sign in to comment.