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

Merge branch 'develop'

Browse Source
This commit is contained in:
FezVrasta 2014-10-18 15:36:07 +02:00
commit a41c20067b
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
index.html
View File

@ -375,12 +375,12 @@
<h3>Floating action buttons</h3> <h3>Floating action buttons</h3>
<p class="bs-component"> <p class="bs-component">
<a href="javascript:void(0)" class="btn btn-default btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-default btn-fab btn-raised mdi-action-grade"></a>
<a href="javascript:void(0)" class="btn btn-primary btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-primary btn-fab btn-raised mdi-action-grade"></a>
<a href="javascript:void(0)" class="btn btn-success btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-success btn-fab btn-raised mdi-action-grade"></a>
<a href="javascript:void(0)" class="btn btn-info btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-info btn-fab btn-raised mdi-action-grade"></a>
<a href="javascript:void(0)" class="btn btn-warning btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-warning btn-fab btn-raised mdi-action-grade"></a>
<a href="javascript:void(0)" class="btn btn-danger btn-fab btn-raised icon-material-share"></a> <a href="javascript:void(0)" class="btn btn-danger btn-fab btn-raised mdi-action-grade"></a>
</p> </p>
@ -530,9 +530,9 @@
<div class="col-lg-12"> <div class="col-lg-12">
<div class="page-header"> <div class="page-header">
<h1 id="type">Icons</h1> <h1 id="type">Icons</h1>
<p>Material Design for Bootstrap includes 490 original Material Design icons!<br> <p>Material Design for Bootstrap includes 740 original Material Design icons!<br>
These icons are extracted from the original Google sources and are licensed under BSD license.<br> These icons come directly from the <a href="https://github.com/google/material-design-icons">Google Material Design Icons</a> repository.<br>
Them are provided as an iconic font easy to use. We provide them as an iconic font easy to use.
</p> </p>
<p>Variations are available for every icon, included for the original Bootstrap icons.<br> <p>Variations are available for every icon, included for the original Bootstrap icons.<br>
<br>Example:<br><br> <br>Example:<br><br>
@ -639,7 +639,6 @@
<div class="icon-preview"><i class="mdi-action-question-answer"></i><span>mdi-action-question-answer</span></div> <div class="icon-preview"><i class="mdi-action-question-answer"></i><span>mdi-action-question-answer</span></div>
<div class="icon-preview"><i class="mdi-action-receipt"></i><span>mdi-action-receipt</span></div> <div class="icon-preview"><i class="mdi-action-receipt"></i><span>mdi-action-receipt</span></div>
<div class="icon-preview"><i class="mdi-action-redeem"></i><span>mdi-action-redeem</span></div> <div class="icon-preview"><i class="mdi-action-redeem"></i><span>mdi-action-redeem</span></div>
<div class="icon-preview"><i class="mdi-action-reorder"></i><span>mdi-action-reorder</span></div>
<div class="icon-preview"><i class="mdi-action-report-problem"></i><span>mdi-action-report-problem</span></div> <div class="icon-preview"><i class="mdi-action-report-problem"></i><span>mdi-action-report-problem</span></div>
<div class="icon-preview"><i class="mdi-action-restore"></i><span>mdi-action-restore</span></div> <div class="icon-preview"><i class="mdi-action-restore"></i><span>mdi-action-restore</span></div>
<div class="icon-preview"><i class="mdi-action-room"></i><span>mdi-action-room</span></div> <div class="icon-preview"><i class="mdi-action-room"></i><span>mdi-action-room</span></div>
@ -1936,7 +1935,7 @@
<div class="list-group"> <div class="list-group">
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="least-content">15m</div> <div class="least-content">15m</div>
@ -1947,7 +1946,7 @@
<div class="list-group-separator"></div> <div class="list-group-separator"></div>
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="least-content">10m</div> <div class="least-content">10m</div>
@ -1958,7 +1957,7 @@
<div class="list-group-separator"></div> <div class="list-group-separator"></div>
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="least-content">8m</div> <div class="least-content">8m</div>
@ -1975,7 +1974,7 @@
<div class="list-group"> <div class="list-group">
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="action-secondary"><i class="icon-material-info"></i></div> <div class="action-secondary"><i class="icon-material-info"></i></div>
@ -1986,7 +1985,7 @@
<div class="list-group-separator"></div> <div class="list-group-separator"></div>
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="action-secondary"><i class="icon-material-info"></i></div> <div class="action-secondary"><i class="icon-material-info"></i></div>
@ -1997,7 +1996,7 @@
<div class="list-group-separator"></div> <div class="list-group-separator"></div>
<div class="list-group-item"> <div class="list-group-item">
<div class="row-action-primary"> <div class="row-action-primary">
<i class="icon-material-folder"></i> <i class="mdi-file-folder"></i>
</div> </div>
<div class="row-content"> <div class="row-content">
<div class="action-secondary"><i class="icon-material-info"></i></div> <div class="action-secondary"><i class="icon-material-info"></i></div>