Skip to content

Commit

Permalink
Merge branch 'release/2.0.6' into 1.7.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Prestarocket committed Jan 23, 2019
2 parents c1a4fc4 + c32d574 commit 7e46f4b
Show file tree
Hide file tree
Showing 60 changed files with 511 additions and 1,624 deletions.
2 changes: 2 additions & 0 deletions _dev/css/bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ $theme-colors: map-remove($theme-colors,"primary","secondary","success","info","
@import "~bootstrap/scss/media";
@import "~bootstrap/scss/list-group";
@import "~bootstrap/scss/close";
@import "~bootstrap/scss/toasts";
@import "~bootstrap/scss/modal";
@import "~bootstrap/scss/tooltip";
@import "~bootstrap/scss/popover";
Expand All @@ -68,6 +69,7 @@ $theme-colors: (
"light": $light,
"dark": $dark
);
@import "~bootstrap/scss/spinners";
@import "~bootstrap/scss/utilities";
@import "~bootstrap/scss/print";

Expand Down
24 changes: 0 additions & 24 deletions _dev/css/components/block-reassurance.scss

This file was deleted.

Loading

0 comments on commit 7e46f4b

Please sign in to comment.