mirror of
https://github.com/mdbootstrap/mdb-ui-kit.git
synced 2024-11-22 17:47:11 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
c4beecc15e
15
LICENSE.md
15
LICENSE.md
|
@ -13,14 +13,9 @@ You can edit and/or redistribute this software only providing a copy
|
|||
of this license with it.
|
||||
|
||||
You cannot sell this software, any change to the software must be
|
||||
published under the same license of the original software, in case you
|
||||
don't want to publish your changes you can use a different license.
|
||||
It will be valid only if your changes are not published but
|
||||
keep private for personal projects or closed-source projects, in case
|
||||
you want to publish your changes you must switch again to the original
|
||||
license provided with the software.
|
||||
published under the same license of the original software.
|
||||
|
||||
This software can be sold if used inside a software which uses it as
|
||||
This software may be sold if used inside a software which uses it as
|
||||
dependency, in any case, this license must be included in the
|
||||
software.
|
||||
|
||||
|
@ -29,8 +24,4 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
This license could be edited in any moment without alert.
|
||||
|
||||
Here are listed the authorized individuals and companies and the specific of their licenses:
|
||||
|
||||
- **A*Star Education Ltd**: unlimited usage for websites and webapplications of the company.
|
||||
This license could be edited in any moment without alert.
|
|
@ -19,6 +19,10 @@ Check out [the demo at this link](http://fezvrasta.github.io/bootstrap-material-
|
|||
BOWER: bower install bootstrap-material-design --save
|
||||
GEMS: gem install bootstrap-material-design
|
||||
|
||||
## Use our CDN
|
||||
|
||||
You can find the CDN of this library at [CDNJS.com](https://cdnjs.com/libraries/bootstrap-material-design) and at [JSDelivr.com](http://www.jsdelivr.com/#!bootstrap.material-design)
|
||||
|
||||
### LESS & SASS
|
||||
|
||||
We decided to merge the SASS fork in to the main repository instead of having two seperate ones, [#40](https://github.com/FezVrasta/bootstrap-material-design/issues/40). The default grunt
|
||||
|
|
14
index.html
14
index.html
|
@ -536,10 +536,10 @@
|
|||
</p>
|
||||
<p>Variations are available for every icon, included for the original Bootstrap icons.<br>
|
||||
<br>Example:<br><br>
|
||||
<i class="mdi-action-favorite icon-material-pink" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite icon-material-lime" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite icon-material-teal" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite icon-material-red" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite mdi-material-pink" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite mdi-material-lime" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite mdi-material-teal" style="font-size: 40pt;"></i>
|
||||
<i class="mdi-action-favorite mdi-material-red" style="font-size: 40pt;"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -1977,7 +1977,7 @@
|
|||
<i class="mdi-file-folder"></i>
|
||||
</div>
|
||||
<div class="row-content">
|
||||
<div class="action-secondary"><i class="icon-material-info"></i></div>
|
||||
<div class="action-secondary"><i class="mdi-material-info"></i></div>
|
||||
<h4 class="list-group-item-heading">Tile with an icon</h4>
|
||||
<p class="list-group-item-text">Donec id elit non mi porta gravida at eget metus.</p>
|
||||
</div>
|
||||
|
@ -1988,7 +1988,7 @@
|
|||
<i class="mdi-file-folder"></i>
|
||||
</div>
|
||||
<div class="row-content">
|
||||
<div class="action-secondary"><i class="icon-material-info"></i></div>
|
||||
<div class="action-secondary"><i class="mdi-material-info"></i></div>
|
||||
<h4 class="list-group-item-heading">Tile with an icon</h4>
|
||||
<p class="list-group-item-text">Maecenas sed diam eget risus varius blandit.</p>
|
||||
</div>
|
||||
|
@ -1999,7 +1999,7 @@
|
|||
<i class="mdi-file-folder"></i>
|
||||
</div>
|
||||
<div class="row-content">
|
||||
<div class="action-secondary"><i class="icon-material-info"></i></div>
|
||||
<div class="action-secondary"><i class="mdi-material-info"></i></div>
|
||||
<h4 class="list-group-item-heading">Tile with an icon</h4>
|
||||
<p class="list-group-item-text">Maecenas sed diam eget risus varius blandit.</p>
|
||||
</div>
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
});
|
||||
|
||||
$(document)
|
||||
.on("change", ".checkbox input", function() { $(this).blur(); })
|
||||
.on("change", ".checkbox input[type=checkbox]", function() { $(this).blur(); })
|
||||
.on("keydown paste", ".form-control", function(e) {
|
||||
if(_isChar(e)) {
|
||||
$(this).removeClass("empty");
|
||||
|
|
Loading…
Reference in New Issue
Block a user