Skip to content

Commit 7eafbd2

Browse files
onokumusonokumus
committed
update submodule && add prettify
1 parent 466ba2d commit 7eafbd2

132 files changed

Lines changed: 17460 additions & 20338 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: 73 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,28 @@ module.exports = function (grunt) {
1313
'* Copyright <%= grunt.template.today("yyyy") %>\n' +
1414
'*/\n',
1515
clean: {dist: ['dist']},
16+
less: {
17+
options: {
18+
metadata: 'src/*.{json,yml}',
19+
paths: 'bower_components/bootstrap/less',
20+
imports: {
21+
less: ['mixins.less', 'variables.less']
22+
}
23+
},
24+
development: {
25+
files: {
26+
'dist/assets/css/main.css': ['src/assets/less/style.less']
27+
}
28+
},
29+
production: {
30+
options: {
31+
compress: true
32+
},
33+
files: {
34+
'dist/assets/css/main.min.css': ['src/assets/less/style.less']
35+
}
36+
}
37+
},
1638
concat: {
1739
options: {
1840
banner: '<%= banner %>',
@@ -56,6 +78,7 @@ module.exports = function (grunt) {
5678
// Task-level options
5779
options: {
5880
flattern: true,
81+
postprocess: require('pretty'),
5982
assets: 'dist/assets',
6083
data: 'src/data/*.{json,yml}',
6184
partials: ['src/templates/partials/**/*.hbs'],
@@ -135,55 +158,60 @@ module.exports = function (grunt) {
135158
src: ['*.html'],
136159
dest: 'dist'
137160
},
138-
{
139-
expand: true,
140-
cwd: 'node_modules/less/dist/',
141-
src: ['less-1.5.0.min.js'],
142-
dest: 'dist/assets/lib'
143-
},
144-
{
145-
expand: true,
146-
cwd: 'bower_components/jquery/',
147-
src: ['./**/jquery*.min.*'],
148-
dest: 'dist/assets/lib'
149-
},
150-
{
151-
expand: true,
152-
cwd: 'bower_components/bootstrap/dist/',
153-
src: ['./**/*.*'],
154-
dest: 'dist/assets/lib/bootstrap'
155-
},
156-
{
157-
expand: true,
158-
cwd: 'bower_components/font-awesome/',
159-
src: ['./css/*.*','./fonts/*.*'],
160-
dest: 'dist/assets/lib/Font-Awesome'
161-
}
162-
,
163-
{
164-
expand: true,
165-
cwd: 'bower_components/gmaps/',
166-
src: ['./**/gmaps.js'],
167-
dest: 'dist/assets/lib/gmaps'
168-
}
161+
{
162+
expand: true,
163+
cwd: 'node_modules/assemble-less/node_modules/less/dist/',
164+
src: ['less-1.5.1.min.js'],
165+
dest: 'dist/assets/lib'
166+
},
167+
{
168+
expand: true,
169+
cwd: 'bower_components/jquery/',
170+
src: ['./**/jquery*.min.*'],
171+
dest: 'dist/assets/lib'
172+
},
173+
{
174+
expand: true,
175+
cwd: 'bower_components/bootstrap/dist/',
176+
src: ['./**/*.*'],
177+
dest: 'dist/assets/lib/bootstrap'
178+
},
179+
{
180+
expand: true,
181+
cwd: 'bower_components/font-awesome/',
182+
src: ['./css/*.*', './fonts/*.*'],
183+
dest: 'dist/assets/lib/Font-Awesome'
184+
},
185+
{
186+
expand: true,
187+
cwd: 'bower_components/gmaps/',
188+
src: ['./**/gmaps.js'],
189+
dest: 'dist/assets/lib/gmaps'
190+
},
191+
{
192+
expand: true,
193+
cwd: 'bower_components/html5hiv',
194+
src: ['./dist/html5shiv.js'],
195+
dest: 'dist/assets/lib'
196+
}
169197
]
170198
}
171-
199+
172200
},
173201

174202
watch: {
175203
scripts: {
176204
files: ['**/*.js'],
177205
tasks: ['dist-js']
178206
},
179-
css: {
180-
files: ['**/*.css'],
181-
tasks: ['copy']
182-
},
183-
assemble: {
184-
files: ['**/*.hbs','**/*.html'],
185-
tasks: ['assemble']
186-
}
207+
css: {
208+
files: ['**/*.css'],
209+
tasks: ['copy']
210+
},
211+
assemble: {
212+
files: ['**/*.hbs', '**/*.html'],
213+
tasks: ['assemble']
214+
}
187215
}
188216

189217
});
@@ -197,11 +225,12 @@ module.exports = function (grunt) {
197225
grunt.loadNpmTasks('grunt-contrib-uglify');
198226
//grunt.loadNpmTasks('grunt-contrib-qunit');
199227
grunt.loadNpmTasks('grunt-contrib-watch');
200-
201-
228+
grunt.loadNpmTasks('assemble-less');
229+
230+
202231
//grunt.loadNpmTasks('grunt-recess');
203232
// remove grunt-recess modules. because not supported my code
204-
233+
205234
grunt.loadNpmTasks('assemble');
206235

207236
// Test task.
@@ -210,11 +239,9 @@ module.exports = function (grunt) {
210239
// JS distribution task.
211240
grunt.registerTask('dist-js', ['concat', 'jshint', 'uglify']);
212241

213-
// CSS distribution task.
214-
//grunt.registerTask('dist-css', ['recess']);
215242

216243
// Full distribution task.
217-
grunt.registerTask('dist', ['clean', 'dist-js', 'copy']);
244+
grunt.registerTask('dist', ['clean', 'less', 'dist-js', 'copy']);
218245

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

‎bower.json‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
{
2-
"name": "Bootstrap-Admin-Template",
3-
"version": "2.1.0",
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.0",
24-
"font-awesome": "~4.0.1",
25-
"gmaps": "~0.4.6"
26-
}
2+
"name": "Bootstrap-Admin-Template",
3+
"version": "2.1.1",
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+
}
2728
}

