From 2a3d513a401792578418c124bb2923e9f3eee82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Goetz?= Date: Sun, 25 Feb 2018 23:02:09 +0100 Subject: [PATCH] Create a variables file to customize theme easily, lint CSS --- crafty.config.js | 27 ++- docs/_index.md | 10 +- libs/ContentTypes/Markdown/LinkRenderer.php | 4 +- libs/Format/HTMLFile/Book.php | 8 +- templates/home.php | 20 +-- templates/layout/05_page.php | 6 +- .../Markdown/LinkRendererTest.php | 4 +- themes/common/scss/_fonts.scss | 50 +++--- themes/common/scss/_print.scss | 14 +- themes/daux/css/theme-blue.min.css | 4 +- themes/daux/css/theme-blue.min.css.map | 2 +- themes/daux/css/theme-green.min.css | 4 +- themes/daux/css/theme-green.min.css.map | 2 +- themes/daux/css/theme-navy.min.css | 4 +- themes/daux/css/theme-navy.min.css.map | 2 +- themes/daux/css/theme-red.min.css | 4 +- themes/daux/css/theme-red.min.css.map | 2 +- themes/daux/scss/_components.scss | 160 +++++++++--------- themes/daux/scss/_homepage.scss | 140 ++++++++------- themes/daux/scss/_mixins.scss | 39 +---- themes/daux/scss/_print.scss | 6 +- themes/daux/scss/_structure.scss | 73 ++++---- themes/daux/scss/_typography.scss | 136 +++++++-------- themes/daux/scss/_utilities.scss | 22 --- themes/daux/scss/_variables.scss | 61 +++++++ themes/daux/scss/theme-blue.scss | 3 +- themes/daux/scss/theme-green.scss | 3 +- themes/daux/scss/theme-navy.scss | 3 +- themes/daux/scss/theme-red.scss | 5 +- themes/daux/scss/theme.scss | 2 +- themes/daux_singlepage/css/main.min.css | 4 +- themes/daux_singlepage/css/main.min.css.map | 2 +- themes/daux_singlepage/scss/_print.scss | 2 +- themes/daux_singlepage/scss/_typography.scss | 2 +- themes/daux_singlepage/scss/main.scss | 2 +- .../scss/vendor/highlight.scss | 30 ++-- tipuesearch/tipuesearch.css | 5 - 37 files changed, 446 insertions(+), 421 deletions(-) delete mode 100644 themes/daux/scss/_utilities.scss create mode 100644 themes/daux/scss/_variables.scss diff --git a/crafty.config.js b/crafty.config.js index 22c0412..593ad6f 100644 --- a/crafty.config.js +++ b/crafty.config.js @@ -5,26 +5,43 @@ module.exports = { "@swissquote/crafty-runner-gulp" ], destination_css: "themes", + stylelint_pattern: [ + "themes/daux/scss/**/*.scss", + "themes/daux_singlepage/scss/**/*.scss", + "themes/common/scss/**/*.scss", + "!*.min.css", + "!**/vendor/**/*.scss" + ], + stylelint: { + rules: { + "swissquote/no-type-outside-scope": null + } + }, css: { "theme_blue": { source: "themes/daux/scss/theme-blue.scss", - destination: "daux/css/theme-blue.min.css" + destination: "daux/css/theme-blue.min.css", + watch: ["themes/daux/scss/**", "themes/common/scss/**"] }, "theme_green": { source: "themes/daux/scss/theme-green.scss", - destination: "daux/css/theme-green.min.css" + destination: "daux/css/theme-green.min.css", + watch: ["themes/daux/scss/**", "themes/common/scss/**"] }, "theme_navy": { source: "themes/daux/scss/theme-navy.scss", - destination: "daux/css/theme-navy.min.css" + destination: "daux/css/theme-navy.min.css", + watch: ["themes/daux/scss/**", "themes/common/scss/**"] }, "theme_red": { source: "themes/daux/scss/theme-red.scss", - destination: "daux/css/theme-red.min.css" + destination: "daux/css/theme-red.min.css", + watch: ["themes/daux/scss/**", "themes/common/scss/**"] }, "daux_singlepage": { source: "themes/daux_singlepage/scss/main.scss", - destination: "daux_singlepage/css/main.min.css" + destination: "daux_singlepage/css/main.min.css", + watch: ["themes/daux_singlepage/scss/**", "themes/common/scss/**"] } } }; diff --git a/docs/_index.md b/docs/_index.md index 3dab9bc..c42b25d 100644 --- a/docs/_index.md +++ b/docs/_index.md @@ -1,4 +1,4 @@ -

