Skip to content

Commit 6a21c7e

Browse files
onokumusonokumus
committed
v2.1.3
1 parent 0d73f7f commit 6a21c7e

240 files changed

Lines changed: 32168 additions & 6929 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.

‎Gruntfile.js‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,22 @@ module.exports = function (grunt) {
77
// Metadata
88
pkg: grunt.file.readJSON('package.json'),
99
banner: '/**\n' +
10-
'* <%=pkg.name %> by <%= pkg.author.email %>\n' +
11-
'* Version : <%= pkg.version %> \n' +
12-
'* Author : <%= pkg.author.name %> \n' +
10+
'* <%=pkg.name %> v<%= pkg.version %>\n' +
11+
'* Author : <%= pkg.author %> \n' +
1312
'* Copyright <%= grunt.template.today("yyyy") %>\n' +
13+
'* Licensed under <%= _.pluck(pkg.licenses, "type") %> (<%= _.pluck(pkg.licenses, "url") %>)\n' +
1414
'*/\n',
1515
clean: {dist: ['dist']},
1616
less: {
1717
options: {
18+
banner: '<%= banner %>',
1819
metadata: 'src/*.{json,yml}',
20+
// sourceMap: true,
21+
// sourceMapFilename: "dist/assets/css/style.css.map",
22+
// sourceMapURL: 'style.css.map',
1923
paths: 'bower_components/bootstrap/less',
2024
imports: {
21-
less: ['mixins.less', 'variables.less']
25+
reference: ['mixins.less', 'variables.less']
2226
}
2327
},
2428
development: {
@@ -146,12 +150,6 @@ module.exports = function (grunt) {
146150
src: ['./**/*.*'],
147151
dest: 'dist/assets/lib'
148152
},
149-
{
150-
expand: true,
151-
cwd: 'src/assets/less',
152-
src: ['theme.less'],
153-
dest: 'dist/assets/less'
154-
},
155153
{
156154
expand: true,
157155
cwd: 'src/ember',
@@ -161,7 +159,7 @@ module.exports = function (grunt) {
161159
{
162160
expand: true,
163161
cwd: 'node_modules/assemble-less/node_modules/less/dist/',
164-
src: ['less-1.5.1.min.js'],
162+
src: ['less-1.6.1.min.js'],
165163
dest: 'dist/assets/lib'
166164
},
167165
{
@@ -196,13 +194,24 @@ module.exports = function (grunt) {
196194
},
197195
{
198196
expand: true,
199-
cwd: 'bower_components/respond',
197+
cwd: 'bower_components/respond/dest',
200198
src: ['./respond.min.js'],
201199
dest: 'dist/assets/lib/respond'
202-
}
200+
},
201+
{
202+
expand: true,
203+
cwd: 'src/assets/less',
204+
src: ['./**/theme.less'],
205+
dest: 'dist/assets/less'
206+
},
207+
{
208+
expand: true,
209+
cwd: 'node_modules/epiceditor/epiceditor',
210+
src: ['./**/*.*'],
211+
dest: 'dist/assets/lib/epiceditor'
212+
}
203213
]
204214
}
205-
206215
},
207216

208217
watch: {
@@ -245,9 +254,9 @@ module.exports = function (grunt) {
245254
// JS distribution task.
246255
grunt.registerTask('dist-js', ['concat', 'jshint', 'uglify']);
247256

248-
257+
249258
// Full distribution task.
250-
grunt.registerTask('dist', ['clean', 'less', 'dist-js', 'copy']);
259+
grunt.registerTask('dist', ['clean', 'copy', 'less', 'dist-js']);
251260

252261
// Default task.
253262
//grunt.registerTask('default', ['test', 'dist']);

‎README.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ Metis Admin Template with Twitter Bootstrap [![Build Status](https://travis-ci.o
55
Bootstrap 2.3.2 [V.1.2](https://github.com/onokumus/Bootstrap-Admin-Template/archive/v1.2.zip)
66
ready for use
77

8-
Bootstrap 3.0.0 [V2.1.2](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
8+
Bootstrap 3.0.3 [V2.1.3](https://github.com/onokumus/Bootstrap-Admin-Template/archive/master.zip)
99
ready `dist` folder your use
1010

1111

1212

1313
### Building
1414

15-
#### 2.1.2 Version
15+
#### 2.1.3 Version
1616
required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](http://gruntjs.com/getting-started)
1717

1818
$ git clone https://github.com/onokumus/Bootstrap-Admin-Template.git yourfoldername
@@ -34,14 +34,15 @@ required [node.js](http://nodejs.org/) & [bower](http://bower.io/) & [grunt](htt
3434

3535
### Demo
3636

37-
#### For 2.1.2 version
37+
#### For 2.1.3 version
3838
http://demo.onokumus.com/metis/
3939

4040
#### For 1.2 version
4141
(not development)
4242
http://demo.onokumus.com/metis/v12
4343

4444
### Release History
45+
* 2014-01-19 v2.1.3 add suitcss 's flex-embed component
4546
* 2013-11-30 v2.1.2 create menu plugin, rewrite menu.less
4647
* 2013-10-28 v2.1.1 add bower
4748
* 2013-10-28 v2.1.1 remove bootsrap, font awesome, gmaps submodule.
@@ -93,7 +94,8 @@ http://demo.onokumus.com/metis/v12
9394
* [Validation Engine](http://www.position-relative.net/)
9495
* [jquery.validVal](http://validval.frebsite.nl/)
9596
* [bootstrap-wysihtml5](http://jhollingworth.github.io/bootstrap-wysihtml5/)
97+
* [Suitcss Flex-Embed](https://github.com/suitcss/flex-embed)
9698

9799
### Licensing
98100

99-
Bootstrap Admin template is open-sourced software licensed under the [MIT License](http://opensource.org/licenses/MIT)
101+
Bootstrap Admin template is open-sourced software licensed under the [MIT License](LICENSE).

‎bower.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
{
2-
"name": "Bootstrap-Admin-Template",
3-
"version": "2.1.2",
4-
"author": {
5-
"name": "Osman Nuri Okumuş",
6-
"email": "onokumus@gmail.com",
7-
"url": "https://github.com/onokumus"
8-
},
9-
"description": "Twitter Bootstrap Admin Template",
10-
"license": "MIT",
11-
"repository": {
12-
"type": "git",
13-
"url": "https://github.com/onokumus/Bootstrap-Admin-Template.git"
14-
},
15-
"bugs": {
16-
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/issues"
17-
},
18-
"licenses": {
19-
"type": "MIT",
20-
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/README.md"
21-
},
22-
"dependencies": {
23-
"bootstrap": "~3.0.2",
24-
"font-awesome": "~4.0.3",
25-
"gmaps": "~0.4.8",
26-
"html5shiv": "~3.7.0",
27-
"respond": "~1.4.0"
28-
}
2+
"name": "Bootstrap-Admin-Template",
3+
"version": "2.1.2",
4+
"author": {
5+
"name": "Osman Nuri Okumuş",
6+
"email": "onokumus@gmail.com",
7+
"url": "https://github.com/onokumus"
8+
},
9+
"description": "Twitter Bootstrap Admin Template",
10+
"license": "MIT",
11+
"repository": {
12+
"type": "git",
13+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template.git"
14+
},
15+
"bugs": {
16+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/issues"
17+
},
18+
"licenses": {
19+
"type": "MIT",
20+
"url": "https://github.com/onokumus/Bootstrap-Admin-Template/blob/master/README.md"
21+
},
22+
"dependencies": {
23+
"bootstrap": "~3.0.2",
24+
"font-awesome": "~4.0.3",
25+
"gmaps": "~0.4.8",
26+
"html5shiv": "~3.7.0",
27+
"respond": "~1.4.0"
28+
}
2929
}

‎dist/403.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ <h1>403</h1>
3939
<input type="text" placeholder="search ..." class="form-control">
4040
<span class="input-group-btn">
4141
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
42-
</span>
42+
</span>
4343
</div>
4444
</form>
4545
</div>
4646
<div class="clearfix"></div>
4747
<br>
4848
<div class="col-lg-6 col-lg-offset-3">
4949
<div class="btn-group btn-group-justified">
50-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51-
<a href="index.html" class="btn btn-warning">Return Website</a>
50+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51+
<a href="index.html" class="btn btn-warning">Return Website</a>
5252
</div>
5353
</div>
5454
</div><!-- /.col-lg-8 col-offset-2 -->

‎dist/404.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ <h1>404</h1>
3939
<input type="text" placeholder="search ..." class="form-control">
4040
<span class="input-group-btn">
4141
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
42-
</span>
42+
</span>
4343
</div>
4444
</form>
4545
</div>
4646
<div class="clearfix"></div>
4747
<br>
4848
<div class="col-lg-6 col-lg-offset-3">
4949
<div class="btn-group btn-group-justified">
50-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51-
<a href="index.html" class="btn btn-warning">Return Website</a>
50+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51+
<a href="index.html" class="btn btn-warning">Return Website</a>
5252
</div>
5353
</div>
5454
</div><!-- /.col-lg-8 col-offset-2 -->

‎dist/405.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ <h1>405</h1>
3939
<input type="text" placeholder="search ..." class="form-control">
4040
<span class="input-group-btn">
4141
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
42-
</span>
42+
</span>
4343
</div>
4444
</form>
4545
</div>
4646
<div class="clearfix"></div>
4747
<br>
4848
<div class="col-lg-6 col-lg-offset-3">
4949
<div class="btn-group btn-group-justified">
50-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51-
<a href="index.html" class="btn btn-warning">Return Website</a>
50+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51+
<a href="index.html" class="btn btn-warning">Return Website</a>
5252
</div>
5353
</div>
5454
</div><!-- /.col-lg-8 col-offset-2 -->

‎dist/500.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ <h1>500</h1>
3939
<input type="text" placeholder="search ..." class="form-control">
4040
<span class="input-group-btn">
4141
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
42-
</span>
42+
</span>
4343
</div>
4444
</form>
4545
</div>
4646
<div class="clearfix"></div>
4747
<br>
4848
<div class="col-lg-6 col-lg-offset-3">
4949
<div class="btn-group btn-group-justified">
50-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51-
<a href="index.html" class="btn btn-warning">Return Website</a>
50+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51+
<a href="index.html" class="btn btn-warning">Return Website</a>
5252
</div>
5353
</div>
5454
</div><!-- /.col-lg-8 col-offset-2 -->

‎dist/503.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ <h1>503</h1>
3939
<input type="text" placeholder="search ..." class="form-control">
4040
<span class="input-group-btn">
4141
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
42-
</span>
42+
</span>
4343
</div>
4444
</form>
4545
</div>
4646
<div class="clearfix"></div>
4747
<br>
4848
<div class="col-lg-6 col-lg-offset-3">
4949
<div class="btn-group btn-group-justified">
50-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51-
<a href="index.html" class="btn btn-warning">Return Website</a>
50+
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
51+
<a href="index.html" class="btn btn-warning">Return Website</a>
5252
</div>
5353
</div>
5454
</div><!-- /.col-lg-8 col-offset-2 -->

0 commit comments

Comments
 (0)