diff --git a/CHANGELOG.md b/CHANGELOG.md
index fedfe29..8fabe80 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.1.0
+* There's now a very, very, very basic theme to do something from. ([#25](https://github.com/sondr3/generator-jekyllized/issues/25))
+* Running tests now work. ([#24](https://github.com/sondr3/generator-jekyllized/issues/24))
+* Added a bunch of badges to the README. Yay, badges, badges, badgers, badgers.
+
## 0.0.9 (January 28, 2014)
* Major restructuring and fixing of the Gruntfile and Index.js. This removes the functionality for the deploy options and changes the assets directories so you can't change them.
* Added Bitdeli, Travis CI and Waffle.io to the README. ([#23](https://github.com/sondr3/generator-jekyllized/issues/23)) & ([#21](https://github.com/sondr3/generator-jekyllized/issues/21)) & ([#20](https://github.com/sondr3/generator-jekyllized/issues/20))
diff --git a/README.md b/README.md
index 616e104..fb88cb8 100755
--- a/README.md
+++ b/README.md
@@ -1,12 +1,9 @@
-[](https://waffle.io/sondr3/generator-jekyllized)
-[](https://travis-ci.org/sondr3/generator-jekyllized)
-[](https://david-dm.org/sondr3/generator-jekyllized)
-[](https://david-dm.org/sondr3/generator-jekyllized#info=devDependencies)
-
# generator-jekyllized
[](http://badge.fury.io/js/generator-jekyllized)
-[](https://nodei.co/npm/generator-jekyllized/)
+[](https://travis-ci.org/sondr3/generator-jekyllized)
+[](https://david-dm.org/sondr3/generator-jekyllized)
+[](https://david-dm.org/sondr3/generator-jekyllized#info=devDependencies)
### NOTE: WORK IN PROGRESS
## **Bugs ahoy! Use at your own discretion.**
@@ -25,6 +22,8 @@ Jekyllized is a highly opinionated generator for developing static sites, and es
- [HTML5 ★ BOILERPLATE][html5boilerplate] based theme
- Sane Jekyll defaults with some extras
+[](https://waffle.io/sondr3/generator-jekyllized)
+
[](https://bitdeli.com/free "Bitdeli Badge")
[jekyll]: https://jekyllrb.com
diff --git a/app/index.js b/app/index.js
index 8edd844..9f894e4 100755
--- a/app/index.js
+++ b/app/index.js
@@ -275,16 +275,13 @@ JekyllizeGenerator.prototype.jekyllInit = function jekyllInit() {
};
JekyllizeGenerator.prototype.templates = function templates() {
- this.template('conditional/template/_layouts/default.html', 'app/_layouts/default.html');
- this.template('conditional/template/index.md', 'app/index.md');
-
if (this.googleAnalytics) {
this.copy('conditional/template/_includes/_googleanalytics.html', 'app/_includes/_googleanalytics.html');
};
};
-JekyllizeGenerator.prototype.coffeescript = function coffeescript() {
+/*JekyllizeGenerator.prototype.coffeescript = function coffeescript() {
this.mkdir('app/assets/_coffee');
this.copy('conditional/coffee/README.md', 'app/assets/_coffee/README.md');
this.copy('conditional/coffee/app.coffee', 'app/assets/_coffee/app.coffee');
-};
\ No newline at end of file
+};*/
\ No newline at end of file
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index 6b4bdf9..abbd716 100755
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -348,7 +348,7 @@ module.exports = function (grunt) {
verbose: true
},
check: {
- src: ['.tmp/assets/stylesheets/screen.css']
+ src: ['.tmp/assets/stylesheets/main.css']
}
},
csslint: {
@@ -383,7 +383,7 @@ module.exports = function (grunt) {
grunt.task.run([
'clean:server',
- 'concurrent:server'
+ 'concurrent:server',
'autoprefixer:server',
'connect:livereload',
'watch'
@@ -414,7 +414,7 @@ module.exports = function (grunt) {
'concurrent:dist',
'useminPrepare',
'concat',
- 'autoprefixer:dist',>
+ 'autoprefixer:dist',
'cssmin',
'uglify',
'imagemin',
diff --git a/app/templates/_bower.json b/app/templates/_bower.json
index f9784b5..7587689 100755
--- a/app/templates/_bower.json
+++ b/app/templates/_bower.json
@@ -1,6 +1,8 @@
{
"name": "<%= _.slugify(appname) %>",
- "version": "0.0.2",
+ "version": "0.1.0",
"dependencies": {
+ "normalize-css": "~2.1.3",
+ "modernizr": "~2.7.1"
}
}
diff --git a/app/templates/_package.json b/app/templates/_package.json
index 105b785..2083b0e 100755
--- a/app/templates/_package.json
+++ b/app/templates/_package.json
@@ -1,7 +1,7 @@
{
"name": "<%= _.slugify(appname) %>",
"private": true,
- "version": "0.0.2",
+ "version": "0.1.0",
"description": "Yeoman workflow for <%= appname %>",
"dependencies": {},
"devDependencies": {
diff --git a/app/templates/app/404.html b/app/templates/app/404.html
new file mode 100755
index 0000000..0a5afda
--- /dev/null
+++ b/app/templates/app/404.html
@@ -0,0 +1,59 @@
+
+
+
+
+ Page Not Found
+
+
+
+
+ Page Not Found
+ Sorry, but the page you were trying to view does not exist.
+
+
+
diff --git a/app/templates/conditional/template/_layouts/default.html b/app/templates/app/_layouts/default.html
similarity index 82%
rename from app/templates/conditional/template/_layouts/default.html
rename to app/templates/app/_layouts/default.html
index d2a7a68..0c49017 100755
--- a/app/templates/conditional/template/_layouts/default.html
+++ b/app/templates/app/_layouts/default.html
@@ -6,10 +6,11 @@
{{ page.title }}
-
+
+
@@ -40,7 +41,8 @@
-
+
+
diff --git a/app/templates/conditional/coffee/README.md b/app/templates/app/assets/_coffee/README.md
similarity index 100%
rename from app/templates/conditional/coffee/README.md
rename to app/templates/app/assets/_coffee/README.md
diff --git a/app/templates/conditional/coffee/app.coffee b/app/templates/app/assets/_coffee/app.coffee
similarity index 100%
rename from app/templates/conditional/coffee/app.coffee
rename to app/templates/app/assets/_coffee/app.coffee
diff --git a/app/templates/app/assets/stylesheets/main.css b/app/templates/app/assets/stylesheets/main.css
new file mode 100755
index 0000000..d3d90a2
--- /dev/null
+++ b/app/templates/app/assets/stylesheets/main.css
@@ -0,0 +1,265 @@
+/*! HTML5 Boilerplate v4.3.0 | MIT License | http://h5bp.com/ */
+
+/*
+ * What follows is the result of much research on cross-browser styling.
+ * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
+ * Kroc Camen, and the H5BP dev community and team.
+ */
+
+/* ==========================================================================
+ Base styles: opinionated defaults
+ ========================================================================== */
+
+html {
+ color: #222;
+ font-size: 1em;
+ line-height: 1.4;
+}
+
+/*
+ * Remove text-shadow in selection highlight: h5bp.com/i
+ * These selection rule sets have to be separate.
+ * Customize the background color to match your design.
+ */
+
+::-moz-selection {
+ background: #b3d4fc;
+ text-shadow: none;
+}
+
+::selection {
+ background: #b3d4fc;
+ text-shadow: none;
+}
+
+/*
+ * A better looking default horizontal rule
+ */
+
+hr {
+ display: block;
+ height: 1px;
+ border: 0;
+ border-top: 1px solid #ccc;
+ margin: 1em 0;
+ padding: 0;
+}
+
+/*
+ * Remove the gap between images, videos, audio and canvas and the bottom of
+ * their containers: h5bp.com/i/440
+ */
+
+audio,
+canvas,
+img,
+svg,
+video {
+ vertical-align: middle;
+}
+
+/*
+ * Remove default fieldset styles.
+ */
+
+fieldset {
+ border: 0;
+ margin: 0;
+ padding: 0;
+}
+
+/*
+ * Allow only vertical resizing of textareas.
+ */
+
+textarea {
+ resize: vertical;
+}
+
+/* ==========================================================================
+ Browse Happy prompt
+ ========================================================================== */
+
+.browsehappy {
+ margin: 0.2em 0;
+ background: #ccc;
+ color: #000;
+ padding: 0.2em 0;
+}
+
+/* ==========================================================================
+ Author's custom styles
+ ========================================================================== */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* ==========================================================================
+ Helper classes
+ ========================================================================== */
+
+/*
+ * Hide from both screenreaders and browsers: h5bp.com/u
+ */
+
+.hidden {
+ display: none !important;
+ visibility: hidden;
+}
+
+/*
+ * Hide only visually, but have it available for screenreaders: h5bp.com/v
+ */
+
+.visuallyhidden {
+ border: 0;
+ clip: rect(0 0 0 0);
+ height: 1px;
+ margin: -1px;
+ overflow: hidden;
+ padding: 0;
+ position: absolute;
+ width: 1px;
+}
+
+/*
+ * Extends the .visuallyhidden class to allow the element to be focusable
+ * when navigated to via the keyboard: h5bp.com/p
+ */
+
+.visuallyhidden.focusable:active,
+.visuallyhidden.focusable:focus {
+ clip: auto;
+ height: auto;
+ margin: 0;
+ overflow: visible;
+ position: static;
+ width: auto;
+}
+
+/*
+ * Hide visually and from screenreaders, but maintain layout
+ */
+
+.invisible {
+ visibility: hidden;
+}
+
+/*
+ * Clearfix: contain floats
+ *
+ * For modern browsers
+ * 1. The space content is one way to avoid an Opera bug when the
+ * `contenteditable` attribute is included anywhere else in the document.
+ * Otherwise it causes space to appear at the top and bottom of elements
+ * that receive the `clearfix` class.
+ * 2. The use of `table` rather than `block` is only necessary if using
+ * `:before` to contain the top-margins of child elements.
+ */
+
+.clearfix:before,
+.clearfix:after {
+ content: " "; /* 1 */
+ display: table; /* 2 */
+}
+
+.clearfix:after {
+ clear: both;
+}
+
+/* ==========================================================================
+ EXAMPLE Media Queries for Responsive Design.
+ These examples override the primary ('mobile first') styles.
+ Modify as content requires.
+ ========================================================================== */
+
+@media only screen and (min-width: 35em) {
+ /* Style adjustments for viewports that meet the condition */
+}
+
+@media print,
+ (-o-min-device-pixel-ratio: 5/4),
+ (-webkit-min-device-pixel-ratio: 1.25),
+ (min-resolution: 120dpi) {
+ /* Style adjustments for high resolution devices */
+}
+
+/* ==========================================================================
+ Print styles.
+ Inlined to avoid required HTTP connection: h5bp.com/r
+ ========================================================================== */
+
+@media print {
+ * {
+ background: transparent !important;
+ color: #000 !important; /* Black prints faster: h5bp.com/s */
+ box-shadow: none !important;
+ text-shadow: none !important;
+ }
+
+ a,
+ a:visited {
+ text-decoration: underline;
+ }
+
+ a[href]:after {
+ content: " (" attr(href) ")";
+ }
+
+ abbr[title]:after {
+ content: " (" attr(title) ")";
+ }
+
+ /*
+ * Don't show links for images, or javascript/internal links
+ */
+
+ a[href^="javascript:"]:after,
+ a[href^="#"]:after {
+ content: "";
+ }
+
+ pre,
+ blockquote {
+ border: 1px solid #999;
+ page-break-inside: avoid;
+ }
+
+ thead {
+ display: table-header-group; /* h5bp.com/t */
+ }
+
+ tr,
+ img {
+ page-break-inside: avoid;
+ }
+
+ img {
+ max-width: 100% !important;
+ }
+
+ p,
+ h2,
+ h3 {
+ orphans: 3;
+ widows: 3;
+ }
+
+ h2,
+ h3 {
+ page-break-after: avoid;
+ }
+}
diff --git a/app/templates/app/crossdomain.xml b/app/templates/app/crossdomain.xml
new file mode 100755
index 0000000..29a035d
--- /dev/null
+++ b/app/templates/app/crossdomain.xml
@@ -0,0 +1,15 @@
+
+
+