From ddf982f4e0ffef0023a337171f438e151c756bdf Mon Sep 17 00:00:00 2001 From: Shannon Moeller Date: Sat, 3 Jan 2015 21:34:21 -0500 Subject: [PATCH] Updated deps. Added LICENSE. --- .gitattributes | 1 + LICENSE | 20 ++++++++++++++++++++ gulpfile.js | 14 +++++++------- package.json | 10 +++++----- src/assets/images/logo.svg | 11 +++++++++++ src/assets/styles/main.css | 31 ++++++++++++++++++++++--------- src/index.html | 14 +++++++------- web/assets/images/logo.svg | 11 +++++++++++ web/assets/styles/main.css | 9 ++++++--- web/index.html | 14 +++++++------- 10 files changed, 97 insertions(+), 38 deletions(-) create mode 100644 .gitattributes create mode 100644 LICENSE create mode 100644 src/assets/images/logo.svg create mode 100644 web/assets/images/logo.svg diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..9314e84 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014 Shannon Moeller + +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. diff --git a/gulpfile.js b/gulpfile.js index 908339d..c4f0426 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,12 +1,8 @@ 'use strict'; var gulp = require('gulp'), - base = { - base: './src/' - }, - config = { - isWatching: false - }; + base = { base: './src/' }, + config = { isWatching: false }; gulp.task('default', ['lint', 'markup', 'styles', 'copy']); @@ -70,7 +66,7 @@ gulp.task('styles', function () { gulp.task('copy', function () { return gulp - .src('./src/{CNAME,LICENSE,README.md}', base) + .src('./src/{CNAME,LICENSE,README.md,assets/images/**}', base) .pipe(gulp.dest('./web/')); }); @@ -88,5 +84,9 @@ gulp.task('watch', function () { gulp.start('styles'); }); + watch({ glob: './src/assets/images/**/*.*' }, function () { + gulp.start('copy'); + }); + watch('./web/**/*.*').pipe(lr()); }); diff --git a/package.json b/package.json index be7a5c8..39d5e1f 100644 --- a/package.json +++ b/package.json @@ -10,16 +10,16 @@ "gulp": "^3.8.10", "gulp-autoprefixer": "^2.0.0", "gulp-build": "^0.5.3", - "gulp-front-matter": "^1.1.0", + "gulp-front-matter": "^1.1.1", "gulp-gh-pages": "^0.4.0", - "gulp-hb": "^0.1.5", + "gulp-hb": "^1.0.1", "gulp-html-prettify": "^0.0.1", "gulp-if": "^1.2.5", - "gulp-jscs": "^1.3.1", + "gulp-jscs": "^1.4.0", "gulp-jshint": "^1.9.0", - "gulp-livereload": "^3.0.2", + "gulp-livereload": "^3.2.0", "gulp-minify-css": "^0.3.11", - "gulp-sourcemaps": "^1.2.8", + "gulp-sourcemaps": "^1.3.0", "gulp-util": "^3.0.1", "gulp-watch": "^3.0.0", "handlebars": "^2.0.0", diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg new file mode 100644 index 0000000..6e99c1f --- /dev/null +++ b/src/assets/images/logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/assets/styles/main.css b/src/assets/styles/main.css index 2babf15..f6b12d0 100644 --- a/src/assets/styles/main.css +++ b/src/assets/styles/main.css @@ -17,8 +17,8 @@ html { } body { - background-color: hsla(100, 75%, 75%, 1); - color: hsla(0, 0%, 20%, 1); + background-color: hsl(100, 75%, 75%); + color: hsl(0, 0%, 20%); } h1 { @@ -30,11 +30,6 @@ a { text-decoration: none; } -svg { - height: 7.5em; - width: 7.5em; -} - .page { align-items: center; display: flex; @@ -46,9 +41,27 @@ svg { z-index: 1; } +.logo { + height: 6em; + margin-bottom: 0.618em; + width: 6em; +} + +.logo-lt { + fill: hsl(0, 0%, 100%); +} + +.logo-md { + fill: hsl(0, 0%, 80%); +} + +.logo-dk { + fill: hsl(0, 0%, 20%); +} + .github { - background-color: hsla(0, 0%, 20%, 1); - color: hsla(0, 0%, 95%, 1); + background-color: hsl(0, 0%, 20%); + color: hsl(0, 0%, 95%); font-size: 0.618rem; height: 1.618em; position: fixed; diff --git a/src/index.html b/src/index.html index 74dd237..4685533 100644 --- a/src/index.html +++ b/src/index.html @@ -19,13 +19,13 @@
- - - - - - - +

{{file.meta.title}}

diff --git a/web/assets/images/logo.svg b/web/assets/images/logo.svg new file mode 100644 index 0000000..6e99c1f --- /dev/null +++ b/web/assets/images/logo.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/web/assets/styles/main.css b/web/assets/styles/main.css index e5bcee9..cce27fc 100644 --- a/web/assets/styles/main.css +++ b/web/assets/styles/main.css @@ -2,9 +2,12 @@ *{box-sizing:border-box;margin:0;padding:0} html{font:300 10vmin/1.618 'Open Sans Condensed',sans-serif} @media (min-width:600px),(orientation:landscape){html{font-size:6.18vmin}} -body{background-color:hsla(100,75%,75%,1);color:hsla(0,0%,20%,1)} +body{background-color:#afef8f;color:#333} h1{font:700 1.618em/1 'Open Sans Condensed',sans-serif} a{color:inherit;text-decoration:none} -svg{height:7.5em;width:7.5em} .page{-webkit-align-items:center;-ms-flex-align:center;align-items:center;display:-webkit-flex;display:-ms-flexbox;display:flex;height:100vh;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;position:relative;text-align:center;width:100vw;z-index:1} -.github{background-color:hsla(0,0%,20%,1);color:hsla(0,0%,95%,1);font-size:.618rem;height:1.618em;position:fixed;right:-5em;text-align:center;top:-.809em;-webkit-transform:translate(-1.618em,1.618em) rotate(45deg);transform:translate(-1.618em,1.618em) rotate(45deg);width:10em;z-index:2} \ No newline at end of file +.logo{height:6em;margin-bottom:.618em;width:6em} +.logo-lt{fill:#fff} +.logo-md{fill:#ccc} +.logo-dk{fill:#333} +.github{background-color:#333;color:#f2f2f2;font-size:.618rem;height:1.618em;position:fixed;right:-5em;text-align:center;top:-.809em;-webkit-transform:translate(-1.618em,1.618em) rotate(45deg);transform:translate(-1.618em,1.618em) rotate(45deg);width:10em;z-index:2} \ No newline at end of file diff --git a/web/index.html b/web/index.html index 61b2124..cbbbe60 100644 --- a/web/index.html +++ b/web/index.html @@ -14,13 +14,13 @@
- - - - - - - +

toga.js