Skip to content

Commit 3bd7291

Browse files
committed
v2.3.2
1 parent 449440f commit 3bd7291

4,022 files changed

Lines changed: 213602 additions & 104335 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.

.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"directory": "bower_components"
3-
}
3+
}

.verb.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# {%= name %}
2-
* {%= badge("fury") %}
2+
* {%= badge("travis") %}
3+
* [![Dependency Status](https://david-dm.org/onokumus/Bootstrap-Admin-Template.svg?theme=shields.io)](https://david-dm.org/onokumus/Bootstrap-Admin-Template)
4+
* [![devDependency Status](https://david-dm.org/onokumus/Bootstrap-Admin-Template/dev-status.svg?theme=shields.io)](https://david-dm.org/onokumus/Bootstrap-Admin-Template#info=devDependencies)
35
* {%= badge("grunt") %}
46

57
> {%= description %}
68
9+
> {%= description %}
10+
711
## TOC
812
* [Download](#download)
913
* [Building](#building)
@@ -85,7 +89,6 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
8589
* [Animate](http://daneden.github.io/animate.css/)
8690
* [Autosize](http://www.jacklmoore.com/autosize)
8791
* [Countdown](http://keith-wood.name/countdown.html)
88-
* [CSS Beautify](http://cssbeautify.com)
8992
* [Date range picker](https://github.com/dangrossman/bootstrap-daterangepicker)
9093
* [Flot](http://www.flotcharts.org)
9194
* [jQuery Form](http://jquery.malsup.com/form/)

CHANGELOG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v2.3.2:
2+
date: "2015-01-12"
3+
changes:
4+
Bootstrap 3.3.1, many plugin updated
5+
16
v2.3.1:
27
date: "2014-11-01"
38
changes:

Gruntfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ module.exports = function(grunt) {
3838

3939
uglify: getTask('uglify'),
4040

41+
wiredep: getTask('wiredep'),
42+
43+
44+
usebanner: getTask('usebanner'),
45+
4146
/**
4247
* Lint JavaScript
4348
*/
@@ -64,7 +69,7 @@ module.exports = function(grunt) {
6469

6570

6671
// Full distribution task.
67-
grunt.registerTask('dist', ['clean', 'copy', 'less', 'dist-js']);
72+
grunt.registerTask('dist', ['clean', 'copy', 'less', 'dist-js', 'usebanner']);
6873

6974
grunt.registerTask('serve', ['connect:livereload', 'watch']);
7075

README.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
# Bootstrap-Admin-Template
2-
* [![NPM version](https://badge.fury.io/js/Bootstrap-Admin-Template.svg)](http://badge.fury.io/js/Bootstrap-Admin-Template)
2+
* [![Build Status](https://travis-ci.org/onokumus/Bootstrap-Admin-Template.svg)](https://travis-ci.org/onokumus/Bootstrap-Admin-Template)
3+
* [![Dependency Status](https://david-dm.org/onokumus/Bootstrap-Admin-Template.svg?theme=shields.io)](https://david-dm.org/onokumus/Bootstrap-Admin-Template)
4+
* [![devDependency Status](https://david-dm.org/onokumus/Bootstrap-Admin-Template/dev-status.svg?theme=shields.io)](https://david-dm.org/onokumus/Bootstrap-Admin-Template#info=devDependencies)
35
* [![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
46

7+
8+
> Free Admin Template Based On Twitter Bootstrap 3.x
9+
510
> Free Admin Template Based On Twitter Bootstrap 3.x
611
712
## TOC
@@ -17,14 +22,14 @@
1722
* Bootstrap 2.3.2 [v1.2](https://github.com/onokumus/Bootstrap-Admin-Template/archive/v1.2.zip)
1823
ready for use
1924

20-
* Bootstrap 3.3.0 [v2.3.1](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
25+
* Bootstrap 3.3.0 [v2.3.2](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
2126
ready `dist` folder your use
2227

2328

2429

2530
## Building
2631

27-
#### 2.3.1 Version
32+
#### 2.3.2 Version
2833
required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](http://gruntjs.com/getting-started)
2934

3035
```shell
@@ -35,7 +40,7 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
3540
$ grunt serve
3641
```
3742

38-
#### 2.3.1 RTL Version
43+
#### 2.3.2 RTL Version
3944
required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](http://gruntjs.com/getting-started)
4045

4146
```shell
@@ -54,8 +59,8 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
5459
$ open index.html
5560

5661
## Demo
57-
* [Demo v2.3.1](http://demo.onokumus.com/metis/)
58-
* [RTL v2.3.1](http://demo.onokumus.com/metis/rtl/)
62+
* [Demo v2.3.2](http://demo.onokumus.com/metis/)
63+
* [RTL v2.3.2](http://demo.onokumus.com/metis/rtl/)
5964
* [v1.2 `not development`](http://demo.onokumus.com/metis/v12)
6065

6166

@@ -85,7 +90,6 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
8590
* [Animate](http://daneden.github.io/animate.css/)
8691
* [Autosize](http://www.jacklmoore.com/autosize)
8792
* [Countdown](http://keith-wood.name/countdown.html)
88-
* [CSS Beautify](http://cssbeautify.com)
8993
* [Date range picker](https://github.com/dangrossman/bootstrap-daterangepicker)
9094
* [Flot](http://www.flotcharts.org)
9195
* [jQuery Form](http://jquery.malsup.com/form/)
@@ -115,9 +119,9 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
115119

116120

117121
## License
118-
Copyright (c) 2014 onokumus
122+
Copyright (c) 2015 onokumus
119123
Released under the MIT license
120124

121125
***
122126

123-
_This file was generated by [verb](https://github.com/assemble/verb) on November 29, 2014._
127+
_This file was generated by [verb](https://github.com/assemble/verb) on January 13, 2015._

bower.json

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Bootstrap-Admin-Template",
33
"description": "Twitter Bootstrap Admin Template",
4-
"version": "2.3.1",
4+
"version": "2.3.2",
55
"homepage": "https://github.com/onokumus/Bootstrap-Admin-Template",
66
"authors": [
77
"onokumus <onokumus@gmail.com>"
@@ -32,53 +32,27 @@
3232
"dist"
3333
],
3434
"devDependencies": {
35-
"SubtlePatterns": "https://github.com/subtlepatterns/SubtlePatterns.git",
36-
"jquery.sparkline.min": "http://omnipotent.net/jquery.sparkline/2.1.2/jquery.sparkline.min.js",
37-
"colorpicker": "http://www.eyecon.ro/bootstrap-colorpicker/colorpicker.zip",
38-
"datepicker": "http://www.eyecon.ro/bootstrap-datepicker/datepicker.zip",
39-
"chosen": "https://github.com/harvesthq/chosen/releases/download/v1.1.0/chosen_v1.1.0.zip",
40-
"pagedown-bootstrap": "https://github.com/kevinoconnor7/pagedown-bootstrap.git",
41-
"formwizard": "https://github.com/thecodemine/formwizard.git#~3.0.7",
42-
"jquery-ui-touch-punch": "https://github.com/furf/jquery-ui-touch-punch.git",
43-
"elfinder": "https://github.com/downloads/Studio-42/elFinder/elfinder-2.0-rc1.tar.gz",
44-
"jquery-validation": "~1.13.1",
35+
"pagedown-bootstrap": "https://github.com/kevinoconnor7/pagedown-bootstrap/archive/v1.1.zip",
36+
"formwizard": "https://github.com/thecodemine/formwizard/archive/v3.0.7.zip",
4537
"html5shiv": "~3.7.2",
4638
"respond": "~1.4.2",
47-
"font-awesome": "~4.2.0",
48-
"gmaps": "~0.4.15",
49-
"jquery.tablesorter": "~2.18.0",
50-
"jquery-autosize": "~1.18.14",
51-
"flot": "~0.8.3",
39+
"gmaps": "~0.4.16",
5240
"jquery-mousewheel": "~3.1.12",
53-
"kbwood_countdown": "~2.0.1",
54-
"jquery.uniform": "~2.1.2",
55-
"bootstrap-timepicker": "~0.2.6",
56-
"bootstrap-daterangepicker": "~1.3.15",
41+
"bootstrap-daterangepicker": "~1.3.17",
5742
"jQuery.validVal": "~5.0.2",
58-
"jquery.gritter": "*",
43+
"jquery.gritter": "~1.7.4",
5944
"plupload": "~2.1.2",
60-
"animate.css": "~3.2.0",
61-
"bootstrap-switch": "~3.1.0",
62-
"validationEngine": "~2.6.4",
63-
"jquery-form": "~3.46.0",
64-
"jquery.tagsinput": "~1.3.2",
65-
"datatables": "~1.10.3",
66-
"datatables-plugins": "*",
67-
"jasny-bootstrap": "~3.1.3",
68-
"blueimp-md5": "~1.1.0",
69-
"jquery-inputlimiter": "*",
45+
"bootstrap-switch": "~3.3.1",
46+
"kbwood_countdown": "git://github.com/kbwood/countdown.git#2.0.1",
47+
"jquery-inputlimiter": "https://jquery-inputlimiter.googlecode.com/files/jquery-inputlimiter.1.3.1.zip",
7048
"bootstrap-duallistbox": "~3.0.2",
71-
"fullcalendar": "~2.1.1",
49+
"fullcalendar": "~2.2.6",
7250
"bootstrap3-wysihtml5-bower": "~0.3.3",
73-
"holderjs": "~2.4.1",
74-
"ckeditor": "~4.4.4",
75-
"moment": "~2.8.3",
76-
"bootstrap": "~3.3.0",
77-
"screenfull": "~1.2.1",
78-
"epiceditor": "~0.2.2"
51+
"bootstrap": "~3.3.1",
52+
"jquery-validation": "~1.13.1"
7953
},
8054
"resolutions": {
81-
"jquery": "~2.1.1",
82-
"bootstrap": "~3.3.0"
55+
"jquery": "~2.1.3",
56+
"bootstrap": "~3.3.1"
8357
}
8458
}

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="assets/lib/bootstrap/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
1111

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

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

dist/404.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="assets/lib/bootstrap/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
1111

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

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">
@@ -28,14 +28,14 @@ <h1>404</h1>
2828
<div class="input-group">
2929
<input type="text" placeholder="search ..." class="form-control">
3030
<span class="input-group-btn">
31-
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32-
</span>
31+
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32+
</span>
3333
</div>
3434
</form>
3535
</div>
3636
<div class="clearfix"></div>
3737
<br>
38-
<div class="col-lg-6 col-lg-offset-3">
38+
<div class="col-lg-6 col-lg-offset-3">
3939
<div class="btn-group btn-group-justified">
4040
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
4141
<a href="index.html" class="btn btn-warning">Return Website</a>
@@ -44,4 +44,4 @@ <h1>404</h1>
4444
</div><!-- /.col-lg-8 col-offset-2 -->
4545
</div>
4646
</body>
47-
</html>
47+
</html>

dist/405.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="assets/lib/bootstrap/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
1111

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

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">
@@ -28,14 +28,14 @@ <h1>405</h1>
2828
<div class="input-group">
2929
<input type="text" placeholder="search ..." class="form-control">
3030
<span class="input-group-btn">
31-
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32-
</span>
31+
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32+
</span>
3333
</div>
3434
</form>
3535
</div>
3636
<div class="clearfix"></div>
3737
<br>
38-
<div class="col-lg-6 col-lg-offset-3">
38+
<div class="col-lg-6 col-lg-offset-3">
3939
<div class="btn-group btn-group-justified">
4040
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
4141
<a href="index.html" class="btn btn-warning">Return Website</a>
@@ -44,4 +44,4 @@ <h1>405</h1>
4444
</div><!-- /.col-lg-8 col-offset-2 -->
4545
</div>
4646
</body>
47-
</html>
47+
</html>

dist/500.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="assets/lib/bootstrap/css/bootstrap.min.css">
10+
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css">
1111

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

1515
<!-- Metis core stylesheet -->
1616
<link rel="stylesheet" href="assets/css/main.min.css">
@@ -28,14 +28,14 @@ <h1>500</h1>
2828
<div class="input-group">
2929
<input type="text" placeholder="search ..." class="form-control">
3030
<span class="input-group-btn">
31-
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32-
</span>
31+
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
32+
</span>
3333
</div>
3434
</form>
3535
</div>
3636
<div class="clearfix"></div>
3737
<br>
38-
<div class="col-lg-6 col-lg-offset-3">
38+
<div class="col-lg-6 col-lg-offset-3">
3939
<div class="btn-group btn-group-justified">
4040
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
4141
<a href="index.html" class="btn btn-warning">Return Website</a>
@@ -44,4 +44,4 @@ <h1>500</h1>
4444
</div><!-- /.col-lg-8 col-offset-2 -->
4545
</div>
4646
</body>
47-
</html>
47+
</html>

0 commit comments

Comments
 (0)