From e2d8fe08b8b12e32b5a54d3d496a08ae5ff37dec Mon Sep 17 00:00:00 2001 From: codecalm Date: Thu, 17 Oct 2019 21:59:39 +0200 Subject: [PATCH] buttons wariants --- pages/_includes/layout/page-title.html | 4 +++- scss/_variables.scss | 2 +- scss/layout/_page.scss | 2 +- scss/ui/_buttons.scss | 7 +------ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pages/_includes/layout/page-title.html b/pages/_includes/layout/page-title.html index 230410102..c10eb04de 100644 --- a/pages/_includes/layout/page-title.html +++ b/pages/_includes/layout/page-title.html @@ -11,7 +11,9 @@
- {% include ui/button.html text="New view" color="secondary" icon="plus" %} + + {% include ui/button.html text="New view" color="secondary" icon="plus" %} + {% include ui/button.html text="Create new report" color="primary" class="ml-3" %}
diff --git a/scss/_variables.scss b/scss/_variables.scss index cecc97b9b..c0044ba45 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -219,7 +219,7 @@ $input-height-sm: null !default; $input-height-lg: null !default; $btn-padding-x: 1rem !default; -$btn-font-weight: 600 !default; +$btn-font-weight: 500 !default; $btn-border-radius: 3px !default; //cards diff --git a/scss/layout/_page.scss b/scss/layout/_page.scss index 51b806ada..6d16e30cc 100644 --- a/scss/layout/_page.scss +++ b/scss/layout/_page.scss @@ -1,6 +1,6 @@ .page-title-box { min-height: 2.5rem; - margin: .75rem 0 2rem; + margin: .25rem 0 1.5rem; } .page-pretitle { diff --git a/scss/ui/_buttons.scss b/scss/ui/_buttons.scss index dbf4e41d8..8a9218ecb 100644 --- a/scss/ui/_buttons.scss +++ b/scss/ui/_buttons.scss @@ -56,12 +56,7 @@ } .btn-secondary { - @include button-variant(transparent, $border-color, #fff, $border-color); - color: $text-muted; - - &:hover { - color: $text-muted; - } + @include button-variant(#fff, $border-color, $text-muted); } .btn-square {