Skip to content

Commit

Permalink
Fix line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
joejoinerr committed Jun 13, 2015
1 parent 072b339 commit b0f7316
Show file tree
Hide file tree
Showing 8 changed files with 520 additions and 520 deletions.
20 changes: 10 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
# editorconfig.org
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Folders
node_modules/
Build/
tumblr-boilerplate.wiki/

# Files
*.sublime-project
*.sublime-workspace
# Folders
node_modules/
Build/
tumblr-boilerplate.wiki/

# Files
*.sublime-project
*.sublime-workspace
70 changes: 35 additions & 35 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
module.exports = function(grunt) {
// Create configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
cssmin: {
minify: {
expand: true,
cwd: 'css/',
src: '*.css',
dest: '.tmp/',
ext: '.min.css'
}
},
htmlbuild: {
dist: {
src: 'index.html',
dest: 'Build/',
},
options: {
styles: {
main: '.tmp/*.min.css'
}
}
},
clean: [ '.tmp/' ]
});

// Register the plugins
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-html-build');
grunt.loadNpmTasks('grunt-contrib-clean');

// Run the task
grunt.registerTask('default', ['cssmin', 'htmlbuild', 'clean']);
}
module.exports = function(grunt) {
// Create configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
cssmin: {
minify: {
expand: true,
cwd: 'css/',
src: '*.css',
dest: '.tmp/',
ext: '.min.css'
}
},
htmlbuild: {
dist: {
src: 'index.html',
dest: 'Build/',
},
options: {
styles: {
main: '.tmp/*.min.css'
}
}
},
clean: [ '.tmp/' ]
});

// Register the plugins
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-html-build');
grunt.loadNpmTasks('grunt-contrib-clean');

// Run the task
grunt.registerTask('default', ['cssmin', 'htmlbuild', 'clean']);
}
36 changes: 18 additions & 18 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Copyright (c) Joe Joiner

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Copyright (c) Joe Joiner

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
60 changes: 30 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
Tumblr Boilerplate
==================
The Tumblr Boilerplate (unofficial) is a fully automated approach to Tumblr theme development, providing some suggested content tags and scripts so you can concentrate on the *style*.

## Quick start
1. Download the zip archive: <https://github.com/joejoinerr/tumblr-boilerplate/archive/master.zip>
2. Clone the git repo: `git clone https://github.com/joejoinerr/tumblr-boilerplate.git`

## Features
- Automatic concatenation, minification and moving external CSS to a `<style>` tag via [Grunt](http://gruntjs.com)
- Suggested markup for common post types
- Posts loop in semantic `<article>` tags
- Common and useful `<meta>` tags
- Iterative `<title>` tag
- User variables
- OOCSS and BEM suggested class names
- Simple pagination links
- IDs on page sections for easy linking
- Bundled with [Normalize.css](http://necolas.github.com/normalize.css/) and [html5shiv](https://code.google.com/p/html5shiv/) via [cdnjs](http://cdnjs.com)

Check out the [Tumblr theme docs](http://www.tumblr.com/docs/en/custom_themes) for information about specific variables or blocks.

## Documentation
[Read the Tumblr Boilerplate docs &rarr;](https://github.com/joejoinerr/tumblr-boilerplate/wiki)

## Contribute
If you've got any great features to add to the Tumblr Boilerplate, or if there's a problem with my code, then get involved! This is a side project so I might not be immediately available:

- File an [issue](https://github.com/joejoinerr/tumblr-boilerplate/issues) stating the bug/feature request *or*
- Fork the repo, add the code yourself and submit a pull request
Tumblr Boilerplate
==================
The Tumblr Boilerplate (unofficial) is a fully automated approach to Tumblr theme development, providing some suggested content tags and scripts so you can concentrate on the *style*.

## Quick start
1. Download the zip archive: <https://github.com/joejoinerr/tumblr-boilerplate/archive/master.zip>
2. Clone the git repo: `git clone https://github.com/joejoinerr/tumblr-boilerplate.git`

## Features
- Automatic concatenation, minification and moving external CSS to a `<style>` tag via [Grunt](http://gruntjs.com)
- Suggested markup for common post types
- Posts loop in semantic `<article>` tags
- Common and useful `<meta>` tags
- Iterative `<title>` tag
- User variables
- OOCSS and BEM suggested class names
- Simple pagination links
- IDs on page sections for easy linking
- Bundled with [Normalize.css](http://necolas.github.com/normalize.css/) and [html5shiv](https://code.google.com/p/html5shiv/) via [cdnjs](http://cdnjs.com)

Check out the [Tumblr theme docs](http://www.tumblr.com/docs/en/custom_themes) for information about specific variables or blocks.

## Documentation
[Read the Tumblr Boilerplate docs &rarr;](https://github.com/joejoinerr/tumblr-boilerplate/wiki)

## Contribute
If you've got any great features to add to the Tumblr Boilerplate, or if there's a problem with my code, then get involved! This is a side project so I might not be immediately available:

- File an [issue](https://github.com/joejoinerr/tumblr-boilerplate/issues) stating the bug/feature request *or*
- Fork the repo, add the code yourself and submit a pull request
72 changes: 36 additions & 36 deletions css/main.css
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
/* Tumblr Boilerplate by Joe Joiner | MIT License | git.io/yvzrLg */

html {
font-size: 1em;
line-height: 1.5;
}

body {
color: {color:Body Text};
}

audio,
img,
video {
vertical-align: middle;
}

textarea {
resize: vertical;
}

.caption--quote-source:before {
content: '\2014';
}

.featured-quote {
quotes: '\201C' '\201D' '\2018' '\2019';
}

.featured-quote:before {
content: open-quote;
}

.featured-quote:after {
content: close-quote;
}
/* Tumblr Boilerplate by Joe Joiner | MIT License | git.io/yvzrLg */

html {
font-size: 1em;
line-height: 1.5;
}

body {
color: {color:Body Text};
}

audio,
img,
video {
vertical-align: middle;
}

textarea {
resize: vertical;
}

.caption--quote-source:before {
content: '\2014';
}

.featured-quote {
quotes: '\201C' '\201D' '\2018' '\2019';
}

.featured-quote:before {
content: open-quote;
}

.featured-quote:after {
content: close-quote;
}
Loading

0 comments on commit b0f7316

Please sign in to comment.