diff --git a/pages/_includes/layout/page-title.html b/pages/_includes/layout/page-title.html index 6fe9009e1..230410102 100644 --- a/pages/_includes/layout/page-title.html +++ b/pages/_includes/layout/page-title.html @@ -1,39 +1,19 @@ {% if page.page-title or layout.page-title %}
-

- {{ page.page-title | default: layout.page-title }} -

- {% if page.page-right %} -
- - {% if page.page-right == "date" %} -
-
-
- -
- - {% include ui/icon.html icon="calendar" %} - -
-
-
- - {% include ui/icon.html icon="refresh-ccw" %} - - - {% include ui/icon.html icon="filter" %} - -
- {% elsif page.page-right == "breadcrumb" %} -
    -
  1. UI Kit
    2. -
  2. Tables
    3. -
  3. Basic Tables
    4. -
- {% endif %} -
- {% endif %} +
+
+
+ Overview +
+

+ {{ page.page-title | default: layout.page-title }} +

+
+
+ {% include ui/button.html text="New view" color="secondary" icon="plus" %} + {% include ui/button.html text="Create new report" color="primary" class="ml-3" %} +
+
{% endif %} diff --git a/pages/_layouts/default.html b/pages/_layouts/default.html index 2b8ea136b..fef2577b7 100644 --- a/pages/_layouts/default.html +++ b/pages/_layouts/default.html @@ -3,13 +3,16 @@ layout: base ---
- {% comment %} + {% if page.nav-position == 'left' or page.nav-position == 'right'%} {% include layout/sidenav.html dark=page.sidenav-dark folded=page.sidenav-folded fixed=true %} - {% endcomment %} + {% endif %}
{% include layout/topnav.html dark=page.header-dark sticky=page.header-sticky %} + + {% unless page.nav-position == 'left' or page.nav-position == 'right'%} {% include layout/topmenu.html %} + {% endunless %}
{% include layout/page-title.html %} diff --git a/pages/snippets.html b/pages/snippets.html index 4825f1ece..1eb0cff78 100644 --- a/pages/snippets.html +++ b/pages/snippets.html @@ -1,7 +1,7 @@ --- title: Snippets page-title: Snippets -page-right: date +page-title-right: date ---
diff --git a/scss/_variables.scss b/scss/_variables.scss index 01036bd1a..cecc97b9b 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -42,7 +42,7 @@ $black: #000000 !default; $white: #ffffff !default; $light: #f5f7fb !default; -$dark: #495057 !default; +$dark: #354052 !default; $body-bg: $light !default; $body-color: $dark !default; diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index 9a9f4ef3c..e1108abce 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -193,7 +193,7 @@ Sidebar } .navbar-heading { - @extend .text-subheader; + @extend .subheader; margin: 0 0 .5rem; } diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 2582db5e4..51b806ada 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -1,19 +1,16 @@ .page-title-box { - display: flex; - align-items: center; min-height: 2.5rem; - margin: .5rem 0 1.5rem; + margin: .75rem 0 2rem; +} + +.page-pretitle { + @extend .subheader; } .page-title { margin: 0; font-size: $h2-font-size; font-weight: 400; - line-height: 2.5rem; color: $body-color; -} - -.page-title-options { - margin-left: auto; - color: $text-muted; + line-height: 1; } diff --git a/scss/tabler.scss b/scss/tabler.scss index a5708d1bd..592d6c9b2 100644 --- a/scss/tabler.scss +++ b/scss/tabler.scss @@ -57,7 +57,6 @@ @import "utils/background"; @import "utils/colors"; @import "utils/scroll"; -@import "utils/text"; @import "utils/sizing"; @import "utils/opacity"; @import "utils/shadow"; diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss index 3b28d4c8b..5757f14df 100644 --- a/scss/ui/_typo.scss +++ b/scss/ui/_typo.scss @@ -91,3 +91,46 @@ Selection color: #fff; background-color: lighten($primary, 8%); } + + +/** +Subheader + */ +.subheader { + font-size: $h6-font-size; + font-weight: 600; + color: $text-muted; + text-transform: uppercase; + letter-spacing: .04em; +} + +/** +Antialiasing + */ +.antialiased { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.subpixel-antialiased { + -webkit-font-smoothing: auto; + -moz-osx-font-smoothing: auto; +} + +/** +Markdown + */ +.markdown { + + > :first-child { + margin-top: 0; + } + + > :last-child { + margin-bottom: 0; + } + + table { + @extend .table, .table-bordered; + } +} diff --git a/scss/utils/_text.scss b/scss/utils/_text.scss index ee8475eaf..59eb4f098 100644 --- a/scss/utils/_text.scss +++ b/scss/utils/_text.scss @@ -1,40 +1 @@ // stylelint-disable declaration-no-important - -.text-subheader { - font-size: $h6-font-size; - font-weight: 600; - color: $text-muted; - text-transform: uppercase; - letter-spacing: .04em; -} - -/** -Antialiasing - */ -.antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.subpixel-antialiased { - -webkit-font-smoothing: auto; - -moz-osx-font-smoothing: auto; -} - -/** -Markdown - */ -.markdown { - - > :first-child { - margin-top: 0; - } - - > :last-child { - margin-bottom: 0; - } - - table { - @extend .table, .table-bordered; - } -}