Skip to content

Commit

Permalink
Added a very basic theme and fixed running tests
Browse files Browse the repository at this point in the history
There's now a very, very basic theme implemented for the generator,
however it still leaves a lot to be done. At least there's something
there now. It uses H5BP as a base but needs further updates, especially
for the logic Jekyll requires. This fixes #25.

It also fixes being able to run npm test on the repo, so now Travis
will be able to test it and you can test it locally. This fixes #24 and
fixes #4.
  • Loading branch information
sondr3 committed Jan 28, 2014
1 parent 41a671c commit b2aecab
Show file tree
Hide file tree
Showing 17 changed files with 385 additions and 31 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[![Stories in Ready](https://badge.waffle.io/sondr3/generator-jekyllized.png?label=ready)](https://waffle.io/sondr3/generator-jekyllized)
[![Build Status](https://travis-ci.org/sondr3/generator-jekyllized.png?branch=master)](https://travis-ci.org/sondr3/generator-jekyllized)
[![Dependency Status](https://david-dm.org/sondr3/generator-jekyllized.png?theme=shields.io)](https://david-dm.org/sondr3/generator-jekyllized)
[![devDependency Status](https://david-dm.org/sondr3/generator-jekyllized/dev-status.png)](https://david-dm.org/sondr3/generator-jekyllized#info=devDependencies)

# generator-jekyllized

[![NPM version](https://badge.fury.io/js/generator-jekyllized.png)](http://badge.fury.io/js/generator-jekyllized)
[![NPM](https://nodei.co/npm/generator-jekyllized.png?compact=true)](https://nodei.co/npm/generator-jekyllized/)
[![Build Status](https://travis-ci.org/sondr3/generator-jekyllized.png?branch=master)](https://travis-ci.org/sondr3/generator-jekyllized)
[![Dependency Status](https://david-dm.org/sondr3/generator-jekyllized.png?theme=shields.io)](https://david-dm.org/sondr3/generator-jekyllized)
[![devDependency Status](https://david-dm.org/sondr3/generator-jekyllized/dev-status.png)](https://david-dm.org/sondr3/generator-jekyllized#info=devDependencies)

### NOTE: WORK IN PROGRESS
## **Bugs ahoy! Use at your own discretion.**
Expand All @@ -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

[![Stories in Ready](https://badge.waffle.io/sondr3/generator-jekyllized.png?label=ready)](https://waffle.io/sondr3/generator-jekyllized)

[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/sondr3/generator-jekyllized/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

[jekyll]: https://jekyllrb.com
Expand Down
7 changes: 2 additions & 5 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
};
};*/
6 changes: 3 additions & 3 deletions app/templates/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ module.exports = function (grunt) {
verbose: true
},
check: {
src: ['.tmp/assets/stylesheets/screen.css']
src: ['.tmp/assets/stylesheets/main.css']
}
},
csslint: {
Expand Down Expand Up @@ -383,7 +383,7 @@ module.exports = function (grunt) {

grunt.task.run([
'clean:server',
'concurrent:server'
'concurrent:server',
'autoprefixer:server',
'connect:livereload',
'watch'
Expand Down Expand Up @@ -414,7 +414,7 @@ module.exports = function (grunt) {
'concurrent:dist',
'useminPrepare',
'concat',
'autoprefixer:dist',>
'autoprefixer:dist',
'cssmin',
'uglify',
'imagemin',
Expand Down
4 changes: 3 additions & 1 deletion app/templates/_bower.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion app/templates/_package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "<%= _.slugify(appname) %>",
"private": true,
"version": "0.0.2",
"version": "0.1.0",
"description": "Yeoman workflow for <%= appname %>",
"dependencies": {},
"devDependencies": {
Expand Down
59 changes: 59 additions & 0 deletions app/templates/app/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Page Not Found</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<style>

* {
line-height: 1.5;
margin: 0;
}

html {
color: #888;
font-family: sans-serif;
text-align: center;
}

body {
left: 50%;
margin: -43px 0 0 -150px;
position: absolute;
top: 50%;
width: 300px;
}

h1 {
color: #555;
font-size: 2em;
font-weight: 400;
}

p {
line-height: 1.2;
}

@media only screen and (max-width: 270px) {

body {
margin: 10px auto;
position: static;
width: 95%;
}

h1 {
font-size: 1.5em;
}

}

</style>
</head>
<body>
<h1>Page Not Found</h1>
<p>Sorry, but the page you were trying to view does not exist.</p>
</body>
</html>
<!-- IE needs 512+ bytes: http://blogs.msdn.com/b/ieinternals/archive/2010/08/19/http-error-pages-in-internet-explorer.aspx -->
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
<title>{{ page.title }}</title>
<meta name="viewport" content="width=device-width">

<!-- build:css({app,.tmp}) /assets/css/main.css -->
<!-- build:css({.tmp,app}) assets/stylesheets/main.css -->
<!-- Syntax highlighting CSS -->
<link rel="stylesheet" href="/assets/stylesheets/syntax.css">
<!-- Custom CSS -->
<link rel="stylesheet" href="/_bower_components/normalize-css/normalize.css">
<link rel="stylesheet" href="/assets/stylesheets/main.css">
<!-- endbuild -->

Expand Down Expand Up @@ -40,7 +41,8 @@ <h1 class="title"><a href="/">{{ site.name }}</a></h1>
</div>
</div>

<!-- build:js({app,.tmp}) /assets/js/app.js -->
<!-- build:js({app,.tmp}) /assets/javascript/main.js -->
<script src="/_bower_components/modernizr/modernizr.js"></script>
<script src="/assets/javascript/main.js"></script>
<!-- endbuild -->
</body>
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit b2aecab

Please sign in to comment.