mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-11-26 11:34:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

config mdbLabel renamed to label

Browse Source
This commit is contained in:
Kevin Ross 2015-12-17 09:47:55 -06:00
parent aa7db4b80d
commit 6e49b4d184
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/baseInput.js
View File

@ -30,7 +30,7 @@ const BaseInput = (($) => {
create: true, // create a wrapper if form-group not found create: true, // create a wrapper if form-group not found
required: true // not recommended to turn this off, only used for inline components required: true // not recommended to turn this off, only used for inline components
}, },
mdbLabel: { label: {
required: false, required: false,
// Prioritized find order for resolving the label to be used as an mdb-label if not specified in the markup // Prioritized find order for resolving the label to be used as an mdb-label if not specified in the markup
@ -228,13 +228,13 @@ const BaseInput = (($) => {
let label = this.$mdbFormGroup.find(Selector.MDB_LABEL_WILDCARD) let label = this.$mdbFormGroup.find(Selector.MDB_LABEL_WILDCARD)
if (label === undefined || label.length === 0) { if (label === undefined || label.length === 0) {
// we need to find it based on the configured selectors // we need to find it based on the configured selectors
label = this.findMdbLabel(this.config.mdbLabel.required) label = this.findMdbLabel(this.config.label.required)
if (label === undefined || label.length === 0) { if (label === undefined || label.length === 0) {
// no label found, and finder did not require one // no label found, and finder did not require one
} else { } else {
// a candidate label was found, add the configured default class name // a candidate label was found, add the configured default class name
label.addClass(this.config.mdbLabel.className) label.addClass(this.config.label.className)
} }
} }
@ -246,7 +246,7 @@ const BaseInput = (($) => {
let label = null let label = null
// use the specified selector order // use the specified selector order
for (let selector of this.config.mdbLabel.selectors) { for (let selector of this.config.label.selectors) {
if ($.isFunction(selector)) { if ($.isFunction(selector)) {
label = selector(this) label = selector(this)
} else { } else {

2
js/src/baseSelection.js
View File

@ -9,7 +9,7 @@ const BaseSelection = (($) => {
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
const Default = { const Default = {
mdbLabel: { label: {
required: false required: false
// Prioritized find order for resolving the label to be used as an mdb-label if not specified in the markup // Prioritized find order for resolving the label to be used as an mdb-label if not specified in the markup

2
js/src/bootstrapMaterialDesign.js vendored
View File

@ -31,7 +31,7 @@ const BootstrapMaterialDesign = (($) => {
const Default = { const Default = {
global: { global: {
validate: false, validate: false,
mdbLabel: { label: {
className: 'mdb-label-static' // default style of label to be used if not specified in the html markup className: 'mdb-label-static' // default style of label to be used if not specified in the html markup
} }
}, },

1
scss/_buttons.scss
View File

@ -72,6 +72,7 @@
} }
} }
// https://www.google.com/design/spec/components/buttons-floating-action-button.html
&.btn-fab { &.btn-fab {
// see above for color variations // see above for color variations
position: relative; position: relative;

4
scss/_radios.scss
View File

@ -3,8 +3,8 @@ label.radio-inline {
position: relative; position: relative;
padding-left: $mdb-radio-size + $mdb-radio-label-padding; // absolutely positioned so add the radio size padding-left: $mdb-radio-size + $mdb-radio-label-padding; // absolutely positioned so add the radio size
span.mdb-radio-outer-circle, // don't use generic span, it may conflict with user markup #693 .mdb-radio-outer-circle, // don't use generic span, it may conflict with span in user markup #693
span.mdb-radio-inner-circle { .mdb-radio-inner-circle {
position: absolute; position: absolute;
top: calc-top($line-height, $font-size-base, $mdb-radio-size); // vertical center of line-height top: calc-top($line-height, $font-size-base, $mdb-radio-size); // vertical center of line-height
left: 0; left: 0;