Skip to content

Commit a41c200

Browse files
author
FezVrasta
committed
Merge branch 'develop'
2 parents dbbf4e7 + 09e9532 commit a41c200

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

‎index.html‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,12 @@ <h3>Button sizes</h3>
375375

376376
<h3>Floating action buttons</h3>
377377
<p class="bs-component">
378-
<a href="javascript:void(0)" class="btn btn-default btn-fab btn-raised icon-material-share"></a>
379-
<a href="javascript:void(0)" class="btn btn-primary btn-fab btn-raised icon-material-share"></a>
380-
<a href="javascript:void(0)" class="btn btn-success btn-fab btn-raised icon-material-share"></a>
381-
<a href="javascript:void(0)" class="btn btn-info btn-fab btn-raised icon-material-share"></a>
382-
<a href="javascript:void(0)" class="btn btn-warning btn-fab btn-raised icon-material-share"></a>
383-
<a href="javascript:void(0)" class="btn btn-danger btn-fab btn-raised icon-material-share"></a>
378+
<a href="javascript:void(0)" class="btn btn-default btn-fab btn-raised mdi-action-grade"></a>
379+
<a href="javascript:void(0)" class="btn btn-primary btn-fab btn-raised mdi-action-grade"></a>
380+
<a href="javascript:void(0)" class="btn btn-success btn-fab btn-raised mdi-action-grade"></a>
381+
<a href="javascript:void(0)" class="btn btn-info btn-fab btn-raised mdi-action-grade"></a>
382+
<a href="javascript:void(0)" class="btn btn-warning btn-fab btn-raised mdi-action-grade"></a>
383+
<a href="javascript:void(0)" class="btn btn-danger btn-fab btn-raised mdi-action-grade"></a>
384384

385385
</p>
386386

@@ -530,9 +530,9 @@ <h2 id="type-blockquotes">Blockquotes</h2>
530530
<div class="col-lg-12">
531531
<div class="page-header">
532532
<h1 id="type">Icons</h1>
533-
<p>Material Design for Bootstrap includes 490 original Material Design icons!<br>
534-
These icons are extracted from the original Google sources and are licensed under BSD license.<br>
535-
Them are provided as an iconic font easy to use.
533+
<p>Material Design for Bootstrap includes 740 original Material Design icons!<br>
534+
These icons come directly from the <a href="https://github.com/google/material-design-icons">Google Material Design Icons</a> repository.<br>
535+
We provide them as an iconic font easy to use.
536536
</p>
537537
<p>Variations are available for every icon, included for the original Bootstrap icons.<br>
538538
<br>Example:<br><br>
@@ -639,7 +639,6 @@ <h2>action</h2>
639639
<div class="icon-preview"><i class="mdi-action-question-answer"></i><span>mdi-action-question-answer</span></div>
640640
<div class="icon-preview"><i class="mdi-action-receipt"></i><span>mdi-action-receipt</span></div>
641641
<div class="icon-preview"><i class="mdi-action-redeem"></i><span>mdi-action-redeem</span></div>
642-
<div class="icon-preview"><i class="mdi-action-reorder"></i><span>mdi-action-reorder</span></div>
643642
<div class="icon-preview"><i class="mdi-action-report-problem"></i><span>mdi-action-report-problem</span></div>
644643
<div class="icon-preview"><i class="mdi-action-restore"></i><span>mdi-action-restore</span></div>
645644
<div class="icon-preview"><i class="mdi-action-room"></i><span>mdi-action-room</span></div>
@@ -1936,7 +1935,7 @@ <h2>List groups</h2>
19361935
<div class="list-group">
19371936
<div class="list-group-item">
19381937
<div class="row-action-primary">
1939-
<i class="icon-material-folder"></i>
1938+
<i class="mdi-file-folder"></i>
19401939
</div>
19411940
<div class="row-content">
19421941
<div class="least-content">15m</div>
@@ -1947,7 +1946,7 @@ <h4 class="list-group-item-heading">Tile with a label</h4>
19471946
<div class="list-group-separator"></div>
19481947
<div class="list-group-item">
19491948
<div class="row-action-primary">
1950-
<i class="icon-material-folder"></i>
1949+
<i class="mdi-file-folder"></i>
19511950
</div>
19521951
<div class="row-content">
19531952
<div class="least-content">10m</div>
@@ -1958,7 +1957,7 @@ <h4 class="list-group-item-heading">Tile with a label</h4>
19581957
<div class="list-group-separator"></div>
19591958
<div class="list-group-item">
19601959
<div class="row-action-primary">
1961-
<i class="icon-material-folder"></i>
1960+
<i class="mdi-file-folder"></i>
19621961
</div>
19631962
<div class="row-content">
19641963
<div class="least-content">8m</div>
@@ -1975,7 +1974,7 @@ <h4 class="list-group-item-heading">Tile with a label</h4>
19751974
<div class="list-group">
19761975
<div class="list-group-item">
19771976
<div class="row-action-primary">
1978-
<i class="icon-material-folder"></i>
1977+
<i class="mdi-file-folder"></i>
19791978
</div>
19801979
<div class="row-content">
19811980
<div class="action-secondary"><i class="icon-material-info"></i></div>
@@ -1986,7 +1985,7 @@ <h4 class="list-group-item-heading">Tile with an icon</h4>
19861985
<div class="list-group-separator"></div>
19871986
<div class="list-group-item">
19881987
<div class="row-action-primary">
1989-
<i class="icon-material-folder"></i>
1988+
<i class="mdi-file-folder"></i>
19901989
</div>
19911990
<div class="row-content">
19921991
<div class="action-secondary"><i class="icon-material-info"></i></div>
@@ -1997,7 +1996,7 @@ <h4 class="list-group-item-heading">Tile with an icon</h4>
19971996
<div class="list-group-separator"></div>
19981997
<div class="list-group-item">
19991998
<div class="row-action-primary">
2000-
<i class="icon-material-folder"></i>
1999+
<i class="mdi-file-folder"></i>
20012000
</div>
20022001
<div class="row-content">
20032002
<div class="action-secondary"><i class="icon-material-info"></i></div>

0 commit comments

Comments
 (0)