Skip to content

Commit

Permalink
Bootstrap update
Browse files Browse the repository at this point in the history
  • Loading branch information
Aigars Silkalns authored and Aigars Silkalns committed Mar 11, 2016
1 parent 0f9150b commit 3f83b4f
Show file tree
Hide file tree
Showing 473 changed files with 23,524 additions and 12,782 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
@@ -1,7 +1,7 @@
v2.3.2:
date: "2015-01-12"
changes:
Bootstrap 3.3.1, many plugin updated
Bootstrap 3.3.6, many plugin updated

v2.3.1:
date: "2014-11-01"
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Expand Up @@ -41,17 +41,17 @@
"jQuery.validVal": "~5.0.2",
"jquery.gritter": "~1.7.4",
"plupload": "~2.1.2",
"bootstrap-switch": "~3.3.1",
"bootstrap-switch": "~3.3.6",
"kbwood_countdown": "git://github.com/kbwood/countdown.git#2.0.1",
"jquery-inputlimiter": "https://jquery-inputlimiter.googlecode.com/files/jquery-inputlimiter.1.3.1.zip",
"bootstrap-duallistbox": "~3.0.2",
"fullcalendar": "~2.2.6",
"bootstrap3-wysihtml5-bower": "~0.3.3",
"bootstrap": "~3.3.1",
"bootstrap": "~3.3.6",
"jquery-validation": "~1.13.1"
},
"resolutions": {
"jquery": "~2.1.3",
"bootstrap": "~3.3.1"
"bootstrap": "~3.3.6"
}
}
12 changes: 6 additions & 6 deletions dist/403.html
Expand Up @@ -7,10 +7,10 @@
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand All @@ -29,19 +29,19 @@ <h1>403</h1>
<input type="text" placeholder="search ..." class="form-control">
<span class="input-group-btn">
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
</span>
</span>
</div>
</form>
</div>
<div class="clearfix"></div>
<br>
<div class="col-lg-6 col-lg-offset-3">
<div class="btn-group btn-group-justified">
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
<a href="index.html" class="btn btn-warning">Return Website</a>
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
<a href="index.html" class="btn btn-warning">Return Website</a>
</div>
</div>
</div><!-- /.col-lg-8 col-offset-2 -->
</div>
</body>
</html>
</html>
4 changes: 2 additions & 2 deletions dist/404.html
Expand Up @@ -7,10 +7,10 @@
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand Down
4 changes: 2 additions & 2 deletions dist/405.html
Expand Up @@ -7,10 +7,10 @@
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand Down
4 changes: 2 additions & 2 deletions dist/500.html
Expand Up @@ -7,10 +7,10 @@
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand Down
4 changes: 2 additions & 2 deletions dist/503.html
Expand Up @@ -7,10 +7,10 @@
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand Down
33 changes: 12 additions & 21 deletions dist/alterne.html
Expand Up @@ -11,10 +11,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">

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

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

<!-- Metis core stylesheet -->
<link rel="stylesheet" href="assets/css/main.min.css">
Expand Down Expand Up @@ -325,8 +325,7 @@ <h5 class="media-heading">Archie</h5>
<i class="fa fa-file"></i>
<span class="link-title">
File Manager
</span>
</a>
</span> </a>
</li>
<li>
<a href="typography.html">
Expand All @@ -339,24 +338,21 @@ <h5 class="media-heading">Archie</h5>
<a href="maps.html">
<i class="fa fa-map-marker"></i><span class="link-title">
Maps
</span>
</a>
</span> </a>
</li>
<li>
<a href="chart.html">
<i class="fa fa fa-bar-chart-o"></i>
<span class="link-title">
Charts
</span>
</a>
</span> </a>
</li>
<li>
<a href="calendar.html">
<i class="fa fa-calendar"></i>
<span class="link-title">
Calendar
</span>
</a>
</span> </a>
</li>
<li>
<a href="javascript:;">
Expand Down Expand Up @@ -428,8 +424,7 @@ <h5 class="media-heading">Archie</h5>
<span class="link-title">
Unlimited Level Menu
</span>
<span class="fa arrow"></span>
</a>
<span class="fa arrow"></span> </a>
<ul>
<li>
<a href="javascript:;">Level 1 <span class="fa arrow"></span> </a>
Expand Down Expand Up @@ -652,14 +647,10 @@ <h5>Calendar</h5>
<!-- .well well-small -->
<div class="well well-small dark">
<ul class="list-unstyled">
<li>Visitor <span class="inlinesparkline pull-right">1,4,4,7,5,9,10</span>
</li>
<li>Online Visitor <span class="dynamicsparkline pull-right">Loading..</span>
</li>
<li>Popularity <span class="dynamicbar pull-right">Loading..</span>
</li>
<li>New Users <span class="inlinebar pull-right">1,3,4,5,3,5</span>
</li>
<li>Visitor <span class="inlinesparkline pull-right">1,4,4,7,5,9,10</span> </li>
<li>Online Visitor <span class="dynamicsparkline pull-right">Loading..</span> </li>
<li>Popularity <span class="dynamicbar pull-right">Loading..</span> </li>
<li>New Users <span class="inlinebar pull-right">1,3,4,5,3,5</span> </li>
</ul>
</div><!-- /.well well-small -->

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

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

<!-- MetisMenu -->
<script src="//cdnjs.cloudflare.com/ajax/libs/metisMenu/1.1.3/metisMenu.min.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions dist/assets/css/countdown.css
@@ -1,8 +1,8 @@
/**
* Metis - Bootstrap-Admin-Template v2.3.2
* Author : onokumus
* Copyright 2015
* Licensed under MIT (https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/LICENSE.md)
* Author : puikinsh
* Copyright 2016
* Licensed under MIT (https://github.com/puikinsh/Bootstrap-Admin-Template/blob/master/LICENSE.md)
*/


Expand Down

0 comments on commit 3f83b4f

Please sign in to comment.