Skip to content

Commit 3f83b4f

Browse files
Aigars SilkalnsAigars Silkalns
Aigars Silkalns
authored and
Aigars Silkalns
committed
Bootstrap update
1 parent 0f9150b commit 3f83b4f

473 files changed

Lines changed: 23524 additions & 12782 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
v2.3.2:
22
date: "2015-01-12"
33
changes:
4-
Bootstrap 3.3.1, many plugin updated
4+
Bootstrap 3.3.6, many plugin updated
55

66
v2.3.1:
77
date: "2014-11-01"

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@
4141
"jQuery.validVal": "~5.0.2",
4242
"jquery.gritter": "~1.7.4",
4343
"plupload": "~2.1.2",
44-
"bootstrap-switch": "~3.3.1",
44+
"bootstrap-switch": "~3.3.6",
4545
"kbwood_countdown": "git://github.com/kbwood/countdown.git#2.0.1",
4646
"jquery-inputlimiter": "https://jquery-inputlimiter.googlecode.com/files/jquery-inputlimiter.1.3.1.zip",
4747
"bootstrap-duallistbox": "~3.0.2",
4848
"fullcalendar": "~2.2.6",
4949
"bootstrap3-wysihtml5-bower": "~0.3.3",
50-
"bootstrap": "~3.3.1",
50+
"bootstrap": "~3.3.6",
5151
"jquery-validation": "~1.13.1"
5252
},
5353
"resolutions": {
5454
"jquery": "~2.1.3",
55-
"bootstrap": "~3.3.1"
55+
"bootstrap": "~3.3.6"
5656
}
5757
}

‎dist/403.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
88

99
<!-- Bootstrap -->
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1111

1212
<!-- Font Awesome -->
13-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1414

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">
@@ -29,19 +29,19 @@ <h1>403</h1>
2929
<input type="text" placeholder="search ..." class="form-control">
3030
<span class="input-group-btn">
3131
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32-
</span>
32+
</span>
3333
</div>
3434
</form>
3535
</div>
3636
<div class="clearfix"></div>
3737
<br>
3838
<div class="col-lg-6 col-lg-offset-3">
3939
<div class="btn-group btn-group-justified">
40-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
41-
<a href="index.html" class="btn btn-warning">Return Website</a>
40+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
41+
<a href="index.html" class="btn btn-warning">Return Website</a>
4242
</div>
4343
</div>
4444
</div><!-- /.col-lg-8 col-offset-2 -->
4545
</div>
4646
</body>
47-
</html>
47+
</html>

‎dist/404.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
88

99
<!-- Bootstrap -->
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1111

1212
<!-- Font Awesome -->
13-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1414

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">

‎dist/405.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
88

99
<!-- Bootstrap -->
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1111

1212
<!-- Font Awesome -->
13-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1414

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">

‎dist/500.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
88

99
<!-- Bootstrap -->
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1111

1212
<!-- Font Awesome -->
13-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1414

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">

‎dist/503.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
88

99
<!-- Bootstrap -->
10-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1111

1212
<!-- Font Awesome -->
13-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
13+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1414

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">

‎dist/alterne.html‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212

1313
<!-- Bootstrap -->
14-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
14+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css">
1515

1616
<!-- Font Awesome -->
17-
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.2.0/css/font-awesome.min.css">
17+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.5.0/css/font-awesome.min.css">
1818

1919
<!-- Metis core stylesheet -->
2020
<link rel="stylesheet" href="assets/css/main.min.css">
@@ -325,8 +325,7 @@ <h5 class="media-heading">Archie</h5>
325325
<i class="fa fa-file"></i>
326326
<span class="link-title">
327327
File Manager
328-
</span>
329-
</a>
328+
</span> </a>
330329
</li>
331330
<li>
332331
<a href="typography.html">
@@ -339,24 +338,21 @@ <h5 class="media-heading">Archie</h5>
339338
<a href="maps.html">
340339
<i class="fa fa-map-marker"></i><span class="link-title">
341340
Maps
342-
</span>
343-
</a>
341+
</span> </a>
344342
</li>
345343
<li>
346344
<a href="chart.html">
347345
<i class="fa fa fa-bar-chart-o"></i>
348346
<span class="link-title">
349347
Charts
350-
</span>
351-
</a>
348+
</span> </a>
352349
</li>
353350
<li>
354351
<a href="calendar.html">
355352
<i class="fa fa-calendar"></i>
356353
<span class="link-title">
357354
Calendar
358-
</span>
359-
</a>
355+
</span> </a>
360356
</li>
361357
<li>
362358
<a href="javascript:;">
@@ -428,8 +424,7 @@ <h5 class="media-heading">Archie</h5>
428424
<span class="link-title">
429425
Unlimited Level Menu
430426
</span>
431-
<span class="fa arrow"></span>
432-
</a>
427+
<span class="fa arrow"></span> </a>
433428
<ul>
434429
<li>
435430
<a href="javascript:;">Level 1 <span class="fa arrow"></span> </a>
@@ -652,14 +647,10 @@ <h5>Calendar</h5>
652647
<!-- .well well-small -->
653648
<div class="well well-small dark">
654649
<ul class="list-unstyled">
655-
<li>Visitor <span class="inlinesparkline pull-right">1,4,4,7,5,9,10</span>
656-
</li>
657-
<li>Online Visitor <span class="dynamicsparkline pull-right">Loading..</span>
658-
</li>
659-
<li>Popularity <span class="dynamicbar pull-right">Loading..</span>
660-
</li>
661-
<li>New Users <span class="inlinebar pull-right">1,3,4,5,3,5</span>
662-
</li>
650+
<li>Visitor <span class="inlinesparkline pull-right">1,4,4,7,5,9,10</span> </li>
651+
<li>Online Visitor <span class="dynamicsparkline pull-right">Loading..</span> </li>
652+
<li>Popularity <span class="dynamicbar pull-right">Loading..</span> </li>
653+
<li>New Users <span class="inlinebar pull-right">1,3,4,5,3,5</span> </li>
663654
</ul>
664655
</div><!-- /.well well-small -->
665656

@@ -731,7 +722,7 @@ <h4 class="modal-title">Modal title</h4>
731722
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
732723

733724
<!--Bootstrap -->
734-
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js"></script>
725+
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
735726

736727
<!-- MetisMenu -->
737728
<script src="//cdnjs.cloudflare.com/ajax/libs/metisMenu/1.1.3/metisMenu.min.js"></script>

‎dist/assets/css/countdown.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* Metis - Bootstrap-Admin-Template v2.3.2
3-
* Author : onokumus
4-
* Copyright 2015
5-
* Licensed under MIT (https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/LICENSE.md)
3+
* Author : puikinsh
4+
* Copyright 2016
5+
* Licensed under MIT (https://github.com/puikinsh/Bootstrap-Admin-Template/blob/master/LICENSE.md)
66
*/
77

88

0 commit comments

Comments
 (0)