diff --git a/_config.yml b/_config.yml index f12f43b8a..4a11e7340 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,7 @@ mapbox_key: pk.eyJ1IjoiY29kZWNhbG0iLCJhIjoiSzRiOVJvQSJ9.BUVkTT6IYs83xSUs4H7bjQ debug: false -dark-theme: false +layout-dark: false plugins: - jekyll-random @@ -50,10 +50,10 @@ toc: collections: docs: output: true - changelog: - output: false - components: - output: true +# changelog: +# output: false +# components: +# output: true defaults: - scope: diff --git a/pages/_data/menu-sample.yml b/pages/_data/menu-sample.yml new file mode 100644 index 000000000..a33af815d --- /dev/null +++ b/pages/_data/menu-sample.yml @@ -0,0 +1,32 @@ +first: + url: '#' + icon: star + title: First + active: true + +second: + url: '#' + icon: star + badge: 2 + title: Second + +third: + url: '#' + icon: star + title: Third + children: + first: + url: '#' + title: First + second: + url: '#' + title: Second + third: + url: '#' + title: Third + +disabled: + url: '#' + icon: star + disabled: true + title: Disabled diff --git a/pages/_data/menu.yml b/pages/_data/menu.yml index 25683dc1a..b7c8c8c64 100644 --- a/pages/_data/menu.yml +++ b/pages/_data/menu.yml @@ -3,13 +3,9 @@ home: title: Home icon: home -forms: - url: form-elements.html - title: Form elements - icon: checkbox - base: - title: Base + title: Interface + title-long: User Interface icon: package columns: 2 children: @@ -37,6 +33,9 @@ base: maps-vector: url: maps-vector.html title: Vector maps + navigation: + url: navigation.html + title: Navigation charts: url: charts.html title: Charts @@ -97,6 +96,12 @@ base: url: maintenance.html title: Maintenance page +forms: + url: form-elements.html + title: Forms + title-long: Form elements + icon: checkbox + extra: title: Extra icon: star @@ -128,6 +133,42 @@ extra: music: title: Music url: music.html + +layout: + icon: layout-2 + title: Layout + children: + horizontal: + url: layout-horizontal.html + title: Horizontal + vertical: + url: layout-vertical.html + title: Vertical + vertical-right: + url: layout-vertical-right.html + title: Right vertical + condensed: + url: layout-condensed.html + title: Condensed + condensed-dark: + url: layout-condensed-dark.html + title: Condensed dark + combo: + url: layout-combo.html + title: Combined + navbar-dark: + url: layout-navbar-dark.html + title: Navbar dark + dark-mode: + url: layout-dark.html + title: Dark mode + fluid: + url: layout-fluid.html + title: Fluid + fluid-vertical: + url: layout-fluid-vertical.html + title: Fluid vertical + docs: title: Docs icon: file-text diff --git a/pages/_includes/layout/content.html b/pages/_includes/layout/content.html new file mode 100644 index 000000000..e06b75b99 --- /dev/null +++ b/pages/_includes/layout/content.html @@ -0,0 +1,13 @@ +{% assign page-header = page.page-header | default: layout.page-header %} + +
+
+ {% if page-header %} + {% include layout/page-header.html title=page-header description=page.page-header-description actions=page.page-header-actions pretitle=page.page-header-pretitle %} + {% endif %} + + {{ content }} +
+ + {% include layout/footer.html %} +
\ No newline at end of file diff --git a/pages/_includes/layout/navbar-logo.html b/pages/_includes/layout/navbar-logo.html index c1bb8a579..306e9b605 100644 --- a/pages/_includes/layout/navbar-logo.html +++ b/pages/_includes/layout/navbar-logo.html @@ -1,6 +1,16 @@ {% assign prefix = include.prefix | default: 'navbar' %} +{% assign breakpoint = include.breakpoint | default: 'lg' %} - - + {% unless include.hide-logo %} + {% if include.small-logo %} + {{ site.title }} + {% else %} + {{ site.title }} + {% endif %} + {% endunless %} + + {% if include.show-title %} + Dashboard + {% endif %} diff --git a/pages/_includes/layout/navbar-menu.html b/pages/_includes/layout/navbar-menu.html index a42acbebc..d529faf73 100644 --- a/pages/_includes/layout/navbar-menu.html +++ b/pages/_includes/layout/navbar-menu.html @@ -1,17 +1,35 @@ {% assign current-page = page.menu | default: layout.menu | split: '.' %} +{% assign hide-icons = include.hide-icons %} -