‎dist/403.html‎

Lines changed: 39 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,61 +3,55 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>403</title>
6-
<meta name="msapplication-TileColor" content="#5bc0de"/>
7-
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png"/>
8-
6+
<meta name="msapplication-TileColor" content="#5bc0de" />
7+
<meta name="msapplication-TileImage" content="assets/img/metis-tile.png" />
98
<link rel="stylesheet" href="assets/lib/bootstrap/css/bootstrap.css">
109
<link rel="stylesheet" href="assets/css/main.css">
1110
<link rel="stylesheet" href="assets/lib/magic/magic.css">
12-
<link rel="stylesheet" href="assets/lib/Font-Awesome/css/font-awesome.css"/>
11+
<link rel="stylesheet" href="assets/lib/Font-Awesome/css/font-awesome.css" />
1312
<script>
14-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
15-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
16-
17-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
18-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
19-
20-
ga('create', 'UA-1669764-16', 'onokumus.com');
21-
ga('send', 'pageview');
22-
23-
</script>
13+
(function(i, s, o, g, r, a, m) {
14+
i['GoogleAnalyticsObject'] = r;
15+
i[r] = i[r] || function() {
16+
(i[r].q = i[r].q || []).push(arguments)
17+
}, i[r].l = 1 * new Date();
18+
a = s.createElement(o),
19+
m = s.getElementsByTagName(o)[0];
20+
a.async = 1;
21+
a.src = g;
22+
m.parentNode.insertBefore(a, m)
23+
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
24+
ga('create', 'UA-1669764-16', 'onokumus.com');
25+
ga('send', 'pageview');
26+
</script>
2427
</head>
2528
<body class="error">
2629
<div class="container">
27-
<div class="col-lg-8 col-lg-offset-2 text-center">
28-
<div class="logo">
29-
<h1>403</h1>
30-
</div>
31-
<p class="lead text-muted">Oops, an error has occurred. Forbidden!</p>
32-
<div class="clearfix"></div>
33-
<div class="col-lg-6 col-lg-offset-3">
34-
<form action="index.html">
35-
36-
<div class="input-group">
37-
<input type="text" placeholder="search ..." class="form-control">
38-
<span class="input-group-btn">
30+
<div class="col-lg-8 col-lg-offset-2 text-center">
31+
<div class="logo">
32+
<h1>403</h1>
33+
</div>
34+
<p class="lead text-muted">Oops, an error has occurred. Forbidden!</p>
35+
<div class="clearfix"></div>
36+
<div class="col-lg-6 col-lg-offset-3">
37+
<form action="index.html">
38+
<div class="input-group">
39+
<input type="text" placeholder="search ..." class="form-control">
40+
<span class="input-group-btn">
3941
<button class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
4042
</span>
41-
</div>
42-
43-
</form>
44-
</div>
45-
<div class="clearfix"></div>
46-
<br>
47-
<div class="col-lg-6 col-lg-offset-3">
48-
<div class="btn-group btn-group-justified">
49-
<a href="dashboard.html" class="btn btn-info">Return Dashboard</a>
50-
<a href="index.html" class="btn btn-warning">Return Website</a>
51-
</div>
52-
53-
</div>
43+
</div>
44+
</form>
5445
</div>
55-
<!-- /.col-lg-8 col-offset-2 -->
56-
57-
46+
<div class="clearfix"></div>
47+
<br>
48+
<div class="col-lg-6 col-lg-offset-3">
49+
<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>
52+
</div>
5853
</div>
59-
60-
61-
54+
</div><!-- /.col-lg-8 col-offset-2 -->
55+
</div>
6256
</body>
6357
</html>

0 commit comments

Comments
 (0)