From 04ab7ddc41a48061dd3cd4d1a583e2185833e927 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Sat, 21 Nov 2015 08:56:29 -0600 Subject: [PATCH] @mdb- namespace known material variables before beginning to use bs variables directly --- less/_alerts.less | 6 +- less/_buttons.less | 8 +-- less/_cards.less | 6 +- less/_checkboxes.less | 36 +++++----- less/_inputs-size.less | 105 +++++++++++++-------------- less/_inputs.less | 52 +++++++------- less/_mixins-fullpalette.less | 90 +++++++++++------------ less/_mixins-shared.less | 12 ++-- less/_mixins.less | 90 +++++++++++------------ less/_navbar.less | 20 +++--- less/_popups.less | 6 +- less/_radios.less | 16 ++--- less/_togglebutton.less | 12 ++-- less/_variables.less | 130 ++++++++++++++++------------------ less/material.less | 3 + 15 files changed, 296 insertions(+), 296 deletions(-) diff --git a/less/_alerts.less b/less/_alerts.less index 0f4c12f5..224e0903 100755 --- a/less/_alerts.less +++ b/less/_alerts.less @@ -4,11 +4,11 @@ // SASS conversion note: please mirror any content change in _mixins-shared.scss alert-variations-content .generic-variations(~"", @darkbg-text, { - background-color: @material-color; - color: @material-text-color; + background-color: @mdb-color; + color: @mdb-text-color; a, .alert-link { - color: @material-text-color; + color: @mdb-text-color; } }); diff --git a/less/_buttons.less b/less/_buttons.less index 5afc20f2..7fe52892 100644 --- a/less/_buttons.less +++ b/less/_buttons.less @@ -34,22 +34,22 @@ // BTN hover effect // SASS conversion note: please mirror any content change in _mixins-shared.scss button-variations-content .generic-variations(~":hover:not(.btn-link):not(.btn-flat)", @btn-default, { - background-color: contrast(@material-color, darken(@material-color, 4%), lighten(@material-color, 4%), @contrast-factor); + background-color: contrast(@mdb-color, darken(@mdb-color, 4%), lighten(@mdb-color, 4%), @contrast-factor); }); // BTN active effect // SASS conversion note: please mirror any content change in _mixins-shared.scss button-variations-content .generic-variations(~":active:not(.btn-link):not(.btn-flat)", @btn-default, { - background-color: contrast(@material-color, darken(@material-color, 6%), lighten(@material-color, 6%), @contrast-factor); + background-color: contrast(@mdb-color, darken(@mdb-color, 6%), lighten(@mdb-color, 6%), @contrast-factor); }); // BTN .active effect // SASS conversion note: please mirror any content change in _mixins-shared.scss button-variations-content .generic-variations(~".active:not(.btn-link):not(.btn-flat)", @btn-default, { - background-color: contrast(@material-color, darken(@material-color, 6%), lighten(@material-color, 6%), @contrast-factor); + background-color: contrast(@mdb-color, darken(@mdb-color, 6%), lighten(@mdb-color, 6%), @contrast-factor); }); // BTN flat hover effect // SASS conversion note: please mirror any content change in _mixins-shared.scss bg-color-variations-content .generic-variations(~".btn-flat:hover:not(.btn-link)", @btn-default, { - background-color: fade(@material-color, 20%); + background-color: fade(@mdb-color, 20%); }); } diff --git a/less/_cards.less b/less/_cards.less index 2fb0cd2c..52813af1 100644 --- a/less/_cards.less +++ b/less/_cards.less @@ -20,8 +20,8 @@ border-radius: 2px; - color: @card-body-text; - background: @card-body-background; + color: @mdb-card-body-text; + background: @mdb-card-body-background; .shadow-z-2(); @@ -40,7 +40,7 @@ position: absolute; bottom: 16px; left: 18px; - color: @card-image-headline; + color: @mdb-card-image-headline; font-size: 2em; } } diff --git a/less/_checkboxes.less b/less/_checkboxes.less index abf4d434..06c82a7b 100644 --- a/less/_checkboxes.less +++ b/less/_checkboxes.less @@ -12,23 +12,23 @@ .form-group { //// default label size/location - .form-group-checkbox-variant(@md-input-font-size-base, @md-input-line-height-base); + .form-group-checkbox-variant(@mdb-input-font-size-base, @mdb-input-line-height-base); // sm label size/location &.form-group-sm { - .form-group-checkbox-variant(@md-input-font-size-small, @md-input-line-height-small); + .form-group-checkbox-variant(@mdb-input-font-size-small, @mdb-input-line-height-small); } // lg label size/location &.form-group-lg { - .form-group-checkbox-variant(@md-input-font-size-large, @md-input-line-height-large); + .form-group-checkbox-variant(@mdb-input-font-size-large, @mdb-input-line-height-large); } .checkbox { label { cursor: pointer; padding-left: 0; // Reset for Bootstrap rule - color: @checkbox-label-color; + color: @mdb-checkbox-label-color; } // Hide native checkbox @@ -54,8 +54,8 @@ left: 0; content: ""; background-color: rgba(0,0,0,.84); - height: @checkbox-size; - width: @checkbox-size; + height: @mdb-checkbox-size; + width: @mdb-checkbox-size; border-radius: 100%; z-index: 1; opacity: 0; @@ -66,9 +66,9 @@ .check { position: relative; display: inline-block; - width: @checkbox-size; - height: @checkbox-size; - border: 2px solid @checkbox-border-color; + width: @mdb-checkbox-size; + height: @mdb-checkbox-size; + border: 2px solid @mdb-checkbox-border-color; border-radius: 2px; overflow: hidden; z-index: 1; @@ -90,7 +90,7 @@ 0 0 0 0, 0 0 0 0, 0 0 0 0 inset; - animation: checkbox-off @checkbox-animation-check forwards; + animation: checkbox-off @mdb-checkbox-animation-check forwards; } } @@ -105,22 +105,22 @@ 0px 32px 0 20px, -5px 5px 0 10px, 20px -12px 0 11px; - animation: checkbox-on @checkbox-animation-check forwards; + animation: checkbox-on @mdb-checkbox-animation-check forwards; } input[type=checkbox]:not(:checked) + .checkbox-material:before { - animation: rippleOff @checkbox-animation-ripple; + animation: rippleOff @mdb-checkbox-animation-ripple; } input[type=checkbox]:checked + .checkbox-material:before { - animation: rippleOn @checkbox-animation-ripple; + animation: rippleOn @mdb-checkbox-animation-ripple; } // Ripple effect on click input[type=checkbox]:not(:checked) + .checkbox-material .check:after { - animation: rippleOff @checkbox-animation-ripple forwards; + animation: rippleOff @mdb-checkbox-animation-ripple forwards; } input[type=checkbox]:checked + .checkbox-material .check:after { - animation: rippleOn @checkbox-animation-ripple forwards; + animation: rippleOn @mdb-checkbox-animation-ripple forwards; } // Style for disabled inputs @@ -137,9 +137,9 @@ } .variations(~" input[type=checkbox]:checked + .checkbox-material .check:after", background-color, @success); - .variations(~" input[type=checkbox]:checked + .checkbox-material .check:before", color, @checkbox-checked-color); - .variations(~" input[type=checkbox]:checked + .checkbox-material .check", color, @checkbox-checked-color); - .variations(~" input[type=checkbox]:checked + .checkbox-material .check", border-color, @checkbox-checked-color); + .variations(~" input[type=checkbox]:checked + .checkbox-material .check:before", color, @mdb-checkbox-checked-color); + .variations(~" input[type=checkbox]:checked + .checkbox-material .check", color, @mdb-checkbox-checked-color); + .variations(~" input[type=checkbox]:checked + .checkbox-material .check", border-color, @mdb-checkbox-checked-color); } } diff --git a/less/_inputs-size.less b/less/_inputs-size.less index 01fd9ede..93546703 100644 --- a/less/_inputs-size.less +++ b/less/_inputs-size.less @@ -8,22 +8,22 @@ // -------------------------------------------------- legend { - margin-bottom: @md-input-line-height-computed; - font-size: (@md-input-font-size-base * 1.5); + margin-bottom: @mdb-input-line-height-computed; + font-size: (@mdb-input-font-size-base * 1.5); } // Adjust output element output { - padding-top: (@md-input-padding-base-vertical + 1); - font-size: @md-input-font-size-base; - line-height: @md-input-line-height-base; + padding-top: (@mdb-input-padding-base-vertical + 1); + font-size: @mdb-input-font-size-base; + line-height: @mdb-input-line-height-base; } .form-control { - height: @md-input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) - padding: @md-input-padding-base-vertical @md-input-padding-base-horizontal; - font-size: @md-input-font-size-base; - line-height: @md-input-line-height-base; + height: @mdb-input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) + padding: @mdb-input-padding-base-vertical @mdb-input-padding-base-horizontal; + font-size: @mdb-input-font-size-base; + line-height: @mdb-input-line-height-base; } // Special styles for iOS temporal inputs @@ -41,17 +41,17 @@ output { input[type="datetime-local"], input[type="month"] { &.form-control { - line-height: @md-input-height-base; + line-height: @mdb-input-height-base; } &.input-sm, .input-group-sm & { - line-height: @md-input-height-small; + line-height: @mdb-input-height-small; } &.input-lg, .input-group-lg & { - line-height: @md-input-height-large; + line-height: @mdb-input-height-large; } } } @@ -60,7 +60,7 @@ output { .checkbox { label { - min-height: @md-input-line-height-computed; // Ensure the input doesn't jump when there is no text + min-height: @mdb-input-line-height-computed; // Ensure the input doesn't jump when there is no text } } @@ -72,9 +72,9 @@ output { .form-control-static { // Size it appropriately next to real form controls - padding-top: (@md-input-padding-base-vertical + 1); - padding-bottom: (@md-input-padding-base-vertical + 1); - min-height: (@md-input-line-height-computed + @md-input-font-size-base); + padding-top: (@mdb-input-padding-base-vertical + 1); + padding-bottom: (@mdb-input-padding-base-vertical + 1); + min-height: (@mdb-input-line-height-computed + @mdb-input-font-size-base); } @@ -84,11 +84,12 @@ output { // horizontal sizing, wrap controls in the predefined grid classes. `