From b54ecdb4f65b1f3408e96e7b4ad9aba8180e5f28 Mon Sep 17 00:00:00 2001 From: codecalm Date: Thu, 17 Oct 2019 22:15:53 +0200 Subject: [PATCH] page title fixes --- pages/_includes/layout/page-title.html | 8 ++++++++ pages/homepage.html | 5 ++--- scss/layout/_navbar.scss | 1 - scss/layout/_page.scss | 2 ++ scss/ui/_tables.scss | 5 +---- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pages/_includes/layout/page-title.html b/pages/_includes/layout/page-title.html index c10eb04de..d5a4eeea5 100644 --- a/pages/_includes/layout/page-title.html +++ b/pages/_includes/layout/page-title.html @@ -1,21 +1,29 @@ {% if page.page-title or layout.page-title %} +
+ {% if page.page-subtitle %} +
Overview
+ {% endif %}

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

+ + {% if page.page-title-actions %} +
{% 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 %}
{% endif %} diff --git a/pages/homepage.html b/pages/homepage.html index 2c0e53cb4..dd1e20deb 100644 --- a/pages/homepage.html +++ b/pages/homepage.html @@ -1,13 +1,12 @@ --- title: Homepage page-title: Homepage +page-subtitle: Overview +page-title-actions: home --- -
- - {% include cards/project-summary.html %} {% include cards/social-traffic.html %} diff --git a/scss/layout/_navbar.scss b/scss/layout/_navbar.scss index e1108abce..6baed6ece 100644 --- a/scss/layout/_navbar.scss +++ b/scss/layout/_navbar.scss @@ -335,7 +335,6 @@ Folded navbar } .nav-icon { - font-size: px2rem(15px); opacity: 1; justify-content: center; } diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 6d16e30cc..d34e9043a 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -1,6 +1,8 @@ .page-title-box { min-height: 2.5rem; margin: .25rem 0 1.5rem; + display: flex; + align-items: center; } .page-pretitle { diff --git a/scss/ui/_tables.scss b/scss/ui/_tables.scss index 9bc3e06f6..32dd7eb6e 100644 --- a/scss/ui/_tables.scss +++ b/scss/ui/_tables.scss @@ -5,10 +5,7 @@ th { border-width: $table-border-width; background: $min-black; - text-transform: uppercase; - font-weight: 600; - font-size: 11px; - letter-spacing: .03em; + @extend .subheader; } }