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

#760 remove potentially ambiguous import file name

Browse Source
This commit is contained in:
Kevin Ross 2015-12-07 17:36:35 -06:00
parent 7b603bcad2
commit 0c1ddfc073
10 changed files with 7 additions and 6558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
less/_bootstrap-material-design.less → less/_core.less
View File

@ -95,8 +95,6 @@ legend {
@import "_popups.less"; @import "_popups.less";
@import "_icons.less";
@import "_cards.less"; @import "_cards.less";
@import "_dialogs.less"; @import "_dialogs.less";

3250
less/_icons-material-design.less
View File

File diff suppressed because it is too large Load Diff

21
less/_icons.less
View File

@ -1,21 +0,0 @@
// http://google.github.io/material-design-icons/#setup-method-1-using-via-google-web-fonts
// icons as ligatures http://google.github.io/material-design-icons/#using-the-icons-in-html
// <i class="material-icons">face</i>
// use something like this to generically style disabled and muted, etc based on color variables?
//.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
//.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
//
//.material-icons.md-light { color: rgba(255, 255, 255, 1); }
//.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
//.mdi, icon {
// .variations(~"", color, @mdb-text-color-primary);
// line-height: inherit;
// vertical-align: bottom;
//}

5
less/bootstrap-material-design.less vendored
View File

@ -1,5 +1,4 @@
@import "_variables.less"; @import "_variables.less";
@import "_mixins.less"; @import "_mixins.less";
@import "_icons-material-design.less"; @import "_shadows.less";
@import "_shadows.less"; // these are mixins only, and must be placed at the top before use (sass requiremnt) @import '_core.less';
@import '_bootstrap-material-design.less'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)

2
package.json
View File

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

2
sass/_bootstrap-material-design.scss → sass/_core.scss
View File

@ -97,8 +97,6 @@ legend {
@import '_popups'; @import '_popups';
@import '_icons';
@import '_cards'; @import '_cards';
@import '_dialogs'; @import '_dialogs';

3252
sass/_icons-material-design.scss
View File

File diff suppressed because it is too large Load Diff

23
sass/_icons.scss
View File

@ -1,23 +0,0 @@
// This file has been autogenerated by grunt task lessToSass. Any changes will be overwritten.
// http://google.github.io/material-design-icons/#setup-method-1-using-via-google-web-fonts
// icons as ligatures http://google.github.io/material-design-icons/#using-the-icons-in-html
// <i class="material-icons">face</i>
// use something like this to generically style disabled and muted, etc based on color variables?
//.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
//.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
//
//.material-icons.md-light { color: rgba(255, 255, 255, 1); }
//.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
//.mdi, icon {
// @include variations(unquote(""), color, $mdb-text-color-primary);
// line-height: inherit;
// vertical-align: bottom;
//}

5
sass/bootstrap-material-design.scss vendored
View File

@ -2,6 +2,5 @@
@import '_variables'; @import '_variables';
@import '_mixins'; @import '_mixins';
@import '_icons-material-design'; @import '_shadows';
@import '_shadows'; // these are mixins only, and must be placed at the top before use (sass requiremnt) @import '_core';
@import '_bootstrap-material-design'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)

3
scripts/material.js
View File

@ -254,7 +254,8 @@
clearInterval(focused); clearInterval(focused);
}); });
}, },
"init": function() { "init": function(options) {
this.options = $.extend({}, this.options, options);
var $document = $(document); var $document = $(document);
if ($.fn.ripples && this.options.ripples) { if ($.fn.ripples && this.options.ripples) {