From 3eb56f7e97b4553f7e569eb43951c11d7516f707 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Fri, 15 Sep 2017 20:01:43 +0300 Subject: [PATCH] fix(styles): fix styles for typography and buttons --- .../buttons/buttons.component.scss | 3 +-- .../size-buttons/size-buttons.component.scss | 2 +- .../typography/typography.component.html | 13 +++++++--- .../typography/typography.component.scss | 25 ++++++++++++++++++- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss index 29b9ff13..c0c44c88 100644 --- a/src/app/pages/ui-features/buttons/buttons.component.scss +++ b/src/app/pages/ui-features/buttons/buttons.component.scss @@ -6,7 +6,6 @@ @include nb-install-component() { /deep/ { $button-size: 50px; - $button-border-radius: 12px; .container-title { color: nb-theme(color-fg); @@ -39,7 +38,7 @@ .state-value { width: $button-size; height: $button-size; - border-radius: $button-border-radius; + border-radius: nb-theme(btn-border-radius); } .state-details { diff --git a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss index 9aa3b379..ba0c956c 100644 --- a/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss +++ b/src/app/pages/ui-features/buttons/size-buttons/size-buttons.component.scss @@ -20,7 +20,7 @@ .subheader { margin-bottom: 0.75rem; font-size: 0.875rem; - font-weight: nb-theme(font-weight-bold); + font-weight: nb-theme(font-weight-bolder); color: nb-theme(color-fg-heading); } } diff --git a/src/app/pages/ui-features/typography/typography.component.html b/src/app/pages/ui-features/typography/typography.component.html index 84bb8b4a..7971b602 100644 --- a/src/app/pages/ui-features/typography/typography.component.html +++ b/src/app/pages/ui-features/typography/typography.component.html @@ -44,7 +44,7 @@
- + Headings @@ -117,7 +117,7 @@

Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. - Separated they live in Bookmarksgrove. + They live in Bookmarksgrove.

A small river named Duden flows by their place and supplies it with the @@ -182,6 +182,13 @@ Far far away, behind the your awesomeness.

+
@@ -192,7 +199,7 @@
-
Link/Hightlight Text
+
Success Text
Far far away, behind the your awesomeness.
diff --git a/src/app/pages/ui-features/typography/typography.component.scss b/src/app/pages/ui-features/typography/typography.component.scss index 82bd8138..97a92e20 100644 --- a/src/app/pages/ui-features/typography/typography.component.scss +++ b/src/app/pages/ui-features/typography/typography.component.scss @@ -27,6 +27,21 @@ } } + .headings-card { + nb-card-body { + padding: 1rem 1.25rem; + } + .header { + padding-bottom: 0.675rem; + margin-bottom: 0.675rem; + + &:last-child { + padding-bottom: 0; + margin-bottom: 0; + } + } + } + .header { display: flex; flex-wrap: wrap; @@ -80,7 +95,7 @@ .item { display: flex; align-items: center; - margin-bottom: 1.5rem; + margin-bottom: 1.25rem; &:last-child { margin-bottom: 0; } @@ -98,4 +113,12 @@ margin-bottom: 0.25rem; } } + + .text-link { + color: nb-theme(link-color); + } + + .bg-link { + background: nb-theme(link-color); + } }