Updated libs to use /templates and /themes/{theme}/templates

Renamed /themes/core to /themes/daux
Updated /themes/{theme}/less/theme.less to allow for bootstrap overrides
Added /themes/daux/less/theme.less to allow daux to function as theme - used daux-navy colors
Moved fonts from themes variants into /themes/daux/fonts
This commit is contained in:
David Hunt 2015-08-06 16:47:38 -04:00
parent fca2b4dc6a
commit f9d87c5c71
114 changed files with 22593 additions and 99 deletions

View File

@ -102,7 +102,7 @@ class Daux
throw new Exception('The Themes directory does not exist. Check the path again : ' . $this->themes_path); throw new Exception('The Themes directory does not exist. Check the path again : ' . $this->themes_path);
} }
$this->options['themes_path'] = $this->themes_path; $this->options['themes_path'] = $this->themes_path;
$this->options['templates'] = $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates'; $this->options['templates'] = 'templates';
} }
public function setDocumentationPath($path) public function setDocumentationPath($path)
@ -189,7 +189,7 @@ class Daux
'local_base' => $this->local_base, 'local_base' => $this->local_base,
'docs_path' => $this->docs_path, 'docs_path' => $this->docs_path,
'themes_path' => $this->themes_path, 'themes_path' => $this->themes_path,
'templates' => $this->themes_path . DIRECTORY_SEPARATOR . 'core' . DIRECTORY_SEPARATOR . 'templates' 'templates' => 'templates'
]; ];
$this->options->conservativeMerge($default); $this->options->conservativeMerge($default);

View File

@ -49,7 +49,7 @@ class DauxHelper
'fonts' => [], 'fonts' => [],
'require-jquery' => false, 'require-jquery' => false,
'bootstrap-js' => false, 'bootstrap-js' => false,
'favicon' => '<base_url>resources/img/favicon.png', 'favicon' => '<base_url>themes/daux/img/favicon.png',
'templates' => $theme_folder . DIRECTORY_SEPARATOR . 'templates', 'templates' => $theme_folder . DIRECTORY_SEPARATOR . 'templates',
]; ];

View File

@ -43,12 +43,12 @@
<!-- jQuery --> <!-- jQuery -->
<?php <?php
if ($params['theme']['require-jquery']) { if ($params['theme']['require-jquery']) {
echo '<script src="' . $base_url . 'resources/js/jquery-1.11.3.min.js' . '"></script>'; echo '<script src="' . $base_url . 'themes/daux/js/jquery-1.11.3.min.js' . '"></script>';
} }
?> ?>
<!-- hightlight.js --> <!-- hightlight.js -->
<script src="<?= $base_url; ?>resources/js/highlight.min.js"></script> <script src="<?= $base_url; ?>themes/daux/js/highlight.min.js"></script>
<script>hljs.initHighlightingOnLoad();</script> <script>hljs.initHighlightingOnLoad();</script>
<!-- JS --> <!-- JS -->
@ -56,6 +56,6 @@
echo '<script src="' . $js . '"></script>'; echo '<script src="' . $js . '"></script>';
} ?> } ?>
<script src="<?= $base_url; ?>resources/js/daux.js"></script> <script src="<?= $base_url; ?>themes/daux/js/daux.js"></script>
</body> </body>
</html> </html>

View File

