Skip to content

Commit a06c1c9

Browse files
xidedixxidedix
committed
Merge branch 'hotfix/static'
2 parents 79e6098 + e7dcf7d commit a06c1c9

38 files changed

+5953
-1445
lines changed

‎Static_Full_Project_GULP/blank.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/charts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/components-buttons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/components-cards.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/components-forms.html

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>
@@ -360,7 +360,8 @@
360360
<div class="col-md-6">
361361
<div class="card">
362362
<div class="card-header">
363-
<strong>Basic Form</strong>Elements
363+
<strong>Basic Form</strong>
364+
Elements
364365
</div>
365366
<div class="card-body">
366367
<form action="" method="post" enctype="multipart/form-data" class="form-horizontal">
@@ -554,7 +555,8 @@
554555

555556
<div class="card">
556557
<div class="card-header">
557-
<strong>Inline</strong>Form
558+
<strong>Inline</strong>
559+
Form
558560
</div>
559561
<div class="card-body">
560562
<form action="" method="post" class="form-inline">
@@ -577,7 +579,8 @@
577579
<div class="col-md-6">
578580
<div class="card">
579581
<div class="card-header">
580-
<strong>Horizontal</strong>Form
582+
<strong>Horizontal</strong>
583+
Form
581584
</div>
582585
<div class="card-body">
583586
<form action="" method="post" class="form-horizontal">
@@ -604,7 +607,8 @@
604607
</div>
605608
<div class="card">
606609
<div class="card-header">
607-
<strong>Normal</strong>Form
610+
<strong>Normal</strong>
611+
Form
608612
</div>
609613
<div class="card-body">
610614
<form action="" method="post">
@@ -734,7 +738,8 @@
734738
<div class="col-sm-6">
735739
<div class="card">
736740
<div class="card-header">
737-
<strong>Validation states</strong>Form
741+
<strong>Validation states</strong>
742+
Form
738743
</div>
739744
<div class="card-body">
740745
<div class="form-group">
@@ -755,7 +760,8 @@
755760
<div class="col-sm-6">
756761
<div class="card">
757762
<div class="card-header">
758-
<strong>Validation states</strong>with optional icons
763+
<strong>Validation states</strong>
764+
with optional icons
759765
</div>
760766
<div class="card-body">
761767
<div class="form-group">
@@ -778,7 +784,8 @@
778784
<div class="col-sm-4">
779785
<div class="card">
780786
<div class="card-header">
781-
<strong>Icon/Text</strong>Groups
787+
<strong>Icon/Text</strong>
788+
Groups
782789
</div>
783790
<div class="card-body">
784791
<form action="" method="post" class="form-horizontal">
@@ -821,7 +828,8 @@
821828
<div class="col-sm-4">
822829
<div class="card">
823830
<div class="card-header">
824-
<strong>Buttons</strong>Groups
831+
<strong>Buttons</strong>
832+
Groups
825833
</div>
826834
<div class="card-body">
827835
<form action="" method="post" class="form-horizontal">
@@ -871,7 +879,8 @@
871879
<div class="col-sm-4">
872880
<div class="card">
873881
<div class="card-header">
874-
<strong>Dropdowns</strong>Groups
882+
<strong>Dropdowns</strong>
883+
Groups
875884
</div>
876885
<div class="card-body">
877886
<form action="" method="post" class="form-horizontal">

‎Static_Full_Project_GULP/components-modals.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>
@@ -365,7 +365,7 @@ <h4 class="modal-title">Modal title</h4>
365365
</div>
366366
<div class="modal-footer">
367367
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
368-
<button type="button" class="btn btn-primary">Save changes</button>
368+
<button type="button" class="btn btn-success">Save changes</button>
369369
</div>
370370
</div>
371371
<!-- /.modal-content -->
@@ -389,7 +389,7 @@ <h4 class="modal-title">Modal title</h4>
389389
</div>
390390
<div class="modal-footer">
391391
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
392-
<button type="button" class="btn btn-primary">Save changes</button>
392+
<button type="button" class="btn btn-warning">Save changes</button>
393393
</div>
394394
</div>
395395
<!-- /.modal-content -->
@@ -412,7 +412,7 @@ <h4 class="modal-title">Modal title</h4>
412412
</div>
413413
<div class="modal-footer">
414414
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
415-
<button type="button" class="btn btn-primary">Save changes</button>
415+
<button type="button" class="btn btn-danger">Save changes</button>
416416
</div>
417417
</div>
418418
<!-- /.modal-content -->
@@ -435,7 +435,7 @@ <h4 class="modal-title">Modal title</h4>
435435
</div>
436436
<div class="modal-footer">
437437
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
438-
<button type="button" class="btn btn-primary">Save changes</button>
438+
<button type="button" class="btn btn-info">Save changes</button>
439439
</div>
440440
</div>
441441
<!-- /.modal-content -->

‎Static_Full_Project_GULP/components-social-buttons.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/components-switches.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

‎Static_Full_Project_GULP/components-tables.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>
@@ -252,7 +252,7 @@
252252
<td>2012/02/01</td>
253253
<td>Admin</td>
254254
<td>
255-
<span class="badge badge-default">Inactive</span>
255+
<span class="badge badge-secondary">Inactive</span>
256256
</td>
257257
</tr>
258258
<tr>
@@ -330,7 +330,7 @@
330330
<td>2012/02/01</td>
331331
<td>Admin</td>
332332
<td>
333-
<span class="badge badge-default">Inactive</span>
333+
<span class="badge badge-secondary">Inactive</span>
334334
</td>
335335
</tr>
336336
<tr>
@@ -412,7 +412,7 @@
412412
<td>2012/02/01</td>
413413
<td>Admin</td>
414414
<td>
415-
<span class="badge badge-default">Inactive</span>
415+
<span class="badge badge-secondary">Inactive</span>
416416
</td>
417417
</tr>
418418
<tr>
@@ -490,7 +490,7 @@
490490
<td>2012/02/01</td>
491491
<td>Admin</td>
492492
<td>
493-
<span class="badge badge-default">Inactive</span>
493+
<span class="badge badge-secondary">Inactive</span>
494494
</td>
495495
</tr>
496496
<tr>
@@ -572,7 +572,7 @@
572572
<td>2012/02/01</td>
573573
<td>Admin</td>
574574
<td>
575-
<span class="badge badge-default">Inactive</span>
575+
<span class="badge badge-secondary">Inactive</span>
576576
</td>
577577
</tr>
578578
<tr>

‎Static_Full_Project_GULP/components-tabs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<a class="nav-link nav-dropdown-toggle" href="#"><i class="icon-star"></i> Icons</a>
153153
<ul class="nav-dropdown-items">
154154
<li class="nav-item">
155-
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome</a>
155+
<a class="nav-link" href="icons-font-awesome.html"><i class="icon-star"></i> Font Awesome <span class="badge badge-secondary">4.7</span></a>
156156
</li>
157157
<li class="nav-item">
158158
<a class="nav-link" href="icons-simple-line-icons.html"><i class="icon-star"></i> Simple Line Icons</a>

0 commit comments

Comments
 (0)