From 24563cba2494f7766c605b2340ad520e95c5e660 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Sun, 10 Jun 2018 13:46:25 +0300 Subject: [PATCH 1/7] feat(theme): add new corporate theme --- .../services/js-themes-registry.service.ts | 2 + .../theme/services/js-themes-registry.spec.ts | 12 +++ .../services/js-themes/corporate.theme.ts | 10 +++ src/framework/theme/services/theme.spec.ts | 4 +- src/framework/theme/styles/_themes.scss | 1 + .../global/bootstrap/_hero-buttons.scss | 25 ++++-- .../theme/styles/prebuilt/corporate.scss | 7 ++ .../theme/styles/themes/_corporate.scss | 80 +++++++++++++++++++ .../theme/styles/themes/_cosmic.scss | 1 + .../theme/styles/themes/_default.scss | 8 ++ 10 files changed, 142 insertions(+), 8 deletions(-) create mode 100644 src/framework/theme/services/js-themes/corporate.theme.ts create mode 100644 src/framework/theme/styles/prebuilt/corporate.scss create mode 100644 src/framework/theme/styles/themes/_corporate.scss diff --git a/src/framework/theme/services/js-themes-registry.service.ts b/src/framework/theme/services/js-themes-registry.service.ts index 4e3ed4792b..9f62a3f040 100644 --- a/src/framework/theme/services/js-themes-registry.service.ts +++ b/src/framework/theme/services/js-themes-registry.service.ts @@ -10,11 +10,13 @@ import { Inject, Injectable } from '@angular/core'; import { NbJSThemeOptions } from './js-themes/theme.options'; import { DEFAULT_THEME } from './js-themes/default.theme'; import { COSMIC_THEME } from './js-themes/cosmic.theme'; +import { CORPORATE_THEME } from './js-themes/corporate.theme'; import { NB_BUILT_IN_JS_THEMES, NB_JS_THEMES } from '../theme.options'; export const BUILT_IN_THEMES: NbJSThemeOptions[] = [ DEFAULT_THEME, COSMIC_THEME, + CORPORATE_THEME, ]; /** diff --git a/src/framework/theme/services/js-themes-registry.spec.ts b/src/framework/theme/services/js-themes-registry.spec.ts index ca4327d815..6f6574b1be 100644 --- a/src/framework/theme/services/js-themes-registry.spec.ts +++ b/src/framework/theme/services/js-themes-registry.spec.ts @@ -28,6 +28,13 @@ describe('js-themes-registry-service', () => { someNewValueForCosmic: 'red', }, }, + { + name: 'corporate', + base: 'default', + variables: { + someNewValueForCorporate: 'green', + }, + }, { name: 'super-new-theme', variables: { @@ -57,9 +64,11 @@ describe('js-themes-registry-service', () => { it('has built in themes', () => { expect(jsThemesRegistry.get('default')).not.toBeUndefined(); expect(jsThemesRegistry.get('cosmic')).not.toBeUndefined(); + expect(jsThemesRegistry.get('corporate')).not.toBeUndefined(); expect(jsThemesRegistry.has('default')).toBeTruthy(); expect(jsThemesRegistry.has('cosmic')).toBeTruthy(); + expect(jsThemesRegistry.has('corporate')).toBeTruthy(); }); it('has built in themes with inherited font', () => { @@ -67,6 +76,8 @@ describe('js-themes-registry-service', () => { .toEqual('"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'); expect(jsThemesRegistry.get('cosmic').variables.fontMain) .toEqual('"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'); + expect(jsThemesRegistry.get('corporate').variables.fontMain) + .toEqual('"Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif'); }); it('has also new themes', () => { @@ -82,5 +93,6 @@ describe('js-themes-registry-service', () => { it('has new values from custom settings', () => { expect(jsThemesRegistry.get('cosmic').variables.someNewValueForCosmic).toEqual('red'); expect(jsThemesRegistry.get('default').variables.someNewValue).toEqual('black'); + expect(jsThemesRegistry.get('corporate').variables.someNewValueForCorporate).toEqual('green'); }); }); diff --git a/src/framework/theme/services/js-themes/corporate.theme.ts b/src/framework/theme/services/js-themes/corporate.theme.ts new file mode 100644 index 0000000000..8a3eae7eb1 --- /dev/null +++ b/src/framework/theme/services/js-themes/corporate.theme.ts @@ -0,0 +1,10 @@ +import { NbJSThemeOptions } from './theme.options'; + +export const CORPORATE_THEME: NbJSThemeOptions = { + name: 'corporate', + base: 'default', + + variables: { + fg: '#f1f5f8', + }, +}; diff --git a/src/framework/theme/services/theme.spec.ts b/src/framework/theme/services/theme.spec.ts index d40c6cd334..3b35cbf513 100644 --- a/src/framework/theme/services/theme.spec.ts +++ b/src/framework/theme/services/theme.spec.ts @@ -120,9 +120,11 @@ describe('theme-service', () => { expect(current.bg).toEqual('#ffffff'); themeService.changeTheme('cosmic'); - expect(current.bg).toEqual('#3d3780'); + themeService.changeTheme('corporate'); + expect(current.bg).toEqual('#ffffff'); + } finally { subscription.unsubscribe(); } diff --git a/src/framework/theme/styles/_themes.scss b/src/framework/theme/styles/_themes.scss index 4f09abc7a1..b0475fe714 100644 --- a/src/framework/theme/styles/_themes.scss +++ b/src/framework/theme/styles/_themes.scss @@ -1,2 +1,3 @@ @import 'themes/default'; @import 'themes/cosmic'; +@import 'themes/corporate'; diff --git a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss index fa92228b59..5095048d97 100644 --- a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss +++ b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss @@ -123,27 +123,27 @@ // Left colors @function btn-hero-primary-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-primary-bg)); + @return btn-hero-gradient-left(nb-theme(btn-primary-bg), nb-theme(btn-hero-primary-degree)); } @function btn-hero-success-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-success-bg)); + @return btn-hero-gradient-left(nb-theme(btn-success-bg), nb-theme(btn-hero-success-degree)); } @function btn-hero-warning-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-warning-bg), 10deg); + @return btn-hero-gradient-left(nb-theme(btn-warning-bg), nb-theme(btn-hero-warning-degree)); } @function btn-hero-info-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-info-bg), -10deg); + @return btn-hero-gradient-left(nb-theme(btn-info-bg), nb-theme(btn-hero-info-degree)); } @function btn-hero-danger-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-danger-bg), -20deg); + @return btn-hero-gradient-left(nb-theme(btn-danger-bg), nb-theme(btn-hero-danger-degree)); } @function btn-hero-secondary-left-color() { - @return btn-hero-gradient-left(nb-theme(btn-secondary-border)); + @return btn-hero-gradient-left(nb-theme(btn-secondary-border), nb-theme(btn-hero-secondary-degree)); } // Middle colors @@ -215,6 +215,13 @@ @return btn-hero-light-gradient($color-left, $color-right); } +@function btn-hero-secondary-light-gradient() { + $color-right: nb-theme(btn-secondary-bg); + $color-left: btn-hero-secondary-left-color(); + + @return btn-hero-light-gradient($color-left, $color-right); +} + // dark gradients @function btn-hero-dark-gradient($color-left, $color-right) { @@ -379,7 +386,7 @@ } @function btn-hero-secondary-glow() { - @return btn-hero-glow(btn-hero-secondary-middle-color()); + @return nb-theme(btn-hero-secondary-glow-size) btn-hero-secondary-middle-color(); } @@ -464,6 +471,10 @@ @mixin btn-hero-secondary-border() { border: 2px solid nb-theme(btn-secondary-border); + + @include nb-for-theme(corporate) { + border: none; + } } diff --git a/src/framework/theme/styles/prebuilt/corporate.scss b/src/framework/theme/styles/prebuilt/corporate.scss new file mode 100644 index 0000000000..8fd3f8ba4d --- /dev/null +++ b/src/framework/theme/styles/prebuilt/corporate.scss @@ -0,0 +1,7 @@ +@import '../all'; + +$nb-enabled-themes: (corporate); + +@include nb-install() { + @include nb-theme-global(); +}; diff --git a/src/framework/theme/styles/themes/_corporate.scss b/src/framework/theme/styles/themes/_corporate.scss new file mode 100644 index 0000000000..ec8c3cc95f --- /dev/null +++ b/src/framework/theme/styles/themes/_corporate.scss @@ -0,0 +1,80 @@ +/** + * @license + * Copyright Akveo. All Rights Reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + */ + +@import '../core/functions'; +@import '../core/mixins'; +@import 'default'; + +// default the base theme +$theme: ( + header-fg: #f7fafb, + header-bg: #111218, + + layout-bg: #f1f5f8, + + color-fg-heading: #181818, + color-fg-text: #4b4b4b, + color-fg-highlight: color-fg, + + separator: #cdd5dc, + + color-primary: #73a1ff, + color-success: #5dcfe3, + color-info: #ba7fec, + color-warning: #ffa36b, + color-danger: #ff6b83, + + btn-secondary-bg: #edf2f5, + btn-secondary-border: #edf2f5, + + actions-fg: color-fg, + actions-bg: color-bg, + + sidebar-bg: #e3e9ee, + + menu-font-weight: font-weight-bolder, + menu-fg: color-fg-text, + menu-bg: #e3e9ee, + menu-active-fg: color-fg-heading, + menu-active-bg: menu-bg, + + menu-submenu-bg: menu-bg, + menu-submenu-fg: color-fg-text, + menu-submenu-active-fg: color-fg-heading, + menu-submenu-active-bg: #cdd5dc, + menu-submenu-active-border-color: menu-submenu-active-bg, + menu-submenu-active-shadow: none, + menu-submenu-hover-fg: menu-submenu-active-fg, + menu-submenu-hover-bg: menu-bg, + menu-submenu-item-border-width: 0.125rem, + menu-submenu-item-border-radius: radius, + menu-submenu-item-padding: 0.5rem 1rem, + menu-submenu-item-container-padding: 0 1.25rem, + menu-submenu-padding: 0.5rem, + + btn-hero-degree: 0deg, + btn-hero-primary-degree: btn-hero-degree, + btn-hero-success-degree: btn-hero-degree, + btn-hero-warning-degree: btn-hero-degree, + btn-hero-info-degree: btn-hero-degree, + btn-hero-danger-degree: btn-hero-degree, + btn-hero-secondary-degree: btn-hero-degree, + btn-hero-glow-size: 0 0 10px 0, + btn-hero-secondary-glow-size: 0 0 0 0, + + menu-item-separator: separator, + + actions-separator: color-fg, + + tabs-selected: color-primary, + + smart-table-paging-bg-active: color-primary, + + route-tabs-selected: color-primary, +); + +// register the theme +$nb-themes: nb-register-theme($theme, corporate, default); diff --git a/src/framework/theme/styles/themes/_cosmic.scss b/src/framework/theme/styles/themes/_cosmic.scss index fb952f329f..3093640da8 100644 --- a/src/framework/theme/styles/themes/_cosmic.scss +++ b/src/framework/theme/styles/themes/_cosmic.scss @@ -91,6 +91,7 @@ $theme: ( btn-hero-text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3), btn-hero-bevel-size: 0 3px 0 0, btn-hero-glow-size: 0 2px 8px 0, + btn-hero-secondary-glow-size: btn-hero-glow-size, btn-secondary-border: color-primary, btn-outline-fg: color-fg-heading, btn-outline-hover-fg: color-fg-heading, diff --git a/src/framework/theme/styles/themes/_default.scss b/src/framework/theme/styles/themes/_default.scss index 618ae9c996..3ebaad7b35 100644 --- a/src/framework/theme/styles/themes/_default.scss +++ b/src/framework/theme/styles/themes/_default.scss @@ -339,6 +339,14 @@ $theme: ( btn-hero-text-shadow: none, btn-hero-bevel-size: 0 0 0 0, btn-hero-glow-size: 0 0 0 0, + btn-hero-secondary-glow-size: btn-hero-glow-size, + btn-hero-degree: 20deg, + btn-hero-primary-degree: btn-hero-degree, + btn-hero-success-degree: btn-hero-degree, + btn-hero-warning-degree: 10deg, + btn-hero-info-degree: -10deg, + btn-hero-danger-degree: -20deg, + btn-hero-secondary-degree: btn-hero-degree, btn-outline-fg: color-fg-heading, btn-outline-hover-fg: #ffffff, From 5295b21536bdaddaf7c66d13778931dfd89fb906 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Tue, 12 Jun 2018 17:04:08 +0300 Subject: [PATCH 2/7] feat(theme): add variables for buttons hero --- .../services/js-themes/corporate.theme.ts | 28 ++++++++++++++++++- .../global/bootstrap/_hero-buttons.scss | 16 +++++------ .../theme/styles/themes/_corporate.scss | 5 ++++ .../theme/styles/themes/_cosmic.scss | 5 ++++ .../theme/styles/themes/_default.scss | 5 ++++ src/playground/styles/themes.scss | 4 +++ 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/framework/theme/services/js-themes/corporate.theme.ts b/src/framework/theme/services/js-themes/corporate.theme.ts index 8a3eae7eb1..6fa1ba5177 100644 --- a/src/framework/theme/services/js-themes/corporate.theme.ts +++ b/src/framework/theme/services/js-themes/corporate.theme.ts @@ -1,10 +1,36 @@ import { NbJSThemeOptions } from './theme.options'; +import { NbColorHelper } from '@nebular/theme/services/color.helper'; + +const palette = { + primary: '#73a1ff', + success: '#5dcfe3', + info: '#ba7fec', + warning: '#ffa36b', + danger: '#ff6b83', +}; export const CORPORATE_THEME: NbJSThemeOptions = { name: 'corporate', base: 'default', - variables: { fg: '#f1f5f8', + bg: '#ffffff', + fgHeading: '#181818', + fgText: '#4b4b4b', + fgHighlight: '#a4abb3', + layoutBg: '#f1f5f8', + separator: '#cdd5dc', + + primary: palette.primary, + success: palette.success, + info: palette.info, + warning: palette.warning, + danger: palette.danger, + + primaryLight: NbColorHelper.tint(palette.primary, 15), + successLight: NbColorHelper.tint(palette.success, 15), + infoLight: NbColorHelper.tint(palette.info, 15), + warningLight: NbColorHelper.tint(palette.warning, 15), + dangerLight: NbColorHelper.tint(palette.danger, 15), }, }; diff --git a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss index 5095048d97..63e0dedc93 100644 --- a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss +++ b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss @@ -117,8 +117,8 @@ @return nb-theme(btn-hero-bevel-size) shade($color, 14%); } -@function btn-hero-glow($color) { - @return nb-theme(btn-hero-glow-size) $color; +@function btn-hero-glow($hero-glow-size, $color) { + @return nb-theme($hero-glow-size) $color; } // Left colors @@ -366,27 +366,27 @@ // Glow @function btn-hero-primary-glow() { - @return btn-hero-glow(btn-hero-primary-middle-color()); + @return btn-hero-glow(btn-hero-primary-glow-size, btn-hero-primary-middle-color()); } @function btn-hero-success-glow() { - @return btn-hero-glow(btn-hero-success-middle-color()); + @return btn-hero-glow(btn-hero-success-glow-size, btn-hero-success-middle-color()); } @function btn-hero-warning-glow() { - @return btn-hero-glow(btn-hero-warning-middle-color()); + @return btn-hero-glow(btn-hero-warning-glow-size, btn-hero-warning-middle-color()); } @function btn-hero-info-glow() { - @return btn-hero-glow(btn-hero-info-middle-color()); + @return btn-hero-glow(btn-hero-info-glow-size, btn-hero-info-middle-color()); } @function btn-hero-danger-glow() { - @return btn-hero-glow(btn-hero-danger-middle-color()); + @return btn-hero-glow(btn-hero-danger-glow-size, btn-hero-danger-middle-color()); } @function btn-hero-secondary-glow() { - @return nb-theme(btn-hero-secondary-glow-size) btn-hero-secondary-middle-color(); + @return btn-hero-glow(btn-hero-secondary-glow-size, btn-hero-secondary-middle-color()); } diff --git a/src/framework/theme/styles/themes/_corporate.scss b/src/framework/theme/styles/themes/_corporate.scss index ec8c3cc95f..81336fc88a 100644 --- a/src/framework/theme/styles/themes/_corporate.scss +++ b/src/framework/theme/styles/themes/_corporate.scss @@ -63,6 +63,11 @@ $theme: ( btn-hero-danger-degree: btn-hero-degree, btn-hero-secondary-degree: btn-hero-degree, btn-hero-glow-size: 0 0 10px 0, + btn-hero-primary-glow-size: btn-hero-glow-size, + btn-hero-success-glow-size: btn-hero-glow-size, + btn-hero-warning-glow-size: btn-hero-glow-size, + btn-hero-info-glow-size: btn-hero-glow-size, + btn-hero-danger-glow-size: btn-hero-glow-size, btn-hero-secondary-glow-size: 0 0 0 0, menu-item-separator: separator, diff --git a/src/framework/theme/styles/themes/_cosmic.scss b/src/framework/theme/styles/themes/_cosmic.scss index db699ed497..6f8c62ba09 100644 --- a/src/framework/theme/styles/themes/_cosmic.scss +++ b/src/framework/theme/styles/themes/_cosmic.scss @@ -91,6 +91,11 @@ $theme: ( btn-hero-text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3), btn-hero-bevel-size: 0 3px 0 0, btn-hero-glow-size: 0 2px 8px 0, + btn-hero-primary-glow-size: btn-hero-glow-size, + btn-hero-success-glow-size: btn-hero-glow-size, + btn-hero-warning-glow-size: btn-hero-glow-size, + btn-hero-info-glow-size: btn-hero-glow-size, + btn-hero-danger-glow-size: btn-hero-glow-size, btn-hero-secondary-glow-size: btn-hero-glow-size, btn-secondary-border: color-primary, btn-outline-fg: color-fg-heading, diff --git a/src/framework/theme/styles/themes/_default.scss b/src/framework/theme/styles/themes/_default.scss index 35411901cb..402aab755c 100644 --- a/src/framework/theme/styles/themes/_default.scss +++ b/src/framework/theme/styles/themes/_default.scss @@ -339,6 +339,11 @@ $theme: ( btn-hero-text-shadow: none, btn-hero-bevel-size: 0 0 0 0, btn-hero-glow-size: 0 0 0 0, + btn-hero-primary-glow-size: btn-hero-glow-size, + btn-hero-success-glow-size: btn-hero-glow-size, + btn-hero-warning-glow-size: btn-hero-glow-size, + btn-hero-info-glow-size: btn-hero-glow-size, + btn-hero-danger-glow-size: btn-hero-glow-size, btn-hero-secondary-glow-size: btn-hero-glow-size, btn-hero-degree: 20deg, btn-hero-primary-degree: btn-hero-degree, diff --git a/src/playground/styles/themes.scss b/src/playground/styles/themes.scss index e04e516bcc..1c7ea640ed 100644 --- a/src/playground/styles/themes.scss +++ b/src/playground/styles/themes.scss @@ -12,3 +12,7 @@ $nb-themes: nb-register-theme(( $nb-themes: nb-register-theme(( ), cosmic, cosmic); + +$nb-themes: nb-register-theme(( + +), corporate, corporate); From 9de99233daaac0c823650ca73a1d3b131dc3172c Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Tue, 12 Jun 2018 18:26:48 +0300 Subject: [PATCH 3/7] feat(theme): add corporate theme to the playground --- src/playground/styles/themes.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playground/styles/themes.scss b/src/playground/styles/themes.scss index 1c7ea640ed..b89e2f8f1f 100644 --- a/src/playground/styles/themes.scss +++ b/src/playground/styles/themes.scss @@ -4,7 +4,7 @@ @import '~bootstrap/scss/mixins/breakpoints'; @import '../../framework/theme/styles/global/bootstrap/breakpoints'; -$nb-enabled-themes: (default, cosmic); +$nb-enabled-themes: (default, cosmic, corporate); $nb-themes: nb-register-theme(( ), default, default); From 9c0d4ae885df0d9ecc08a28597311d5ed56de128 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Tue, 12 Jun 2018 19:35:15 +0300 Subject: [PATCH 4/7] feat(theme): add corporate theme to docs --- .../live-example-block.component.scss | 5 +++++ .../live-example-block.component.ts | 6 ++++++ docs/structure.ts | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/docs/app/blocks/components/live-example-block/live-example-block.component.scss b/docs/app/blocks/components/live-example-block/live-example-block.component.scss index 655aff9fb6..2182194854 100644 --- a/docs/app/blocks/components/live-example-block/live-example-block.component.scss +++ b/docs/app/blocks/components/live-example-block/live-example-block.component.scss @@ -9,6 +9,7 @@ $block-bg-default: #ebeff5; $block-bg-cosmic: #2f296b; $block-fg-cosmic: #7d838b; + $block-bg-corporate: #f1f5f8; display: flex; flex-direction: column; @@ -106,6 +107,10 @@ } } + &.theme-corporate { + background-color: $block-bg-corporate; + } + .iframe-container { overflow-x: auto; -webkit-overflow-scrolling: touch; diff --git a/docs/app/blocks/components/live-example-block/live-example-block.component.ts b/docs/app/blocks/components/live-example-block/live-example-block.component.ts index 97fbe006b8..729b82a9bc 100644 --- a/docs/app/blocks/components/live-example-block/live-example-block.component.ts +++ b/docs/app/blocks/components/live-example-block/live-example-block.component.ts @@ -40,12 +40,18 @@ export class NgdLiveExampleBlockComponent implements OnInit, OnDestroy { return this.currentTheme === 'cosmic'; } + @HostBinding('class.theme-corporate') + private get isCorporate() { + return this.currentTheme === 'corporate'; + } + iframeHeight: number; alive: boolean = true; themes: {label: string; value: string}[] = [ { label: 'Default', value: 'default' }, { label: 'Cosmic', value: 'cosmic' }, + { label: 'Corporate', value: 'corporate' }, ]; currentTheme: string = 'default'; diff --git a/docs/structure.ts b/docs/structure.ts index 754116b01b..e0101cb659 100644 --- a/docs/structure.ts +++ b/docs/structure.ts @@ -369,6 +369,18 @@ export const structure = [ }, ], }, + { + type: 'page', + name: 'Corporate', + children: [ + { + type: 'block', + block: 'theme', + name: 'Corporate', + source: 'corporate', + }, + ], + }, ], }, { From 7af313866dad91860541c0a37fe0b331dd32b0ad Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Thu, 14 Jun 2018 10:50:47 +0300 Subject: [PATCH 5/7] feat(theme): update some styles for corporate theme --- .../card/_card.component.theme.scss | 5 ++++- .../services/js-themes/corporate.theme.ts | 2 +- .../global/bootstrap/_hero-buttons.scss | 10 +++++++++ .../theme/styles/themes/_corporate.scss | 22 +++++++++++++++++-- .../theme/styles/themes/_default.scss | 7 ++++++ 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/src/framework/theme/components/card/_card.component.theme.scss b/src/framework/theme/components/card/_card.component.theme.scss index af53cb96fa..02ec443135 100644 --- a/src/framework/theme/components/card/_card.component.theme.scss +++ b/src/framework/theme/components/card/_card.component.theme.scss @@ -6,7 +6,9 @@ @mixin nb-card-header() { padding: nb-theme(card-padding); - border-bottom: 1px solid nb-theme(card-separator); + border-bottom-width: nb-theme(card-header-border-width); + border-bottom-style: nb-theme(card-header-border-type); + border-bottom-color: nb-theme(card-header-border-color); border-top-left-radius: nb-theme(card-border-radius); border-top-right-radius: nb-theme(card-border-radius); color: nb-theme(card-header-fg-heading); @@ -30,6 +32,7 @@ border-radius: nb-theme(card-border-radius); box-shadow: nb-theme(card-shadow); font-weight: nb-theme(card-font-weight); + border: nb-theme(card-border-width) nb-theme(card-border-type) nb-theme(card-border-color); @include nb-scrollbars( nb-theme(scrollbar-fg), diff --git a/src/framework/theme/services/js-themes/corporate.theme.ts b/src/framework/theme/services/js-themes/corporate.theme.ts index 6fa1ba5177..5dc91b1eaa 100644 --- a/src/framework/theme/services/js-themes/corporate.theme.ts +++ b/src/framework/theme/services/js-themes/corporate.theme.ts @@ -1,5 +1,5 @@ import { NbJSThemeOptions } from './theme.options'; -import { NbColorHelper } from '@nebular/theme/services/color.helper'; +import { NbColorHelper } from '../color.helper'; const palette = { primary: '#73a1ff', diff --git a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss index 63e0dedc93..de57b159da 100644 --- a/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss +++ b/src/framework/theme/styles/global/bootstrap/_hero-buttons.scss @@ -33,6 +33,7 @@ @mixin btn-hero-primary() { @include btn-hero-primary-gradient(); @include btn-hero-primary-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-primary-focus(); @include btn-hero-primary-hover(); @@ -46,6 +47,7 @@ @mixin btn-hero-success() { @include btn-hero-success-gradient(); @include btn-hero-success-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-success-focus(); @include btn-hero-success-hover(); @@ -59,6 +61,7 @@ @mixin btn-hero-warning() { @include btn-hero-warning-gradient(); @include btn-hero-warning-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-warning-focus(); @include btn-hero-warning-hover(); @@ -72,6 +75,7 @@ @mixin btn-hero-info() { @include btn-hero-info-gradient(); @include btn-hero-info-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-info-focus(); @include btn-hero-info-hover(); @@ -85,6 +89,7 @@ @mixin btn-hero-danger() { @include btn-hero-danger-gradient(); @include btn-hero-danger-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-danger-focus(); @include btn-hero-danger-hover(); @@ -99,6 +104,7 @@ color: nb-theme(btn-outline-fg); @include btn-hero-secondary-bg(); @include btn-hero-secondary-bevel-glow-shadow(); + @include btn-hero-border-radius(); @include btn-hero-text(); @include btn-hero-secondary-focus(); @include btn-hero-secondary-hover(); @@ -294,6 +300,10 @@ border-color: transparent; } } + +@mixin btn-hero-border-radius() { + border-radius: nb-theme(btn-hero-border-radius); +} // End help mixins diff --git a/src/framework/theme/styles/themes/_corporate.scss b/src/framework/theme/styles/themes/_corporate.scss index 81336fc88a..eab67ce297 100644 --- a/src/framework/theme/styles/themes/_corporate.scss +++ b/src/framework/theme/styles/themes/_corporate.scss @@ -21,6 +21,10 @@ $theme: ( separator: #cdd5dc, + radius: 0.17rem, + + scrollbar-bg: #e3e9ee, + color-primary: #73a1ff, color-success: #5dcfe3, color-info: #ba7fec, @@ -30,11 +34,13 @@ $theme: ( btn-secondary-bg: #edf2f5, btn-secondary-border: #edf2f5, - actions-fg: color-fg, + actions-fg: #d3dbe5, actions-bg: color-bg, sidebar-bg: #e3e9ee, + layout-padding: 2.5rem 2.5rem 0.75rem 1.5rem, + menu-font-weight: font-weight-bolder, menu-fg: color-fg-text, menu-bg: #e3e9ee, @@ -55,6 +61,8 @@ $theme: ( menu-submenu-item-container-padding: 0 1.25rem, menu-submenu-padding: 0.5rem, + btn-border-radius: btn-semi-round-border-radius, + btn-hero-degree: 0deg, btn-hero-primary-degree: btn-hero-degree, btn-hero-success-degree: btn-hero-degree, @@ -69,16 +77,26 @@ $theme: ( btn-hero-info-glow-size: btn-hero-glow-size, btn-hero-danger-glow-size: btn-hero-glow-size, btn-hero-secondary-glow-size: 0 0 0 0, + btn-hero-border-radius: btn-border-radius, + + card-shadow: none, + card-border-width: 1px, + card-border-color: #e7ecef, + card-header-border-width: 0, menu-item-separator: separator, - actions-separator: color-fg, + actions-separator: #f1f4f5, tabs-selected: color-primary, + tabs-separator: #ebecee, smart-table-paging-bg-active: color-primary, route-tabs-selected: color-primary, + + footer-shadow: none, + footer-separator: #e7ecef, ); // register the theme diff --git a/src/framework/theme/styles/themes/_default.scss b/src/framework/theme/styles/themes/_default.scss index 402aab755c..2e145595d7 100644 --- a/src/framework/theme/styles/themes/_default.scss +++ b/src/framework/theme/styles/themes/_default.scss @@ -92,6 +92,9 @@ $theme: ( card-height-xlarge: 696px, card-height-xxlarge: 816px, card-shadow: shadow, + card-border-width: 0, + card-border-type: solid, + card-border-color: color-bg, card-border-radius: radius, card-padding: padding, card-margin: margin, @@ -109,6 +112,9 @@ $theme: ( card-header-success-bg: color-success, card-header-warning-bg: color-warning, card-header-danger-bg: color-danger, + card-header-border-width: 1px, + card-header-border-type: solid, + card-header-border-color: card-separator, header-font-family: font-secondary, header-font-size: font-size, @@ -352,6 +358,7 @@ $theme: ( btn-hero-info-degree: -10deg, btn-hero-danger-degree: -20deg, btn-hero-secondary-degree: btn-hero-degree, + btn-hero-border-radius: radius, btn-outline-fg: color-fg-heading, btn-outline-hover-fg: #ffffff, From 2cff3b39b39742bb5d95393997236bacdbb569d6 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Fri, 15 Jun 2018 17:12:32 +0300 Subject: [PATCH 6/7] feat(theme): update nebular icons --- src/framework/icons/css/nebular-icons.css | 198 ++++++++++-------- src/framework/icons/fonts/nebular.eot | Bin 33868 -> 35508 bytes src/framework/icons/fonts/nebular.svg | 176 ++++++++-------- src/framework/icons/fonts/nebular.ttf | Bin 33704 -> 35344 bytes src/framework/icons/fonts/nebular.woff | Bin 33780 -> 35420 bytes src/framework/icons/package.json | 2 +- .../icons/scss/_nebular-icons-font.scss | 198 ++++++++++-------- src/framework/icons/src/icons/nb-drop.svg | 32 +++ src/framework/icons/src/icons/nb-drops.svg | 22 ++ src/framework/icons/src/icons/nb-info.svg | 15 ++ .../theme/styles/themes/_corporate.scss | 4 + 11 files changed, 378 insertions(+), 269 deletions(-) create mode 100644 src/framework/icons/src/icons/nb-drop.svg create mode 100644 src/framework/icons/src/icons/nb-drops.svg create mode 100644 src/framework/icons/src/icons/nb-info.svg diff --git a/src/framework/icons/css/nebular-icons.css b/src/framework/icons/css/nebular-icons.css index 2718377df2..19830db473 100644 --- a/src/framework/icons/css/nebular-icons.css +++ b/src/framework/icons/css/nebular-icons.css @@ -5,11 +5,11 @@ */ @font-face { font-family: 'nebular'; - src: url('../fonts/nebular.eot?jaecku'); - src: url('../fonts/nebular.eot?jaecku#iefix') format('embedded-opentype'), - url('../fonts/nebular.ttf?jaecku') format('truetype'), - url('../fonts/nebular.woff?jaecku') format('woff'), - url('../fonts/nebular.svg?jaecku#nebular') format('svg'); + src: url('../fonts/nebular.eot?nboapd'); + src: url('../fonts/nebular.eot?nboapd#iefix') format('embedded-opentype'), + url('../fonts/nebular.ttf?nboapd') format('truetype'), + url('../fonts/nebular.woff?nboapd') format('woff'), + url('../fonts/nebular.svg?nboapd#nebular') format('svg'); font-weight: normal; font-style: normal; } @@ -100,7 +100,10 @@ .nb-title, .nb-trash, .nb-volume-high, -.nb-volume-mute { +.nb-volume-mute, +.nb-drop, +.nb-drops, +.nb-info { /* use !important to prevent issues with browser extensions that change ../fonts */ font-family: 'nebular' !important; speak: none; @@ -121,258 +124,271 @@ .nb-angle-double-left::before { content: '\e901'; } -.nb-arrow-down::before { +.nb-angle-double-right::before { content: '\e902'; } -.nb-arrow-dropdown::before { +.nb-arrow-down::before { content: '\e903'; } -.nb-arrow-dropleft::before { +.nb-arrow-dropdown::before { content: '\e904'; } -.nb-arrow-dropright::before { +.nb-arrow-dropleft::before { content: '\e905'; } -.nb-arrow-dropup::before { +.nb-arrow-dropright::before { content: '\e906'; } -.nb-arrow-left::before { +.nb-arrow-dropup::before { content: '\e907'; } -.nb-arrow-retweet::before { +.nb-arrow-left::before { content: '\e908'; } -.nb-arrow-right::before { +.nb-arrow-retweet::before { content: '\e909'; } -.nb-arrow-thin-down::before { +.nb-arrow-right::before { content: '\e90a'; } -.nb-arrow-thin-left::before { +.nb-arrow-thin-down::before { content: '\e90b'; } -.nb-arrow-thin-right::before { +.nb-arrow-thin-left::before { content: '\e90c'; } -.nb-arrow-thin-up::before { +.nb-arrow-thin-right::before { content: '\e90d'; } -.nb-arrow-up::before { +.nb-arrow-thin-up::before { content: '\e90e'; } -.nb-audio::before { +.nb-arrow-up::before { content: '\e90f'; } -.nb-bar-chart::before { +.nb-audio::before { content: '\e910'; } -.nb-checkmark::before { +.nb-bar-chart::before { content: '\e911'; } -.nb-chevron-down::before { +.nb-checkmark::before { content: '\e912'; } -.nb-chevron-down-outline::before { +.nb-chevron-down::before { content: '\e913'; } -.nb-chevron-left::before { +.nb-chevron-down-outline::before { content: '\e914'; } -.nb-chevron-left-outline::before { +.nb-chevron-left::before { content: '\e915'; } -.nb-chevron-right::before { +.nb-chevron-left-outline::before { content: '\e916'; } -.nb-chevron-right-outline::before { +.nb-chevron-right::before { content: '\e917'; } -.nb-chevron-up::before { +.nb-chevron-right-outline::before { content: '\e918'; } -.nb-chevron-up-outline::before { +.nb-chevron-up::before { content: '\e919'; } -.nb-close::before { +.nb-chevron-up-outline::before { content: '\e91a'; } -.nb-close-circled::before { +.nb-close::before { content: '\e91b'; } -.nb-cloudy::before { +.nb-close-circled::before { content: '\e91c'; } -.nb-coffee-maker::before { +.nb-cloudy::before { content: '\e91d'; } -.nb-compose::before { +.nb-coffee-maker::before { content: '\e91e'; } -.nb-edit::before { +.nb-compose::before { content: '\e91f'; } -.nb-email::before { +.nb-drop::before { content: '\e920'; } -.nb-flame-circled::before { +.nb-drops::before { content: '\e921'; } -.nb-gear::before { +.nb-edit::before { content: '\e922'; } -.nb-grid-a::before { +.nb-email::before { content: '\e923'; } -.nb-grid-a-outline::before { +.nb-flame-circled::before { content: '\e924'; } -.nb-grid-b::before { +.nb-gear::before { content: '\e925'; } -.nb-grid-b-outline::before { +.nb-grid-a::before { content: '\e926'; } -.nb-heart::before { +.nb-grid-a-outline::before { content: '\e927'; } -.nb-home::before { +.nb-grid-b::before { content: '\e928'; } -.nb-keypad::before { +.nb-grid-b-outline::before { content: '\e929'; } -.nb-layout-centre::before { +.nb-heart::before { content: '\e92a'; } -.nb-layout-default::before { +.nb-home::before { content: '\e92b'; } -.nb-layout-one-column::before { +.nb-info::before { content: '\e92c'; + color: #fff; } -.nb-layout-sidebar-left::before { +.nb-keypad::before { content: '\e92d'; } -.nb-layout-sidebar-right::before { +.nb-layout-centre::before { content: '\e92e'; } -.nb-layout-two-column::before { +.nb-layout-default::before { content: '\e92f'; } -.nb-lightbulb::before { +.nb-layout-one-column::before { content: '\e930'; } -.nb-list::before { +.nb-layout-sidebar-left::before { content: '\e931'; } -.nb-location::before { +.nb-layout-sidebar-right::before { content: '\e932'; } -.nb-locked::before { +.nb-layout-two-column::before { content: '\e933'; } -.nb-loop::before { +.nb-lightbulb::before { content: '\e934'; } -.nb-loop-circled::before { +.nb-list::before { content: '\e935'; } -.nb-menu::before { +.nb-location::before { content: '\e936'; } -.nb-notifications::before { +.nb-locked::before { content: '\e937'; } -.nb-paper-plane::before { +.nb-loop::before { content: '\e938'; } -.nb-partlysunny::before { +.nb-loop-circled::before { content: '\e939'; } -.nb-pause::before { +.nb-menu::before { content: '\e93a'; } -.nb-pause-outline::before { +.nb-notifications::before { content: '\e93b'; } -.nb-person::before { +.nb-paper-plane::before { content: '\e93c'; } -.nb-phone::before { +.nb-partlysunny::before { content: '\e93d'; } -.nb-play::before { +.nb-pause::before { content: '\e93e'; } -.nb-play-outline::before { +.nb-pause-outline::before { content: '\e93f'; } -.nb-plus::before { +.nb-person::before { content: '\e940'; } -.nb-plus-circled::before { +.nb-phone::before { content: '\e941'; } -.nb-power::before { +.nb-play::before { content: '\e942'; } -.nb-power-circled::before { +.nb-play-outline::before { content: '\e943'; } -.nb-rainy::before { +.nb-plus::before { content: '\e944'; } -.nb-roller-shades::before { +.nb-plus-circled::before { content: '\e945'; } -.nb-search::before { +.nb-power::before { content: '\e946'; } -.nb-shuffle::before { +.nb-power-circled::before { content: '\e947'; } -.nb-skip-backward::before { +.nb-rainy::before { content: '\e948'; } -.nb-skip-backward-outline::before { +.nb-roller-shades::before { content: '\e949'; } -.nb-skip-forward::before { +.nb-search::before { content: '\e94a'; } -.nb-skip-forward-outline::before { +.nb-shuffle::before { content: '\e94b'; } -.nb-snowy-circled::before { +.nb-skip-backward::before { content: '\e94c'; } -.nb-square::before { +.nb-skip-backward-outline::before { content: '\e94d'; } -.nb-square-outline::before { +.nb-skip-forward::before { content: '\e94e'; } -.nb-star::before { +.nb-skip-forward-outline::before { content: '\e94f'; } -.nb-sunny::before { +.nb-snowy-circled::before { content: '\e950'; } -.nb-sunny-circled::before { +.nb-square::before { content: '\e951'; } -.nb-tables::before { +.nb-square-outline::before { content: '\e952'; } -.nb-title::before { +.nb-star::before { content: '\e953'; } -.nb-trash::before { +.nb-sunny::before { content: '\e954'; } -.nb-volume-high::before { +.nb-sunny-circled::before { content: '\e955'; } -.nb-volume-mute::before { +.nb-tables::before { content: '\e956'; } +.nb-title::before { + content: '\e957'; +} +.nb-trash::before { + content: '\e958'; +} +.nb-volume-high::before { + content: '\e959'; +} +.nb-volume-mute::before { + content: '\e95a'; +} diff --git a/src/framework/icons/fonts/nebular.eot b/src/framework/icons/fonts/nebular.eot index 82ade0a44fd1bdd1e55f9c84a744f60097735bc6..a0b60fd1ac10a6cb6e64fee882e3c6b2e53be84f 100644 GIT binary patch delta 5192 zcmbtYYj7LY6~1?`c4hgY_gk_hThgu`maNrVjw~thgWwQiCpM*aNbESVLrM}8Qb#nMD*-Rjum3^ zgYL}AXLatm+Vi;I`Hs&VVou!8a3>BUq&<9uODT>Vopl^3-l5xz5IPC>#MIWwS<4M) z-#&86SsHxfy(Wb4E`;vRY~D1vQFrY9+Ys7+9M+{a!xzdQDctb z(1B*K*>lVGsma~%KKLty4juyi+}6omvuFo%H$sP&!?Szae3w$ymE8{VFDIImC0zJ8LJ6z+rp8oz^ z&zQrW44VSm^M!PJwZ&?+tWKv3`HUpfCtabTg@uyQSWm7W_kSr|DFmWcD=d}GtQLzT z7jS-?U&;`JcA$Oa2y+N^qOFjI9EO(@6Y>jDy?ct)>asjfce#66UdU>7^ksL>#G&t? zK{7>>=y|BLQ|K=^hR3PC{j1IOUed?glg+aCH3#Wi?cJQY>YcM=Tik435szoP+vKsn(}u&r!iDp5#7Pe5fxISR&bNZ?;({{9t%Xg{EoNuvoCU6E_YklXSTF7sBD$@nWv8&v11_}%|vMdc%Ln_#ioEW$PsArAcpJx=-W>y3}1dQa|V|b2z@-KKx7U{A|laXS4?jWsy8!OtmS(_eFSn59 z=FT>kkHPX=pCHiVti9dcpR?IcQhmxR7Dwu4ySNYHZ6~KrLW!Xk&=;8E6nC=y1EjByE~*5aIBJXePLN75GX*qd3wlR zx*Ae_0^uaI1LVUSU}r^gsb1d`40K_&R0;}~;TZ)X-daM{sjldN(R6K2ian(LYwAQe z(rYjdE}2h8YN<}w?H9}u$zCEMK1eO&1>Pdj5ZX6PeMyu>*Pt=95zd)VJ7!%{ZA<(~ zG*#=FUKoyc$pLJ|?eio<)B(nbamb5E8f+SM+~Wx_4x_;t@Oa{C4INzF5#srbPFtDK z>M}eZas=3KumQ*0OTQNq_`KQFfCYooY4A6gO?g3}Utis7(Q322uk+!DJAHgstG)Pl zuifqipeUbQ{UFx$qXXzsU<>Ea`Ax|yxmr>dQ+xH;7BE?(Zi#t3L5*&*zkgDv4Rv^8 zEov3V%y6p8OPN)xGSWS3?smJo&Ai*)rB;)RFA%l5%jM$nFK}09_&Qgc(HL{~Pfqqb zV_m*(n#VW#|DUzl7P~v(Zy`0BMyz2@+_Wy-mj{LfX(BmCf1K7o> zpp-5K0A(Y2oH(IGAB9w<5_OZyYm*PKI)EdA-n?Ok<@u~mOJCoxp`4hS!EJuP6u`?* z5|i4DMvreamFoG)e6@?UQ!A2C+2Sx7`y-J=A`?RDBLkW`H@1AHmVAs6T}r(9>I=i$V2`jZaUHk5$K)OEL^1($G>JV0`s*`LS&V#dsU)0if7|4gpX+ zgIC^nUdJC}BfV2GX9bp`eMwgr5S{{w2(@}A`5#(#cXgV4S79}EF z42Gg&FjUm*G1lvgp&%XDc{(w_zTQ@nD=^IzLP0Sa3Ka}`Ne)G;GLxiV|6&_m^TqFP z(jmjguaOVP_vJa}I&>3^i-*yZFy+67-a!|z77KU@9>y~m{`d1)N67N^w-41P3MR)( zQ{?pI!qhiemo$3vjyE7t2jw|)VRbdd9~EJ`9381&KT+MM{KBp^O0Q$~=#llB+y&GG za~fRdmXF@K@V7d+(da&>5!6^-vGB2;PVBS8zpCi2eYbPC2rF3n-ae1&3`k{ZJ8Jy$ zt0gBhOU&eX#Td)6Yq@3Ix43^PS1XS$Kr1#29xikHm2T7 m&t_2e-t4jLpO$2DmHeLyr;3T<^GlB{bIOjcFCV_^NBDoHRtDby delta 3535 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 diff --git a/src/framework/icons/fonts/nebular.svg b/src/framework/icons/fonts/nebular.svg index a91fadb165..13a351a27a 100644 --- a/src/framework/icons/fonts/nebular.svg +++ b/src/framework/icons/fonts/nebular.svg @@ -9,89 +9,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/framework/icons/fonts/nebular.ttf b/src/framework/icons/fonts/nebular.ttf index a82457a27762deaf2339a8e5d7b38245404f5c26..b85a5e133edaba43c1ad1b1f0edb14b188d58d4a 100644 GIT binary patch delta 5160 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 TITT(9U&w|zk~wzI&+vZ$>N!V# diff --git a/src/framework/icons/package.json b/src/framework/icons/package.json index 1fbee3e82f..6fbbce439a 100644 --- a/src/framework/icons/package.json +++ b/src/framework/icons/package.json @@ -1,6 +1,6 @@ { "name": "nebular-icons", - "version": "1.0.6", + "version": "1.0.7", "description": "Nebular icons - amazing icons crafted with love by Akveo team", "author": "akveo", "license": "MIT", diff --git a/src/framework/icons/scss/_nebular-icons-font.scss b/src/framework/icons/scss/_nebular-icons-font.scss index 458b75dfcd..4142b833c1 100644 --- a/src/framework/icons/scss/_nebular-icons-font.scss +++ b/src/framework/icons/scss/_nebular-icons-font.scss @@ -5,11 +5,11 @@ */ @font-face { font-family: #{$nebular-icons-font-family}; - src: url('#{$nebular-icons-font-path}/nebular.eot?jaecku'); - src: url('#{$nebular-icons-font-path}/nebular.eot?jaecku#iefix') format('embedded-opentype'), - url('#{$nebular-icons-font-path}/nebular.ttf?jaecku') format('truetype'), - url('#{$nebular-icons-font-path}/nebular.woff?jaecku') format('woff'), - url('#{$nebular-icons-font-path}/nebular.svg?jaecku#nebular') format('svg'); + src: url('#{$nebular-icons-font-path}/nebular.eot?nboapd'); + src: url('#{$nebular-icons-font-path}/nebular.eot?nboapd#iefix') format('embedded-opentype'), + url('#{$nebular-icons-font-path}/nebular.ttf?nboapd') format('truetype'), + url('#{$nebular-icons-font-path}/nebular.woff?nboapd') format('woff'), + url('#{$nebular-icons-font-path}/nebular.svg?nboapd#nebular') format('svg'); font-weight: normal; font-style: normal; } @@ -100,7 +100,10 @@ .nb-title, .nb-trash, .nb-volume-high, -.nb-volume-mute { +.nb-volume-mute, +.nb-drop, +.nb-drops, +.nb-info { /* use !important to prevent issues with browser extensions that change #{$nebular-icons-font-path} */ font-family: #{$nebular-icons-font-family}; speak: none; @@ -121,258 +124,271 @@ .nb-angle-double-left::before { content: '\e901'; } -.nb-arrow-down::before { +.nb-angle-double-right::before { content: '\e902'; } -.nb-arrow-dropdown::before { +.nb-arrow-down::before { content: '\e903'; } -.nb-arrow-dropleft::before { +.nb-arrow-dropdown::before { content: '\e904'; } -.nb-arrow-dropright::before { +.nb-arrow-dropleft::before { content: '\e905'; } -.nb-arrow-dropup::before { +.nb-arrow-dropright::before { content: '\e906'; } -.nb-arrow-left::before { +.nb-arrow-dropup::before { content: '\e907'; } -.nb-arrow-retweet::before { +.nb-arrow-left::before { content: '\e908'; } -.nb-arrow-right::before { +.nb-arrow-retweet::before { content: '\e909'; } -.nb-arrow-thin-down::before { +.nb-arrow-right::before { content: '\e90a'; } -.nb-arrow-thin-left::before { +.nb-arrow-thin-down::before { content: '\e90b'; } -.nb-arrow-thin-right::before { +.nb-arrow-thin-left::before { content: '\e90c'; } -.nb-arrow-thin-up::before { +.nb-arrow-thin-right::before { content: '\e90d'; } -.nb-arrow-up::before { +.nb-arrow-thin-up::before { content: '\e90e'; } -.nb-audio::before { +.nb-arrow-up::before { content: '\e90f'; } -.nb-bar-chart::before { +.nb-audio::before { content: '\e910'; } -.nb-checkmark::before { +.nb-bar-chart::before { content: '\e911'; } -.nb-chevron-down::before { +.nb-checkmark::before { content: '\e912'; } -.nb-chevron-down-outline::before { +.nb-chevron-down::before { content: '\e913'; } -.nb-chevron-left::before { +.nb-chevron-down-outline::before { content: '\e914'; } -.nb-chevron-left-outline::before { +.nb-chevron-left::before { content: '\e915'; } -.nb-chevron-right::before { +.nb-chevron-left-outline::before { content: '\e916'; } -.nb-chevron-right-outline::before { +.nb-chevron-right::before { content: '\e917'; } -.nb-chevron-up::before { +.nb-chevron-right-outline::before { content: '\e918'; } -.nb-chevron-up-outline::before { +.nb-chevron-up::before { content: '\e919'; } -.nb-close::before { +.nb-chevron-up-outline::before { content: '\e91a'; } -.nb-close-circled::before { +.nb-close::before { content: '\e91b'; } -.nb-cloudy::before { +.nb-close-circled::before { content: '\e91c'; } -.nb-coffee-maker::before { +.nb-cloudy::before { content: '\e91d'; } -.nb-compose::before { +.nb-coffee-maker::before { content: '\e91e'; } -.nb-edit::before { +.nb-compose::before { content: '\e91f'; } -.nb-email::before { +.nb-drop::before { content: '\e920'; } -.nb-flame-circled::before { +.nb-drops::before { content: '\e921'; } -.nb-gear::before { +.nb-edit::before { content: '\e922'; } -.nb-grid-a::before { +.nb-email::before { content: '\e923'; } -.nb-grid-a-outline::before { +.nb-flame-circled::before { content: '\e924'; } -.nb-grid-b::before { +.nb-gear::before { content: '\e925'; } -.nb-grid-b-outline::before { +.nb-grid-a::before { content: '\e926'; } -.nb-heart::before { +.nb-grid-a-outline::before { content: '\e927'; } -.nb-home::before { +.nb-grid-b::before { content: '\e928'; } -.nb-keypad::before { +.nb-grid-b-outline::before { content: '\e929'; } -.nb-layout-centre::before { +.nb-heart::before { content: '\e92a'; } -.nb-layout-default::before { +.nb-home::before { content: '\e92b'; } -.nb-layout-one-column::before { +.nb-info::before { content: '\e92c'; + color: #fff; } -.nb-layout-sidebar-left::before { +.nb-keypad::before { content: '\e92d'; } -.nb-layout-sidebar-right::before { +.nb-layout-centre::before { content: '\e92e'; } -.nb-layout-two-column::before { +.nb-layout-default::before { content: '\e92f'; } -.nb-lightbulb::before { +.nb-layout-one-column::before { content: '\e930'; } -.nb-list::before { +.nb-layout-sidebar-left::before { content: '\e931'; } -.nb-location::before { +.nb-layout-sidebar-right::before { content: '\e932'; } -.nb-locked::before { +.nb-layout-two-column::before { content: '\e933'; } -.nb-loop::before { +.nb-lightbulb::before { content: '\e934'; } -.nb-loop-circled::before { +.nb-list::before { content: '\e935'; } -.nb-menu::before { +.nb-location::before { content: '\e936'; } -.nb-notifications::before { +.nb-locked::before { content: '\e937'; } -.nb-paper-plane::before { +.nb-loop::before { content: '\e938'; } -.nb-partlysunny::before { +.nb-loop-circled::before { content: '\e939'; } -.nb-pause::before { +.nb-menu::before { content: '\e93a'; } -.nb-pause-outline::before { +.nb-notifications::before { content: '\e93b'; } -.nb-person::before { +.nb-paper-plane::before { content: '\e93c'; } -.nb-phone::before { +.nb-partlysunny::before { content: '\e93d'; } -.nb-play::before { +.nb-pause::before { content: '\e93e'; } -.nb-play-outline::before { +.nb-pause-outline::before { content: '\e93f'; } -.nb-plus::before { +.nb-person::before { content: '\e940'; } -.nb-plus-circled::before { +.nb-phone::before { content: '\e941'; } -.nb-power::before { +.nb-play::before { content: '\e942'; } -.nb-power-circled::before { +.nb-play-outline::before { content: '\e943'; } -.nb-rainy::before { +.nb-plus::before { content: '\e944'; } -.nb-roller-shades::before { +.nb-plus-circled::before { content: '\e945'; } -.nb-search::before { +.nb-power::before { content: '\e946'; } -.nb-shuffle::before { +.nb-power-circled::before { content: '\e947'; } -.nb-skip-backward::before { +.nb-rainy::before { content: '\e948'; } -.nb-skip-backward-outline::before { +.nb-roller-shades::before { content: '\e949'; } -.nb-skip-forward::before { +.nb-search::before { content: '\e94a'; } -.nb-skip-forward-outline::before { +.nb-shuffle::before { content: '\e94b'; } -.nb-snowy-circled::before { +.nb-skip-backward::before { content: '\e94c'; } -.nb-square::before { +.nb-skip-backward-outline::before { content: '\e94d'; } -.nb-square-outline::before { +.nb-skip-forward::before { content: '\e94e'; } -.nb-star::before { +.nb-skip-forward-outline::before { content: '\e94f'; } -.nb-sunny::before { +.nb-snowy-circled::before { content: '\e950'; } -.nb-sunny-circled::before { +.nb-square::before { content: '\e951'; } -.nb-tables::before { +.nb-square-outline::before { content: '\e952'; } -.nb-title::before { +.nb-star::before { content: '\e953'; } -.nb-trash::before { +.nb-sunny::before { content: '\e954'; } -.nb-volume-high::before { +.nb-sunny-circled::before { content: '\e955'; } -.nb-volume-mute::before { +.nb-tables::before { content: '\e956'; } +.nb-title::before { + content: '\e957'; +} +.nb-trash::before { + content: '\e958'; +} +.nb-volume-high::before { + content: '\e959'; +} +.nb-volume-mute::before { + content: '\e95a'; +} diff --git a/src/framework/icons/src/icons/nb-drop.svg b/src/framework/icons/src/icons/nb-drop.svg new file mode 100644 index 0000000000..5c5962c698 --- /dev/null +++ b/src/framework/icons/src/icons/nb-drop.svg @@ -0,0 +1,32 @@ + + + + drop-light + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/framework/icons/src/icons/nb-drops.svg b/src/framework/icons/src/icons/nb-drops.svg new file mode 100644 index 0000000000..277d3ae325 --- /dev/null +++ b/src/framework/icons/src/icons/nb-drops.svg @@ -0,0 +1,22 @@ + + + + drops-light + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/framework/icons/src/icons/nb-info.svg b/src/framework/icons/src/icons/nb-info.svg new file mode 100644 index 0000000000..ad8c6f7f71 --- /dev/null +++ b/src/framework/icons/src/icons/nb-info.svg @@ -0,0 +1,15 @@ + + + + info + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/src/framework/theme/styles/themes/_corporate.scss b/src/framework/theme/styles/themes/_corporate.scss index eab67ce297..666fbb1e60 100644 --- a/src/framework/theme/styles/themes/_corporate.scss +++ b/src/framework/theme/styles/themes/_corporate.scss @@ -84,6 +84,10 @@ $theme: ( card-border-color: #e7ecef, card-header-border-width: 0, + link-color: #5dcfe3, + link-color-hover: #7dcfe3, + link-color-visited: link-color, + menu-item-separator: separator, actions-separator: #f1f4f5, From d22dd9858e116e6476d658fad56ac8415c24ae76 Mon Sep 17 00:00:00 2001 From: Denis Strigo Date: Mon, 18 Jun 2018 19:36:48 +0300 Subject: [PATCH 7/7] feat(theme): update corporate theme --- .../layout/_layout.component.theme.scss | 4 ++-- .../theme/styles/global/bootstrap/_buttons.scss | 5 +++++ src/framework/theme/styles/themes/_corporate.scss | 15 ++++++++++----- src/framework/theme/styles/themes/_default.scss | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/framework/theme/components/layout/_layout.component.theme.scss b/src/framework/theme/components/layout/_layout.component.theme.scss index a9c3262f5d..41447f60a6 100644 --- a/src/framework/theme/components/layout/_layout.component.theme.scss +++ b/src/framework/theme/components/layout/_layout.component.theme.scss @@ -170,10 +170,10 @@ border-top: 1px solid nb-theme(footer-separator); a { - color: nb-theme(footer-fg); + color: nb-theme(footer-fg-highlight); @include hover-focus-active { - color: nb-theme(footer-fg); + color: nb-theme(footer-fg-highlight); } } } diff --git a/src/framework/theme/styles/global/bootstrap/_buttons.scss b/src/framework/theme/styles/global/bootstrap/_buttons.scss index bc48e80e53..752faeef4d 100644 --- a/src/framework/theme/styles/global/bootstrap/_buttons.scss +++ b/src/framework/theme/styles/global/bootstrap/_buttons.scss @@ -28,6 +28,11 @@ color: nb-theme(btn-fg); cursor: nb-theme(btn-cursor); } + + &:not(:disabled):not(.disabled) { + cursor: nb-theme(btn-cursor); + } + @include btn-md(); } diff --git a/src/framework/theme/styles/themes/_corporate.scss b/src/framework/theme/styles/themes/_corporate.scss index 666fbb1e60..8a50636ab4 100644 --- a/src/framework/theme/styles/themes/_corporate.scss +++ b/src/framework/theme/styles/themes/_corporate.scss @@ -41,6 +41,8 @@ $theme: ( layout-padding: 2.5rem 2.5rem 0.75rem 1.5rem, + border-color: #e7ecef, + menu-font-weight: font-weight-bolder, menu-fg: color-fg-text, menu-bg: #e3e9ee, @@ -70,7 +72,7 @@ $theme: ( btn-hero-info-degree: btn-hero-degree, btn-hero-danger-degree: btn-hero-degree, btn-hero-secondary-degree: btn-hero-degree, - btn-hero-glow-size: 0 0 10px 0, + btn-hero-glow-size: 0 0 20px 0, btn-hero-primary-glow-size: btn-hero-glow-size, btn-hero-success-glow-size: btn-hero-glow-size, btn-hero-warning-glow-size: btn-hero-glow-size, @@ -81,17 +83,17 @@ $theme: ( card-shadow: none, card-border-width: 1px, - card-border-color: #e7ecef, + card-border-color: border-color, card-header-border-width: 0, link-color: #5dcfe3, link-color-hover: #7dcfe3, link-color-visited: link-color, - menu-item-separator: separator, - actions-separator: #f1f4f5, + modal-separator: border-color, + tabs-selected: color-primary, tabs-separator: #ebecee, @@ -99,8 +101,11 @@ $theme: ( route-tabs-selected: color-primary, + popover-border: color-primary, + footer-shadow: none, - footer-separator: #e7ecef, + footer-separator: border-color, + footer-fg-highlight: #2a2a2a, ); // register the theme diff --git a/src/framework/theme/styles/themes/_default.scss b/src/framework/theme/styles/themes/_default.scss index 2e145595d7..25cd928059 100644 --- a/src/framework/theme/styles/themes/_default.scss +++ b/src/framework/theme/styles/themes/_default.scss @@ -128,6 +128,7 @@ $theme: ( footer-height: 4.725rem, footer-padding: 1.25rem, footer-fg: color-fg-heading, + footer-fg-highlight: color-fg-heading, footer-bg: color-bg, footer-separator: separator, footer-shadow: shadow,