Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
98 changes: 98 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
module.exports = function(grunt) {

// Show elapsed time after tasks run to measure performance.
require('time-grunt')(grunt);

// Load all Grunt tasks that are listed in package.json.
require('load-grunt-tasks')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

// Shell commands for use in Grunt tasks.
shell: {
jekyllBuild: {
command: 'jekyll build'
},
jekyllServe: {
command: 'jekyll serve'
}
},

// Configuration for sass (libsass).
sass: {
options: {
outputStyle: 'nested',
sourceMap: true,
sassDir: '_sass',
cssDir: '_site/css'
},
dist: {
files: [{
expand: true,
cwd: '_sass/',
src: ['**/*.scss'],
dest: '_site/css',
ext: '.css'
}]
}
},

// Add browser prefixes to css automatically.
autoprefixer: {
options: {
browsers: ['last 4 versions', 'ie 9']
},
dist: {
src: '_site/css/*.css'
}
},

// Watch for files to change and run tasks when they do.
watch: {
sass: {
files: ['_sass/**/*.scss'],
tasks: ['sass','autoprefixer']
},
jekyll: {
files: ['**/*.{md,html}'],
tasks: ['shell:jekyllBuild','sass','autoprefixer']
}
},

// Update browser when files are changed.
browserSync: {
bsFiles: {
src : [
'_site/css/*.css',
'_site/*.html'
]
},
options: {
watchTask: true,
server: {
baseDir: './_site'
}
}
}

});

// Grunt serve task.
grunt.registerTask('serve', [
'browserSync',
'shell:jekyllBuild',
'sass',
'watch'
]);

// Grunt build task.
grunt.registerTask('build', [
'shell:jekyllBuild',
'sass',
'autoprefixer'
]);

// Register build as the default task fallback.
grunt.registerTask('default', 'serve');
};
4 changes: 3 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ twitter_username: adventistchurch
# Build settings
highlighter: highlighter
markdown: kramdown
exclude: [node_modules, ‘css’, ‘_scss’]
keep_files: ['_site/css']

gems:
plugins:
- jekyll-last-modified-at
Binary file removed _includes/.DS_Store
Binary file not shown.
Binary file removed _includes/patterns/.DS_Store
Binary file not shown.
Binary file removed _sass/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion _sass/components/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
.c-btn {
display: inline-block;
background: $color-gray-73;
background: coral;
border-radius: $border-radius;
cursor: pointer;
color: $color-white;
Expand Down
6 changes: 3 additions & 3 deletions css/main.scss → _sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Only the main Sass file needs front matter (the dashes are enough)
---
// ---
// # Only the main Sass file needs front matter (the dashes are enough)
// ---

/*------------------------------------*\
#TABLE OF CONTENTS
Expand Down
4 changes: 2 additions & 2 deletions css/style-guide.scss → _sass/style-guide.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
---
// ---
// ---

$color-white: #ffffff;
$color-gray-dark: #333333;
Expand Down
20 changes: 0 additions & 20 deletions _site/LICENSE

This file was deleted.

21 changes: 0 additions & 21 deletions _site/README.md

This file was deleted.

36 changes: 10 additions & 26 deletions _site/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<link rel="icon" href=" /favicon.ico ">


<link rel="canonical" href="http://localhost:4000/about.html">
<link rel="canonical" href="http://yourdomain.com/about.html">
</head>

<body>
Expand Down Expand Up @@ -192,7 +192,7 @@ <h3 class="c-logo">

</a>
</li>

</ul>
</li>

Expand Down Expand Up @@ -290,7 +290,7 @@ <h3 class="c-logo">

</a>
</li>

</ul>

</li>
Expand Down Expand Up @@ -510,14 +510,6 @@ <h3 class="c-logo">














Expand Down Expand Up @@ -702,14 +694,6 @@ <h3 class="c-logo">














Expand All @@ -731,7 +715,7 @@ <h3 class="c-logo">

<li class="c-primary-nav__item ">



</li>
<!-- end c-nav__list__item -->
Expand Down Expand Up @@ -788,19 +772,19 @@ <h3 class="c-logo">

</a>
</li>

</ul>

</li>
<!-- end c-nav__list__item -->

<li class="c-primary-nav__item">


<a href=" /page-templates.html " class="c-primary-nav__link ">
<span class="c-primary-nav__text">Page templates</span>
</a>


</li>
<!-- end c-nav__list__item -->
Expand All @@ -811,14 +795,14 @@ <h3 class="c-logo">
<a href=" /downloads.html " class="c-primary-nav__link ">
<span class="c-primary-nav__text">Downloads</span>
</a>


</li>
<!-- end c-nav__list__item -->

<li class="c-primary-nav__item">


<a href=" /support.html " class="c-primary-nav__link ">
<span class="c-primary-nav__text">Support</span>
</a>
Expand All @@ -833,7 +817,7 @@ <h3 class="c-logo">
<a href=" /contribute.html " class="c-primary-nav__link ">
<span class="c-primary-nav__text">Contribute</span>
</a>


</li>
<!-- end c-nav__list__item -->
Expand Down
Loading