From 91dcb8acf00386445d6c2ae3ab8571965208112f Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 28 Mar 2016 13:29:45 -0500 Subject: [PATCH] #886 - more prefix renaming, update bootstrap docs --- docs/assets/js/src/index.js | 2 +- docs/assets/scss/{mdb => bmd}/_booticon.scss | 0 docs/assets/scss/{mdb => bmd}/_clipboard-js.scss | 0 docs/assets/scss/{mdb => bmd}/_component-examples.scss | 0 docs/assets/scss/{mdb => bmd}/_drawer.scss | 0 docs/assets/scss/{mdb => bmd}/_sidebar.scss | 0 docs/assets/scss/docs.scss | 10 +++++----- js/src/util.js | 2 +- scss/_buttons.scss | 8 ++++---- scss/_variables.scss | 6 +++--- 10 files changed, 14 insertions(+), 14 deletions(-) rename docs/assets/scss/{mdb => bmd}/_booticon.scss (100%) rename docs/assets/scss/{mdb => bmd}/_clipboard-js.scss (100%) rename docs/assets/scss/{mdb => bmd}/_component-examples.scss (100%) rename docs/assets/scss/{mdb => bmd}/_drawer.scss (100%) rename docs/assets/scss/{mdb => bmd}/_sidebar.scss (100%) diff --git a/docs/assets/js/src/index.js b/docs/assets/js/src/index.js index 6d3243f0..275f0c3b 100644 --- a/docs/assets/js/src/index.js +++ b/docs/assets/js/src/index.js @@ -2,7 +2,7 @@ import Style from './style' import Clipboard from 'clipboard' import anchors from 'anchor-js' -// import all the mdb code +// import all the bmd code import '../../../../js/src/index' // eslint-disable-line no-unused-vars class Application { diff --git a/docs/assets/scss/mdb/_booticon.scss b/docs/assets/scss/bmd/_booticon.scss similarity index 100% rename from docs/assets/scss/mdb/_booticon.scss rename to docs/assets/scss/bmd/_booticon.scss diff --git a/docs/assets/scss/mdb/_clipboard-js.scss b/docs/assets/scss/bmd/_clipboard-js.scss similarity index 100% rename from docs/assets/scss/mdb/_clipboard-js.scss rename to docs/assets/scss/bmd/_clipboard-js.scss diff --git a/docs/assets/scss/mdb/_component-examples.scss b/docs/assets/scss/bmd/_component-examples.scss similarity index 100% rename from docs/assets/scss/mdb/_component-examples.scss rename to docs/assets/scss/bmd/_component-examples.scss diff --git a/docs/assets/scss/mdb/_drawer.scss b/docs/assets/scss/bmd/_drawer.scss similarity index 100% rename from docs/assets/scss/mdb/_drawer.scss rename to docs/assets/scss/bmd/_drawer.scss diff --git a/docs/assets/scss/mdb/_sidebar.scss b/docs/assets/scss/bmd/_sidebar.scss similarity index 100% rename from docs/assets/scss/mdb/_sidebar.scss rename to docs/assets/scss/bmd/_sidebar.scss diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss index a4a625e2..bc03573d 100644 --- a/docs/assets/scss/docs.scss +++ b/docs/assets/scss/docs.scss @@ -88,8 +88,8 @@ $bd-info: $brand-info; // #5bc0de; @import 'anchor'; // BMD customizatinos -@import 'mdb/booticon'; -@import 'mdb/component-examples'; -@import 'mdb/clipboard-js'; -@import 'mdb/sidebar'; -@import 'mdb/drawer'; +@import 'bmd/booticon'; +@import 'bmd/component-examples'; +@import 'bmd/clipboard-js'; +@import 'bmd/sidebar'; +@import 'bmd/drawer'; diff --git a/js/src/util.js b/js/src/util.js index f540f80e..3cd2e77e 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -21,7 +21,7 @@ const Util = (() => { return false } - let el = document.createElement('mdb') + let el = document.createElement('bmd') for (let name in TransitionEndEvent) { if (el.style[name] !== undefined) { diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 4c447bcb..e2b62d70 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -1,6 +1,6 @@ // specification: https://www.google.com/design/spec/components/buttons.html -// mdb default buttons are flat by default +// bmd default buttons are flat by default .btn { position: relative; margin-bottom: $mdb-btn-margin-bottom; // just enough room so that focus shadows aren't covered up @@ -114,8 +114,8 @@ //margin: 1px; // use z-index focus/hover/active instead. This is not called for in the spec, but it ensures room for the box-shadow, which is nice to have. //.material-icons { - // top: ($mdb-btn-icon-size-sm - $mdb-btn-fab-font-size) / 2; - // left: ($mdb-btn-icon-size-sm - $mdb-btn-fab-font-size) / 2; + // top: ($bmd-btn-icon-size-sm - $bmd-btn-fab-font-size) / 2; + // left: ($bmd-btn-icon-size-sm - $bmd-btn-fab-font-size) / 2; //} } } @@ -135,7 +135,7 @@ height: $mdb-btn-icon-size-sm; .material-icons { - //$position: ($mdb-btn-icon-size-sm - $mdb-btn-icon-font-size-sm) / 2; + //$position: ($bmd-btn-icon-size-sm - $bmd-btn-icon-font-size-sm) / 2; //top: $position; //left: $position; width: $mdb-btn-icon-font-size-sm; diff --git a/scss/_variables.scss b/scss/_variables.scss index 9c5e401b..5fbff0a2 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -2,7 +2,7 @@ @import "variables/colors"; @import "variables/shadow"; -// redefine ? TODO: do we need this mdb variant? This is used as $body-color +// redefine ? TODO: do we need this bmd variant? This is used as $body-color $gray-lighter: rgba($black, 0.12) !default; $gray-light: rgba($black, 0.26) !default; $gray: rgba($black, .54) !default; // spec color @@ -56,7 +56,7 @@ $icon-color: rgba($black, 0.5) !default; //--- // FIXME: Similar but not quite the same as Bootstrap variables -// FIXME: these need to either a) be converted to $mdb- or b) converted to bs variables +// FIXME: these need to either a) be converted to $bmd- or b) converted to bs variables //--- // -------------------- @@ -64,7 +64,7 @@ $icon-color: rgba($black, 0.5) !default; $mdb-bmd-label-static-size-ratio: 75 / 100 !default; $mdb-help-size-ratio: 75 / 100 !default; -//$mdb-form-control-bg-repeat-y: repeat-y !default; // it could work with no-repeat, but on Safari it's bugged and repeat-y is needed, but repeat-y is bugged on the warning icon. +//$bmd-form-control-bg-repeat-y: repeat-y !default; // it could work with no-repeat, but on Safari it's bugged and repeat-y is needed, but repeat-y is bugged on the warning icon. $mdb-form-control-bg-repeat-y: no-repeat !default; $mdb-form-control-bg-position: center bottom, center calc(100% - 1px) !default; $mdb-form-control-bg-size: 0 100%, 100% 100% !default;