+

Daux.io is a documentation generator that uses a simple folder structure and Markdown files to create custom documentation on the fly. It helps you create great looking documentation in a developer friendly way.

@@ -8,8 +8,8 @@ --- -
-
+
+
#### For Authors @@ -24,7 +24,7 @@ * [Table of Contents](01_Features/Table_of_contents.md)
-
+
#### For Developers @@ -34,7 +34,7 @@ * Work with pages metadata
-
+
#### For Marketing diff --git a/libs/ContentTypes/Markdown/LinkRenderer.php b/libs/ContentTypes/Markdown/LinkRenderer.php index 67b82c8..9730850 100644 --- a/libs/ContentTypes/Markdown/LinkRenderer.php +++ b/libs/ContentTypes/Markdown/LinkRenderer.php @@ -99,7 +99,7 @@ class LinkRenderer extends \League\CommonMark\Inline\Renderer\LinkRenderer // Absolute urls, shouldn't either if ($this->isExternalUrl($url)) { - $element->setAttribute('class', 'external'); + $element->setAttribute('class', 'Link--external'); return $element; } @@ -117,7 +117,7 @@ class LinkRenderer extends \League\CommonMark\Inline\Renderer\LinkRenderer throw $e; } - $element->setAttribute('class', 'broken'); + $element->setAttribute('class', 'Link--broken'); } if (isset($urlAndHash[1])) { diff --git a/libs/Format/HTMLFile/Book.php b/libs/Format/HTMLFile/Book.php index 3fb4c81..5da0048 100644 --- a/libs/Format/HTMLFile/Book.php +++ b/libs/Format/HTMLFile/Book.php @@ -90,7 +90,7 @@ class Book { return '

Table of Contents

' . $this->renderNavigation($this->buildNavigation($this->tree)) . - '
 
'; + '
 
'; } protected function generateCover() @@ -98,7 +98,7 @@ class Book return "
" . "

{$this->cover['title']}

" . "

{$this->cover['subject']} by {$this->cover['author']}

" . - '
 
'; + '
 
'; } protected function generatePages() @@ -107,8 +107,8 @@ class Book foreach ($this->pages as $section => $page) { $content .= ''; $content .= '

' . $page['page']->getTitle() . '

'; - $content .= '
' . $page['content'] . '
'; - $content .= '
 
'; + $content .= '
' . $page['content'] . '
'; + $content .= '
 
'; } return $content; diff --git a/templates/home.php b/templates/home.php index 61729ce..76429e4 100755 --- a/templates/home.php +++ b/templates/home.php @@ -2,23 +2,23 @@ start('classes') ?>homepagestop() ?> -
-
+
+
insert('theme::partials/navbar_content', ['params' => $params]); ?>
-
+
' . $params['tagline'] . '' : '' ?>
-
+
' : '' ?>
-
+
' . $this->translate("View_on_github") . ''; @@ -33,14 +33,13 @@ } } ?> -
-
-
+
+
@@ -49,8 +48,8 @@
-
-
+
+
    $url) { @@ -70,5 +69,4 @@
-
diff --git a/templates/layout/05_page.php b/templates/layout/05_page.php index 69c5dcf..308c155 100755 --- a/templates/layout/05_page.php +++ b/templates/layout/05_page.php @@ -2,9 +2,9 @@