From ea63243d6a3b9d8efa4bd90aca539b2dddd46c5f Mon Sep 17 00:00:00 2001 From: Jan Jastrow Date: Tue, 19 Aug 2014 03:36:43 +0200 Subject: [PATCH] Small changes --- gulpfile.js | 2 +- htaccess | 112 ++++++++++++++++++++++++++++++++++++++++ package.json | 24 +++++++++ src/scss/_defaults.scss | 75 ++++++++++++++------------- 4 files changed, 175 insertions(+), 38 deletions(-) create mode 100644 htaccess create mode 100644 package.json diff --git a/gulpfile.js b/gulpfile.js index f3ce35a..4c7a287 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -19,7 +19,7 @@ var gulp = require('gulp'), gulp.task('styles', function() { gulp.src('./src/scss/main.scss') .pipe(sass({ style: 'expanded' })) - .pipe(autoprefixer('last 2 version', 'IE 9', 'safari 5', 'Firefox ESR', 'opera 12.1', 'ios 6', 'android 4', 'BlackBerry 10',)) + .pipe(autoprefixer('last 2 version', 'IE 9', 'safari 5', 'Firefox ESR', 'opera 12.1', 'ios 6', 'android 4', 'BlackBerry 10')) .pipe(gulp.dest('./css')) .pipe(rename({suffix: '.min'})) .pipe(cssmin()) diff --git a/htaccess b/htaccess new file mode 100644 index 0000000..e304d32 --- /dev/null +++ b/htaccess @@ -0,0 +1,112 @@ +# CHARSET +AddDefaultCharset utf-8 + + +# MIME TYPES +AddType application/font-woff .woff +AddType application/javascript .js + + +# BEGIN Compression + + + # Force compression for mangled headers. + # http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping + + + SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding + RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding + + + + # Compress all output labeled with one of the following MIME-types + + AddOutputFilterByType DEFLATE application/atom+xml \ + application/javascript \ + application/json \ + application/ld+json \ + application/rss+xml \ + application/vnd.ms-fontobject \ + application/x-font-ttf \ + application/x-web-app-manifest+json \ + application/xhtml+xml \ + application/xml \ + font/opentype \ + image/svg+xml \ + image/x-icon \ + text/css \ + text/html \ + text/plain \ + text/x-component \ + text/xml + + + +# END Compression + + +# Remove `ETags` as resources are sent with far-future expires headers. +# http://developer.yahoo.com/performance/rules.html#etags. + +# `FileETag None` doesn't work in all cases. + + Header unset ETag + + +FileETag None +# END Remove `ETags` + + +# Expires headers + + + ExpiresActive on + ExpiresDefault "access plus 1 month" + + # CSS + ExpiresByType text/css "access plus 1 year" + + # Data interchange + ExpiresByType application/json "access plus 0 seconds" + ExpiresByType application/ld+json "access plus 0 seconds" + ExpiresByType application/xml "access plus 0 seconds" + ExpiresByType text/xml "access plus 0 seconds" + + # Favicon (cannot be renamed!) and cursor images + ExpiresByType image/x-icon "access plus 1 week" + + # HTML components (HTCs) + ExpiresByType text/x-component "access plus 1 month" + + # HTML + ExpiresByType text/html "access plus 0 seconds" + + # JavaScript + ExpiresByType application/javascript "access plus 1 year" + + # Manifest files + ExpiresByType application/x-web-app-manifest+json "access plus 0 seconds" + ExpiresByType text/cache-manifest "access plus 0 seconds" + + # Media + ExpiresByType audio/ogg "access plus 1 month" + ExpiresByType image/gif "access plus 1 month" + ExpiresByType image/jpeg "access plus 1 month" + ExpiresByType image/png "access plus 1 month" + ExpiresByType video/mp4 "access plus 1 month" + ExpiresByType video/ogg "access plus 1 month" + ExpiresByType video/webm "access plus 1 month" + + # Web feeds + ExpiresByType application/atom+xml "access plus 1 hour" + ExpiresByType application/rss+xml "access plus 1 hour" + + # Web fonts + ExpiresByType application/font-woff "access plus 1 month" + ExpiresByType application/vnd.ms-fontobject "access plus 1 month" + ExpiresByType application/x-font-ttf "access plus 1 month" + ExpiresByType font/opentype "access plus 1 month" + ExpiresByType image/svg+xml "access plus 1 month" + + +# END Expires headers diff --git a/package.json b/package.json new file mode 100644 index 0000000..bcd624d --- /dev/null +++ b/package.json @@ -0,0 +1,24 @@ +{ + "name": "ProjectName", + "description": "Project description", + "version": "1.0.0", + "homepage": "projecturl", + "url" : "http://github.com/Gehirnfussel/project/issues", + "email" : "jan@schwerkraftlabor.de", + "devDependencies": { + "gulp": "~3.8.6", + "gulp-sass": "~0.7.2", + "gulp-autoprefixer": "~0.0.8", + "gulp-cssmin": "~0.1.6", + "gulp-jshint": "~1.8.0", + "gulp-uglify": "~0.3.1", + "gulp-imagemin": "0.6.2", + "gulp-concat": "~2.3.4", + "gulp-rename": "~1.2.0", + "gulp-rimraf": "~0.1.0", + "gulp-watch": "~0.6.9", + "gulp-cache": "~0.2.0", + "gulp-notify": "~1.4.0", + "gulp-livereload": "~2.1.0", + } +} diff --git a/src/scss/_defaults.scss b/src/scss/_defaults.scss index 683004c..25aa83d 100644 --- a/src/scss/_defaults.scss +++ b/src/scss/_defaults.scss @@ -9,39 +9,40 @@ $font-mono: Courier, monospace; --------------------------*/ *, *:before, *:after { - box-sizing: inherit; - padding: 0; - margin: 0; + box-sizing: inherit; + padding: 0; + margin: 0; } html { - height: 100%; - box-sizing: border-box; + height: 100%; + box-sizing: border-box; + text-size-adjust: 100%; } /* Ideal Viewport-Fix for IE */ @-ms-viewport { - width: device-width; + width: device-width; } /* Cleafix --------------------------*/ .clearfix::before, .clearfix::after { - content: " "; - display: table; + content: " "; + display: table; } .clearfix::after { - clear: both; + clear: both; } .clearfix { - *zoom: 1; + *zoom: 1; } /* FLUIDITY v0.1.0 - @mrmrs - http://mrmrs.cc – MIT + @mrmrs - http://mrmrs.cc – MIT --------------------------*/ img, canvas, iframe, video, svg { max-width: 100%; } @@ -51,65 +52,65 @@ img, canvas, iframe, video, svg { max-width: 100%; } --------------------------*/ .video { - position: relative; - height: 0; - padding-bottom: 56.25%; + position: relative; + height: 0; + padding-bottom: 56.25%; - & > * { - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - } + & > * { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; + } } /* Grid and stuff --------------------------*/ .container { - margin: 0 auto; - /*max-width: 960px; - width: 90%;*/ + margin: 0 auto; + /*max-width: 960px; + width: 90%;*/ } .row { - overflow: hidden; - max-width: 960px; - margin: 0 auto; + overflow: hidden; + max-width: 960px; + margin: 0 auto; } .fullrow { - max-width: 100%; + max-width: 100%; } .column { - float: left; - margin-left: 5%; + float: left; + margin-left: 5%; } .column:first-child { - margin-left: 0; + margin-left: 0; } .column.full { - width: 100%; + width: 100%; } .column.three-fourth { - width: 63.75%; + width: 63.75%; } .column.two-thirds { - width: 65%; + width: 65%; } .column.half { - width: 47.5%; + width: 47.5%; } .column.one-third { - width: 30%; + width: 30%; } .column.one-fourth { - width: 21.25%; + width: 21.25%; }