Skip to content

Commit

Permalink
feat(bootstrap): update nebular/bootstrap to Eva (#1507)
Browse files Browse the repository at this point in the history
BREAKING CHANGES:
Bootstrap checkbox and radio are removed now, use Nebular Checkbox and Nebular Radio with better theming support.
  • Loading branch information
nnixaa committed May 27, 2019
1 parent 64f94c1 commit 2ff1171
Show file tree
Hide file tree
Showing 23 changed files with 454 additions and 1,901 deletions.
49 changes: 29 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"@angular/cli": "8.0.0-rc.2",
"@angular/compiler-cli": "8.0.0-rc.2",
"@angular/language-service": "8.0.0-rc.2",
"@ng-bootstrap/ng-bootstrap": "^4.1.3",
"@schematics/angular": "^8.0.0-rc.2",
"@types/gulp": "3.8.36",
"@types/highlight.js": "9.12.2",
Expand Down
2 changes: 1 addition & 1 deletion src/framework/bootstrap/styles/_button-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*/

@import 'default-buttons';
@import 'status-buttons';

@mixin btn-group-primary-separator() {
@include nb-theme(color-primary-600);
Expand Down
38 changes: 15 additions & 23 deletions src/framework/bootstrap/styles/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,32 @@

@import 'shape-buttons';
@import 'size-buttons';
@import 'default-buttons';
@import 'status-buttons';
@import 'hero-buttons';
@import 'outline-buttons';

@mixin nb-b-buttons-theme() {

.btn {
color: nb-theme(btn-fg);
text-transform: uppercase;
letter-spacing: 0.4px;
font-weight: nb-theme(font-weight-bolder);
font-family: nb-theme(btn-font-family);
border: 2px solid transparent;
transition: none;
cursor: nb-theme(btn-cursor);
cursor: nb-theme(button-cursor);
font-family: nb-theme(button-text-font-family);
font-weight: nb-theme(button-text-font-weight);

&:focus, .focus,
&:hover, .hover,
&:active, .active {
color: nb-theme(btn-fg);
cursor: nb-theme(btn-cursor);
&:focus {
box-shadow: 0 0 0 nb-theme(button-outline-width) nb-theme(button-outline-color);
outline: none;
}

&:not(:disabled):not(.disabled) {
cursor: nb-theme(btn-cursor);
&[disabled] {
cursor: nb-theme(button-disabled-cursor);
}

@include btn-md();
@include b-btn-size(medium);
}

@include btn-shape();
@include btn-size();

@include btn-default();
@include btn-hero();
@include btn-outline();
@include b-btn-shapes();
@include b-btn-sizes();
@include b-btn-statuses();
@include b-btn-heros();
@include b-btn-outlines();
}
118 changes: 0 additions & 118 deletions src/framework/bootstrap/styles/_custom-forms.scss

This file was deleted.

Loading

0 comments on commit 2ff1171

Please sign in to comment.