mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2024-11-10 19:57:13 +03:00
#760 remove potentially ambiguous import file name
This commit is contained in:
parent
54f938a0c0
commit
e0db93b7f5
|
@ -95,8 +95,6 @@ legend {
|
|||
|
||||
@import "_popups.less";
|
||||
|
||||
@import "_icons.less";
|
||||
|
||||
@import "_cards.less";
|
||||
|
||||
@import "_dialogs.less";
|
File diff suppressed because it is too large
Load Diff
|
@ -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
5
less/bootstrap-material-design.less
vendored
|
@ -1,5 +1,4 @@
|
|||
@import "_variables.less";
|
||||
@import "_mixins.less";
|
||||
@import "_icons-material-design.less";
|
||||
@import "_shadows.less"; // these are mixins only, and must be placed at the top before use (sass requiremnt)
|
||||
@import '_bootstrap-material-design.less'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)
|
||||
@import "_shadows.less";
|
||||
@import '_core.less';
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bootstrap-material-design",
|
||||
"version": "0.5.2",
|
||||
"version": "0.5.3",
|
||||
"description": "Material Design for Bootstrap 3",
|
||||
"main": "scripts/index.js",
|
||||
"scripts": {
|
||||
|
|
|
@ -97,8 +97,6 @@ legend {
|
|||
|
||||
@import '_popups';
|
||||
|
||||
@import '_icons';
|
||||
|
||||
@import '_cards';
|
||||
|
||||
@import '_dialogs';
|
File diff suppressed because it is too large
Load Diff
|
@ -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
5
sass/bootstrap-material-design.scss
vendored
|
@ -2,6 +2,5 @@
|
|||
|
||||
@import '_variables';
|
||||
@import '_mixins';
|
||||
@import '_icons-material-design';
|
||||
@import '_shadows'; // these are mixins only, and must be placed at the top before use (sass requiremnt)
|
||||
@import '_bootstrap-material-design'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)
|
||||
@import '_shadows';
|
||||
@import '_core';
|
||||
|
|
|
@ -254,7 +254,8 @@
|
|||
clearInterval(focused);
|
||||
});
|
||||
},
|
||||
"init": function() {
|
||||
"init": function(options) {
|
||||
this.options = $.extend({}, this.options, options);
|
||||
var $document = $(document);
|
||||
|
||||
if ($.fn.ripples && this.options.ripples) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user