Skip to content

Commit

Permalink
feat(theme): cosmic update (#1420)
Browse files Browse the repository at this point in the history
  • Loading branch information
nnixaa authored and yggg committed May 27, 2019
1 parent 34166a4 commit ee07fbc
Show file tree
Hide file tree
Showing 21 changed files with 617 additions and 676 deletions.
1 change: 1 addition & 0 deletions src/framework/theme/components/button/_button-filled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
&[disabled] {
background-color: nb-theme(button-filled-#{$status}-disabled-background-color);
border-color: nb-theme(button-filled-#{$status}-disabled-border-color);
color: nb-theme(button-filled-#{$status}-disabled-text-color);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/framework/theme/components/button/_button-hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
$left-disabled-color: nb-theme(button-hero-#{$status}-disabled-left-background-color);
$right-disabled-color: nb-theme(button-hero-#{$status}-disabled-right-background-color);
background-image: linear-gradient(to right, $left-disabled-color, $right-disabled-color);
color: nb-theme(button-hero-#{$status}-disabled-text-color);
}

&.button-pulse {
Expand Down
1 change: 1 addition & 0 deletions src/framework/theme/components/select/_select-filled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
&[disabled] {
background-color: nb-theme(select-filled-#{$status}-disabled-background-color);
border-color: nb-theme(select-filled-#{$status}-disabled-border-color);
color: nb-theme(select-filled-#{$status}-disabled-text-color);
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/framework/theme/components/select/_select-outline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
&:hover {
border-color: nb-theme(select-outline-#{$status}-hover-border-color);
}
&[disabled] {
border-color: nb-theme(select-outline-#{$status}-disabled-border-color);
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
}

.options-list-container {
box-shadow: nb-theme(select-options-list-shadow);
overflow: hidden;

& > .options-list {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@mixin nb-toast-theme() {
nb-toast {
background-color: nb-theme(toastr-background);
background-color: nb-theme(toastr-background-color);
border-color: nb-theme(toastr-border-color);
border-style: nb-theme(toastr-border-style);
border-width: nb-theme(toastr-border-width);
Expand All @@ -17,7 +17,7 @@
color: nb-theme(toastr-text-color);

&.destroy-by-click:hover {
background: nb-theme(toastr-destroyable-hover-background);
background: nb-theme(toastr-destroyable-hover-background-color);
border-color: nb-theme(toastr-destroyable-hover-border-color);
}

Expand Down Expand Up @@ -53,17 +53,17 @@

@each $status in nb-get-statuses() {
nb-toast.status-#{$status} {
background: nb-theme(toastr-#{$status}-background);
background: nb-theme(toastr-#{$status}-background-color);
border-color: nb-theme(toastr-#{$status}-border-color);
color: nb-theme(toastr-#{$status}-text-color);

&.destroy-by-click:hover {
background: nb-theme(toastr-destroyable-hover-#{$status}-background);
background: nb-theme(toastr-destroyable-hover-#{$status}-background-color);
border-color: nb-theme(toastr-destroyable-hover-#{$status}-border-color);
}

.icon-container {
background: nb-theme(toastr-icon-#{$status}-background);
background: nb-theme(toastr-icon-#{$status}-background-color);
color: nb-theme(toastr-icon-#{$status}-color);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

@mixin nb-tree-grid-sort-header-theme() {
.nb-tree-grid-header-change-sort-button {
background: nb-theme(tree-grid-sort-header-button-background);
background: nb-theme(tree-grid-sort-header-button-background-color);
border: nb-theme(tree-grid-sort-header-button-border);
padding: nb-theme(tree-grid-sort-header-button-padding);
color: inherit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

.nb-tree-grid-header-row {
background: nb-theme(tree-grid-header-background);
background: nb-theme(tree-grid-header-background-color);
color: nb-theme(tree-grid-header-text-color);
font-family: nb-theme(tree-grid-header-text-font-family);
font-size: nb-theme(tree-grid-header-text-font-size);
Expand All @@ -29,7 +29,7 @@
}

.nb-tree-grid-footer-row {
background: nb-theme(tree-grid-footer-background);
background: nb-theme(tree-grid-footer-background-color);
color: nb-theme(tree-grid-footer-text-color);
font-family: nb-theme(tree-grid-footer-text-font-family);
font-size: nb-theme(tree-grid-footer-text-font-size);
Expand All @@ -38,17 +38,17 @@
}

.nb-tree-grid-row {
background: nb-theme(tree-grid-row-background);
background: nb-theme(tree-grid-row-background-color);
color: nb-theme(tree-grid-row-text-color);
font-family: nb-theme(tree-grid-row-text-font-family);
font-size: nb-theme(tree-grid-row-text-font-size);
font-weight: nb-theme(tree-grid-row-text-font-weight);
line-height: nb-theme(tree-grid-row-text-line-height);
&:hover {
background: nb-theme(tree-grid-row-hover-background);
background: nb-theme(tree-grid-row-hover-background-color);
}
&:nth-child(2n):not(:hover) {
background-color: nb-theme(tree-grid-row-even-background);
background-color: nb-theme(tree-grid-row-even-background-color);
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@mixin nb-typography {
h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 {
color: nb-theme(text-dark-color);
color: nb-theme(text-color);
}

@each $size in (1, 2, 3, 4, 5, 6) {
Expand Down
Loading

0 comments on commit ee07fbc

Please sign in to comment.