From ed03a94dd076454fe67903c22441fdc374f7449e Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Thu, 3 Dec 2015 14:28:04 -0600 Subject: [PATCH] #755 wells and panels removed in bs4 --- docs/components/.READONLY.txt | 6 ++++ scss/includes/_bootstrap-material-design.scss | 2 -- scss/includes/_panels.scss | 23 --------------- scss/includes/_scaffolding.scss | 1 - scss/includes/_welljumbo.scss | 28 ------------------- 5 files changed, 6 insertions(+), 54 deletions(-) create mode 100644 docs/components/.READONLY.txt delete mode 100644 scss/includes/_panels.scss delete mode 100644 scss/includes/_welljumbo.scss diff --git a/docs/components/.READONLY.txt b/docs/components/.READONLY.txt new file mode 100644 index 00000000..42548f0b --- /dev/null +++ b/docs/components/.READONLY.txt @@ -0,0 +1,6 @@ +DO NOT edit files in this folder. + +These files are copied using + grunt copy:bs-docs-components + +This is done to keep samples in sync with the upstream bs4. diff --git a/scss/includes/_bootstrap-material-design.scss b/scss/includes/_bootstrap-material-design.scss index 08a18b1b..aba0e3d0 100644 --- a/scss/includes/_bootstrap-material-design.scss +++ b/scss/includes/_bootstrap-material-design.scss @@ -6,7 +6,6 @@ @import 'mixins'; @import 'scaffolding'; // include the material content given the mixins above (sass requirement for inclusion order of mixins) -@import 'welljumbo'; @import 'buttons'; @import 'checkboxes'; @import 'togglebutton'; @@ -22,7 +21,6 @@ @import 'popups'; @import 'cards'; @import 'dialogs'; -@import 'panels'; @import 'dividers'; @import 'themes'; @import 'plugins'; diff --git a/scss/includes/_panels.scss b/scss/includes/_panels.scss deleted file mode 100644 index 1483cbdc..00000000 --- a/scss/includes/_panels.scss +++ /dev/null @@ -1,23 +0,0 @@ - - -.panel { - border-radius: 2px; - border: 0; - - @include variations(unquote(".panel"), unquote(" > .panel-heading"), background-color, $grey-200); - @include shadow-z-1; -} - - -[class*="panel-"] > .panel-heading { - color: $mdb-text-color-light; - border: 0; -} -.panel-default, .panel:not([class*="panel-"]) { - > .panel-heading { - color: $mdb-text-color-primary; - } -} -.panel-footer { - background-color: $grey-200; -} diff --git a/scss/includes/_scaffolding.scss b/scss/includes/_scaffolding.scss index 0f1037f4..30f9cefc 100644 --- a/scss/includes/_scaffolding.scss +++ b/scss/includes/_scaffolding.scss @@ -9,7 +9,6 @@ body { // color: $mdb-text-color-light; // } // .modal, - // .panel-default, // .card { // &, // .form-control { diff --git a/scss/includes/_welljumbo.scss b/scss/includes/_welljumbo.scss deleted file mode 100644 index ac1f502b..00000000 --- a/scss/includes/_welljumbo.scss +++ /dev/null @@ -1,28 +0,0 @@ - - -body { - .container, - .container-fluid { - - .well.well-sm { - padding: 10px; - } - .well.well-lg { - padding: 26px; - } - .well, - .jumbotron { - - background-color: #fff; - padding: 19px; - margin-bottom: 20px; - @include shadow-z-2(); - border-radius: $border-radius-base; - border: 0; - p { - font-weight: 300; - } - @include variations(unquote(""), unquote(""), background-color, $white); - } - } -}