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

Merge branch 'master' into documentation-prototype

Browse Source
This commit is contained in:
Kevin Ross 2015-11-21 07:51:13 -06:00
commit 8d2a8f347c
13 changed files with 604 additions and 2398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gruntfile.js
View File

@ -95,6 +95,13 @@ module.exports = function (grunt) {
options: {
replacements: [
// convert bootstrap imports
{ // https://regex101.com/r/bM6cP0/2
pattern: /bower_components\/(bootstrap\/less\/)/gi,
replacement: "bower_components\/bootstrap-sass\/assets\/stylesheets\/bootstrap\/",
order: 2
},
// convert all shadow mixins
{ // https://regex101.com/r/sJ2lH4/1
pattern: /.shadow-z-(\d+)((?:-hover)?) {/gi,

3
bower.json
View File

@ -43,6 +43,7 @@
"license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md",
"dependencies": {
"jquery": "~2.1.1",
"bootstrap": "~3.3.5"
"bootstrap": "~3.3.5",
"bootstrap-sass": "~3.3.5"
}
}

2259
dist/css/material-fullpalette.css vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/css/material-fullpalette.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/material-fullpalette.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/material-fullpalette.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

663
dist/css/material.css vendored
View File

File diff suppressed because it is too large Load Diff

2
dist/css/material.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/material.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/material.min.css.map vendored
View File

File diff suppressed because one or more lines are too long

28
less/_inputs.less
View File

@ -1,6 +1,16 @@
@import '_inputs-size.less';
// usage: .form-group-validation-state(@input-danger);
// must be broken out for reuse - webkit selector breaks firefox
.label-position(@label-top, @static-font-size, @static-line-height) {
label.control-label {
top: @label-top;
left: 0;
// must repeat because the selector above is more specific than the general label sizing
font-size: @static-font-size;
line-height: @static-line-height;
}
}
.form-group-validation-state(@name, @color) {
&.@{name} { // e.g. has-error
@ -72,16 +82,12 @@
// static, focused, or autofill floating labels
&.label-static,
&.label-floating.is-focused,
&.label-floating:not(.is-empty),
&.label-floating input.form-control:-webkit-autofill {
& ~ label.control-label, // #559 webkit chrome autofill `.form-group.label-floating input.form-control:-webkit-autofill ~ label.control-label`
label.control-label {
top: @label-top;
left: 0;
// must repeat because the selector above is more specific than the general label sizing
font-size: @static-font-size;
line-height: @static-line-height;
}
&.label-floating:not(.is-empty) {
.label-position(@label-top, @static-font-size, @static-line-height);
}
// #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
&.label-floating input.form-control:-webkit-autofill ~ label.control-label {
.label-position(@label-top, @static-font-size, @static-line-height);
}
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "bootstrap-material-design",
"version": "0.4.2",
"version": "0.4.3",
"description": "Material Design for Bootstrap 3",
"main": "scripts/index.js",
"scripts": {

28
sass/_inputs.scss
View File

@ -2,7 +2,17 @@
@import '_inputs-size';
// usage: @include form-group-validation-state($input-danger);
// must be broken out for reuse - webkit selector breaks firefox
@mixin label-position($label-top, $static-font-size, $static-line-height){
label.control-label {
top: $label-top;
left: 0;
// must repeat because the selector above is more specific than the general label sizing
font-size: $static-font-size;
line-height: $static-line-height;
}
}
@mixin form-group-validation-state($name, $color){
&.#{$name} { // e.g. has-error
@ -75,16 +85,12 @@
// static, focused, or autofill floating labels
&.label-static,
&.label-floating.is-focused,
&.label-floating:not(.is-empty),
&.label-floating input.form-control:-webkit-autofill {
& ~ label.control-label, // #559 webkit chrome autofill `.form-group.label-floating input.form-control:-webkit-autofill ~ label.control-label`
label.control-label {
top: $label-top;
left: 0;
// must repeat because the selector above is more specific than the general label sizing
font-size: $static-font-size;
line-height: $static-line-height;
}
&.label-floating:not(.is-empty) {
@include label-position($label-top, $static-font-size, $static-line-height);
}
// #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
&.label-floating input.form-control:-webkit-autofill ~ label.control-label {
@include label-position($label-top, $static-font-size, $static-line-height);
}
}