@ -1,6 +1,6 @@
{ {
"favicon": "<theme_url>img/favicon-blue.png", "favicon": "<theme_url>img/favicon-blue.png",
"css": ["<theme_url>css/theme.min.css"], "css": ["<theme_url>css/theme.css"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"], "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [], "js": [],
"require-jquery": true, "require-jquery": true,

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,4 @@
//Daux.io Blue //Daux.io Blue
@sidebar-background: #f7f7f7; @sidebar-background: #f7f7f7;
@sidebar-hover: #c5c5cb; @sidebar-hover: #c5c5cb;
@ -10,4 +11,9 @@
@syntax-number: #2f9b92; @syntax-number: #2f9b92;
@syntax-label: #840d7a; @syntax-label: #840d7a;
@import "../../core/less/daux-base.less"; // Bootstrap
@import "../../daux/less/bootstrap/bootstrap.less";
@icon-font-path: "../../daux/fonts/";
// Daux.io Base
@import "../../daux/less/theme-base.less";

View File

@ -1,6 +1,6 @@
{ {
"favicon": "<theme_url>img/favicon-green.png", "favicon": "<theme_url>img/favicon-green.png",
"css": ["<theme_url>css/theme.min.css"], "css": ["<theme_url>css/theme.css"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"], "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [], "js": [],
"require-jquery": true, "require-jquery": true,

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,4 @@
//Daux.io Green //Daux.io Green
@sidebar-background: #f5f5f6; @sidebar-background: #f5f5f6;
@sidebar-hover: #a0d55d; @sidebar-hover: #a0d55d;
@ -10,4 +11,9 @@
@syntax-number: #097c4e; @syntax-number: #097c4e;
@syntax-label: #022e99; @syntax-label: #022e99;
@import "../../core/less/daux-base.less"; // Bootstrap
@import "../../daux/less/bootstrap/bootstrap.less";
@icon-font-path: "../../daux/fonts/";
// Daux.io Base
@import "../../daux/less/theme-base.less";

View File

@ -1,6 +1,6 @@
{ {
"favicon": "<theme_url>img/favicon-navy.png", "favicon": "<theme_url>img/favicon-navy.png",
"css": ["<theme_url>css/theme.min.css"], "css": ["<theme_url>css/theme.css"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"], "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [], "js": [],
"require-jquery": true, "require-jquery": true,

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,4 @@
//Daux.io Navy //Daux.io Navy
@sidebar-hover: #c5c5cb; @sidebar-hover: #c5c5cb;
@lines: #e7e7e9; @lines: #e7e7e9;
@ -10,4 +11,9 @@
@syntax-number: #09559b; @syntax-number: #09559b;
@syntax-label: #001775; @syntax-label: #001775;
@import "../../core/less/daux-base.less"; // Bootstrap
@import "../../daux/less/bootstrap/bootstrap.less";
@icon-font-path: "../../daux/fonts/";
// Daux.io Base
@import "../../daux/less/theme-base.less";

View File

@ -1,6 +1,6 @@
{ {
"favicon": "<theme_url>img/favicon-red.png", "favicon": "<theme_url>img/favicon-red.png",
"css": ["<theme_url>css/theme.min.css"], "css": ["<theme_url>css/theme.css"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"], "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [], "js": [],
"require-jquery": true, "require-jquery": true,

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,3 +1,4 @@
// Daux.io Red // Daux.io Red
@sidebar-hover: #eeeeee; @sidebar-hover: #eeeeee;
@lines: #eeeeee; @lines: #eeeeee;
@ -10,4 +11,9 @@
@syntax-number: #9b2f7d; @syntax-number: #9b2f7d;
@syntax-label: #a31621; @syntax-label: #a31621;
@import "../../core/less/daux-base.less"; // Bootstrap
@import "../../daux/less/bootstrap/bootstrap.less";
@icon-font-path: "../../daux/fonts/";
// Daux.io Base
@import "../../daux/less/theme-base.less";

View File

@ -1,6 +1,6 @@
{ {
"favicon": "<theme_url>img/favicon-blue.png", "favicon": "<theme_url>img/favicon.png",
"css": ["<theme_url>css/theme.min.css"], "css": ["<theme_url>css/theme.css"],
"fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"], "fonts": ["//fonts.googleapis.com/css?family=Roboto+Slab:400,100,300,700&subset=latin,cyrillic-ext,cyrillic"],
"js": [], "js": [],
"require-jquery": true, "require-jquery": true,

4498
themes/daux/css/theme.css Normal file

File diff suppressed because it is too large Load Diff

View File

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Some files were not shown because too many files have changed in this diff Show More