Skip to content

Commit d768530

Browse files
TheSegTheSeg
committed
Merge pull request #10 from TheSeg/grunt-convert
Grunt & Vendor Updates
2 parents 44b07b1 + 674c9d9 commit d768530

19 files changed

Lines changed: 2226 additions & 200 deletions

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ Thumbs.db
66
_site/
77
_bower_components/
88
codekit-config.json
9+
10+
# Node.js Ignores
11+
node_modules/

‎Gruntfile.js‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
module.exports = function(grunt) {
2+
grunt.initConfig({
3+
pkg: grunt.file.readJSON('package.json'),
4+
banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
5+
'<%= grunt.template.today("yyyy-mm-dd") %>\n',
6+
meta: {
7+
version: '0.1.0'
8+
},
9+
dirs: {
10+
javascript_dist: "js",
11+
javascript_src: "js/_src",
12+
less: "_less",
13+
css: "css",
14+
bower_components: "_bower_components",
15+
bs: {
16+
root: "<%= dirs.bower_components %>/bootstrap",
17+
js: "<%= dirs.bower_components %>/bootstrap/js",
18+
less: "<%= dirs.bower_components %>/bootstrap/less",
19+
},
20+
fa: "<%= dirs.bower_components %>/font-awesome",
21+
holderjs: "<%= dirs.bower_components %>/holderjs",
22+
html5shiv: "<%= dirs.bower_components %>/html5shiv/dist",
23+
jquery: "<%= dirs.bower_components %>/jquery",
24+
respond: "<%= dirs.brower_components %>/respond",
25+
},
26+
// Config Tasks
27+
init: {
28+
options: {
29+
stripBanners: true,
30+
},
31+
},
32+
less: {
33+
production: {
34+
options: {
35+
stripBanners: true,
36+
compress: true,
37+
cleancss: true,
38+
sourceMap: true,
39+
yuicompress: true,
40+
paths: [
41+
"<%= dirs.bs.less %>",
42+
"<%= dirs.less %>",
43+
"<%= dirs.less %>/bootswatch",
44+
],
45+
},
46+
files: {
47+
"<%= dirs.css %>/theme-default.css": "<%= dirs.less %>/theme-default.less",
48+
"<%= dirs.css %>/theme-valve.css": "<%= dirs.less %>/theme-valve.less",
49+
},
50+
},
51+
},
52+
concat: {
53+
options: {
54+
stripBanners: true,
55+
},
56+
bootstrap: {
57+
src: [
58+
'<%= dirs.bs.root %>/js/transition.js',
59+
'<%= dirs.bs.root %>/js/alert.js',
60+
'<%= dirs.bs.root %>/js/button.js',
61+
'<%= dirs.bs.root %>/js/carousel.js',
62+
'<%= dirs.bs.root %>/js/collapse.js',
63+
'<%= dirs.bs.root %>/js/dropdown.js',
64+
'<%= dirs.bs.root %>/js/modal.js',
65+
'<%= dirs.bs.root %>/js/tooltip.js',
66+
'<%= dirs.bs.root %>/js/popover.js',
67+
'<%= dirs.bs.root %>/js/scrollspy.js',
68+
'<%= dirs.bs.root %>/js/tab.js',
69+
'<%= dirs.bs.root %>/js/affix.js'
70+
],
71+
dest:"<%= dirs.javascript_dist %>/bootstrap.js",
72+
nonull: true,
73+
},
74+
custom: {
75+
src: [ '<%= dirs.javascript_src %>/bootswatch.js' , '<%= dirs.javascript_src %>/seg_resume.js' ],
76+
dest: '<%= dirs.javascript_dist %>/seg_resume.js',
77+
//nonull: true,
78+
},
79+
},
80+
copy: {
81+
options: {
82+
stripBanners:true,
83+
},
84+
html5shiv: {
85+
src: "<%= dirs.html5shiv %>/src/html5shiv.js",
86+
dest: "<%= dirs.javascript_dist %>/html5shiv.js",
87+
},
88+
respond: {
89+
src:"<%= dirs.respond %>/respond.min.js",
90+
dest: "<%= dirs.javascript_dist %>/respond.min.js",
91+
},
92+
font_awesome: {
93+
files: [
94+
{expand: true, src: ['<%= dirs.fa %>/font/*'], dest: 'font/', filter: 'isFile'},
95+
{expand: true, src: ['<%= dirs.fa %>/css/*.min.css'], dest: '<%= dirs.css %>/', filter: 'isFile'},
96+
],
97+
},
98+
},
99+
uglify: {
100+
options: {
101+
stripBanners: true,
102+
},
103+
bootstrap: {
104+
src: '<%= concat.bootstrap.dest %>',
105+
dest: '<%= dirs.javascript_dist %>/bootstrap.min.js',
106+
nonull: true,
107+
},
108+
holderjs: {
109+
src: ['<%= dirs.holderjs %>/holder.js'],
110+
dest: '<%= dirs.javascript_dist %>/holder.min.js',
111+
nonull: true,
112+
},
113+
custom: {
114+
src: ['<%= concat.custom.dest %>'],
115+
dest: '<%= dirs.javascript_dist %>/seg_resume.min.js',
116+
nonull: true,
117+
},
118+
},
119+
});
120+
121+
// Load the plugins for tasks.
122+
grunt.loadNpmTasks('grunt-contrib');
123+
124+
// Inital Setup Task
125+
grunt.registerTask( 'init', [ 'init' , 'build' ] );
126+
127+
// Build Task
128+
grunt.registerTask( 'build' , [ 'concat' , 'copy' , 'less' , 'uglify' ] );
129+
130+
// Default task(s).
131+
grunt.registerTask( 'default' , ['build'] );
132+
133+
};

‎_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ markdown: redcarpet
44
permalink: pretty
55
pygments: true
66
timezone: America/Los_Angeles
7-
exclude: [README.md,bower.json,bower_components]
7+
exclude: [README.md,bower.json,bower_components,node_modules]

‎_includes/content/introduction.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<div class="introduction-block row">
2-
<div class="visible-xs">
3-
<h2>Designer + Programmer</h2>
4-
</div>
5-
<div class="col-sm-3 col-xs-6 col-xs-push-12">
2+
<div class="visible-xs">
3+
<h2>Designer + Programmer</h2>
4+
</div>
5+
<div class="col-sm-3 col-xs-6">
66
<span class="icon-stack">
77
<i class="icon-circle icon-stack-base"></i>
88
<i class="icon-puzzle-piece icon-light"></i>
99
</span>
1010
</div>
11-
<div class="introduction-text col-sm-6 hidden-xs">
12-
<h2>Designer + Programmer</h2>
13-
</div>
11+
<div class="introduction-text col-sm-6 hidden-xs">
12+
<h2>Designer + Programmer</h2>
13+
</div>
1414
<div class="col-sm-3 col-xs-6">
1515
<span class="icon-stack">
1616
<i class="icon-circle icon-stack-base"></i>

‎_includes/post-javascript.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<script src="{{site.baseurl}}js/bootstrap.min.js" type="text/javascript"></script>
2-
<script src="{{site.baseurl}}js/bootswatch.min.js" type="text/javascript"></script>
32
<script src="{{site.baseurl}}js/seg_resume.min.js" type="text/javascript"></script>
43
<script src="https://www.dropbox.com/static/api/1/dropins.js" type="text/javascript" id="dropboxjs" data-app-key="g6es9wgsyd7z2zz"></script>

0 commit comments

Comments
 (0)