Skip to content

Commit

Permalink
hopefully works again
Browse files Browse the repository at this point in the history
  • Loading branch information
streeetlamp committed Oct 8, 2015
1 parent 2c00e9a commit 2b489a0
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 59 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ npm-debug.log

# ignore generated files
build/
app/bower_components/
app/*.html
app/css/*.css
app/js/main.js
Expand Down
52 changes: 3 additions & 49 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function(grunt) {
watch: {
scss: {
files: ['app/scss/**/*.scss'],
tasks: ['sass', 'autoprefixer']
tasks: ['sass']
},
css: {
files: ['app/css/**/*.css']
Expand Down Expand Up @@ -111,22 +111,6 @@ module.exports = function(grunt) {
}
},

htmlmin: { // Task
dist: { // Target
options: { // Target options
removeComments: true,
collapseWhitespace: true
},
files: [{ // Dictionary of files
expand: true, // Enable dynamic expansion.
cwd: 'build/', // Src matches are relative to this path.
src: ['**/*.html'], // Actual pattern(s) to match.
dest: 'build/', // Destination path prefix.
ext: '.html', // Dest filepaths will have this extension.
}]
}
},

// Build the site using grunt-includes
includes: {
dev: {
Expand All @@ -149,42 +133,15 @@ module.exports = function(grunt) {
}
},

devcode : {
dist : { // settings for task used with 'devcode:dist'
options: {
source: 'build/',
dest: 'build/',
env: 'production',
block: {
open: 'devcode', // with this string we open a block of code
close: 'endcode' // with this string we close a block of code
},
}
}
},

concurrent: {
watch: {
tasks: ['watch', 'compass', 'browserSync'],
tasks: ['watch', 'browserSync'],
options: {
logConcurrentOutput: true
}
}
},

copy: {
main: {
files: [
// includes files within path and its sub-directories
{
expand: true,
src: ['app/','!build/**','!bower_components/**','!node_modules/**','!.git/**','!library/scss/**'], dest: 'build/'
},
],
},
},


});

// 3. Where we tell Grunt we plan to use this plug-in.
Expand All @@ -202,9 +159,6 @@ module.exports = function(grunt) {

// html
grunt.loadNpmTasks('grunt-includes');

// Text Replacements
grunt.loadNpmTasks('grunt-devcode');

// Browser Reload + File Watch
grunt.loadNpmTasks('grunt-concurrent');
Expand All @@ -218,5 +172,5 @@ module.exports = function(grunt) {
grunt.registerTask('dev', ['browserSync','watch']);

// cleans directories, does everything for css, js, and images for deploy
grunt.registerTask('build', ['autoprefixer', 'cmq', 'cssmin', 'concat', 'uglify','includes:build','devcode:dist']);
grunt.registerTask('build', ['includes', 'includes:build', 'sass', 'autoprefixer', 'cmq', 'cssmin', 'concat', 'uglify']);
};
2 changes: 1 addition & 1 deletion app/include/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -193,4 +193,4 @@ <h1 id="misc">Misc Stuff - abbr, acronym, pre, code, sub, sup, etc.</h1>

</div>

include "footer.html"
include "footer.html"
6 changes: 1 addition & 5 deletions app/include/parts/footer.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
<footer class="footer">
<div class="footer__inner">
<small class="copyright">&copy; 2014 Site Title</small>
<small class="copyright">&copy; 2015 Site Title</small>
</div>
</footer>


<script src="//code.jquery.com/jquery-1.11.2.min.js"></script>
<script src="js/main.js"></script>

<!-- devcode: !production -->
<script src="//localhost:35729/livereload.js"></script>
<!-- endcode -->

</body>

</html>
1 change: 0 additions & 1 deletion app/scss/_breakpoints.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Breakpoint
// http://breakpoint-sass.com/
// http://responsivedesign.is/develop/browser-feature-support/media-queries-for-common-device-breakpoints
@import "breakpoint";
$breakpoint-no-queries: false;
$breakpoint-no-query-fallbacks: true;

Expand Down
5 changes: 3 additions & 2 deletions app/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ Author:
Stylesheet: Main Stylesheet
******************************************************************/
@import "compass";

@import "susy";
@import "../bower_components/susy/sass/susy";
@import "../bower_components/breakpoint-sass/stylesheets/breakpoint";

$susy: (
columns: 12,
gutters: 2/3,
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"grunt-contrib-uglify": "latest",
"grunt-contrib-watch": "latest",
"grunt-devcode": "latest",
"grunt-includes": "latest"
"grunt-includes": "latest",
"grunt-sass": "latest"
}
}

0 comments on commit 2b489a0

Please sign in to comment.