Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(theme): remove use of scss-functions #1256

Merged
merged 2 commits into from
Mar 21, 2019
Merged

refactor(theme): remove use of scss-functions #1256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe676be
refactor(theme): remove use of scss-functions
nnixaa Feb 21, 2019
7bcd5c7
fix(bootstrap): include style changes into bootstrap package
nnixaa Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/app/playground-components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,6 +1619,17 @@ export const PLAYGROUND_COMPONENTS: ComponentLink[] = [
},
],
},
{
path: 'typography',
children: [
{
path: 'typography-showcase.component',
link: '/typography/typography-showcase.component',
component: 'TypographyShowcaseComponent',
name: 'Typography Showcase',
},
],
},
{
path: 'bootstrap',
children: [
Expand Down
54 changes: 19 additions & 35 deletions src/framework/bootstrap/styles/_default-buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,9 @@
}
}

@function btn-hover-color($bg, $percentage: 14%) {
@return tint(nb-theme($bg), $percentage);
}

@function btn-focus-color($bg, $percentage: 14%) {
@return tint(nb-theme($bg), $percentage);
}

@function btn-active-color($bg, $percentage: 14%) {
@return shade(nb-theme($bg), $percentage);
}

@mixin btn-outline-focus($focus) {
&:focus,
&.focus {
color: nb-theme(btn-outline-focus-fg);
border-color: $focus;
box-shadow: none;
}
Expand Down Expand Up @@ -151,90 +138,87 @@

// Focus
@mixin btn-primary-focus() {
@include btn-focus(btn-focus-color(btn-primary-bg));
@include btn-focus(nb-theme(btn-primary-hover-bg));
}

@mixin btn-success-focus() {
@include btn-focus(btn-focus-color(btn-success-bg));
@include btn-focus(nb-theme(btn-success-hover-bg));
}

@mixin btn-warning-focus() {
@include btn-focus(btn-focus-color(btn-warning-bg));
@include btn-focus(nb-theme(btn-warning-hover-bg));
}

@mixin btn-info-focus() {
@include btn-focus(btn-focus-color(btn-info-bg));
@include btn-focus(nb-theme(btn-info-hover-bg));
}

@mixin btn-danger-focus() {
@include btn-focus(btn-focus-color(btn-danger-bg));
@include btn-focus(nb-theme(btn-danger-hover-bg));
}

@mixin btn-secondary-focus() {
@include btn-outline-focus(btn-focus-color(btn-secondary-border, 20%));
@include btn-outline-focus(nb-theme(btn-secondary-hover-bg));
}


// Hover
@mixin btn-primary-hover() {
@include btn-hover(btn-hover-color(btn-primary-bg));
@include btn-hover(nb-theme(btn-primary-hover-bg));
}

@mixin btn-success-hover() {
@include btn-hover(btn-hover-color(btn-success-bg));
@include btn-hover(nb-theme(btn-success-hover-bg));
}

@mixin btn-warning-hover() {
@include btn-hover(btn-hover-color(btn-warning-bg));
@include btn-hover(nb-theme(btn-warning-hover-bg));
}

@mixin btn-info-hover() {
@include btn-hover(btn-hover-color(btn-info-bg));
@include btn-hover(nb-theme(btn-info-hover-bg));
}

@mixin btn-danger-hover() {
@include btn-hover(btn-hover-color(btn-danger-bg));
@include btn-hover(nb-theme(btn-danger-hover-bg));
}

@mixin btn-secondary-hover() {
@include btn-hover(btn-hover-color(btn-secondary-border));
@include btn-hover(nb-theme(btn-secondary-hover-bg));
}


// Active
@mixin btn-primary-active() {
@include btn-active(btn-active-color(btn-primary-bg));
@include btn-active(nb-theme(btn-primary-active-bg));
}

@mixin btn-success-active() {
@include btn-active(btn-active-color(btn-success-bg));
@include btn-active(nb-theme(btn-success-active-bg));
}

@mixin btn-warning-active() {
@include btn-active(btn-active-color(btn-warning-bg));
@include btn-active(nb-theme(btn-warning-active-bg));
}

@mixin btn-info-active() {
@include btn-active(btn-active-color(btn-info-bg));
@include btn-active(nb-theme(btn-info-active-bg));
}

@mixin btn-danger-active() {
@include btn-active(btn-active-color(btn-danger-bg));
@include btn-active(nb-theme(btn-danger-active-bg));
}

@mixin btn-secondary-active() {
@include btn-active(btn-active-color(btn-secondary-border));
@include btn-active(nb-theme(btn-secondary-active-bg));
}


// Disabled
@mixin btn-disabled() {
&:disabled, &.btn-disabled {
opacity: nb-theme(btn-disabled-opacity);
cursor: default;
}
}


@mixin btn-secondary-border() {
border: 2px solid nb-theme(btn-secondary-border);
}
Expand Down
4 changes: 2 additions & 2 deletions src/framework/bootstrap/styles/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
}

&:hover {
@include label(lighten(nb-theme(checkbox-checked-border-color), 10%), 1);
@include label(nb-theme(checkbox-checked-border-color), 1);
}

&:disabled {
Expand Down Expand Up @@ -216,7 +216,7 @@
}

&:hover {
@include label(lighten(nb-theme(checkbox-checked-border-color), 10%), 1);
@include label(nb-theme(checkbox-checked-border-color), 1);
}

&:disabled {
Expand Down
Loading