Kontaktinfo:
- kak-edb@studentersamfundet.no -
- Leder: Jonas +47 454 80 454 -
- IRC: #EDB @ OFTC +
- Leder: Jonas Braathen +47 454 80 454 +
- IRC: #EDB@OFTC
- Møtetid: Hver onsdag kl. 18.13.37 på KAK (4. etg)
- Twitter: @KAK_DNS diff --git a/dist/styles/main.css b/dist/styles/main.css old mode 100755 new mode 100644 index 1dcd2b7..896f249 --- a/dist/styles/main.css +++ b/dist/styles/main.css @@ -1 +1,443 @@ -/*! normalize.css v3.0.1 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}header{display:block}a{background:0 0}a:active,a:hover{outline:0}h1{margin:.67em 0}img{border:0}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}@media print{*{text-shadow:none!important;color:#000!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href)")"}a[href^="#"]:after{content:""}img{page-break-inside:avoid;max-width:100%!important}h3{orphans:3;widows:3;page-break-after:avoid}}@font-face{font-family:'Glyphicons Halflings';src:url("../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot");src:url("../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix") format("embedded-opentype"),url("../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff") format("woff"),url("../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf") format("truetype"),url("../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular") format("svg")}*{box-sizing:border-box}*:before,*:after{box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}h1{font-weight:500}h1,h3,h4{font-family:inherit;line-height:1.1;color:inherit}h4{font-weight:500}h1,h3{margin-top:20px}h1,h3,h4{margin-bottom:10px}h4{margin-top:10px}h1{font-size:36px}h3{font-size:24px}h4{font-size:18px}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul{margin-top:0;margin-bottom:10px}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container:before,.container:after{content:" ";display:table}.container:after{clear:both}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.row{margin-left:-15px;margin-right:-15px}.row:before,.row:after{content:" ";display:table}.row:after{clear:both}.col-md-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}@media (min-width:992px){.col-md-12{float:left;width:100%}}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.428571429;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active{outline:0;background-image:none;box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active{color:#fff;background-color:#3071a9;border-color:#285e8e}.btn-primary:active{background-image:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-viewport{width:device-width}[class*="block-grid-"]{display:block;margin:-15px;padding:0}[class*="block-grid-"]:before{content:" ";display:table}[class*="block-grid-"]:after{content:" ";display:table;clear:both}.block-grid-item{display:inline;margin:0;height:auto;float:left;list-style:none}.block-grid-xs-2>.block-grid-item{width:50%}.block-grid-xs-2>.block-grid-item:nth-of-type(n){clear:none}.block-grid-xs-2>.block-grid-item:nth-of-type(2n+1){clear:both}@media (min-width:768px){.block-grid-sm-3>.block-grid-item{width:33.3333333333%}.block-grid-sm-3>.block-grid-item:nth-of-type(n){clear:none}.block-grid-sm-3>.block-grid-item:nth-of-type(3n+1){clear:both}}@media (min-width:992px){.block-grid-md-4>.block-grid-item{width:25%}.block-grid-md-4>.block-grid-item:nth-of-type(n){clear:none}.block-grid-md-4>.block-grid-item:nth-of-type(4n+1){clear:both}}.page-header h1{line-height:1;vertical-align:bottom}.edb-brick{height:40px;width:auto}.block-grid-item{padding:15px 15px 0}.block-grid-item img{max-width:100%}h3{font-weight:700}@media (min-width:768px){.form-link{display:none}}.join-us-title{margin-top:40px;margin-bottom:0}#contact_form{border:0;margin:0}.love{color:#faafba}.credits{margin-top:25px;margin-bottom:25px;text-align:center;color:#666;font-size:12px} \ No newline at end of file +/*! + * Bootstrap v3.3.5 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + +body { + margin: 0; +} + +html { + font-family: sans-serif; + -ms-text-size-adjust: 100%; + -webkit-text-size-adjust: 100%; + font-size: 10px; + -webkit-tap-highlight-color: transparent; +} + +header { + display: block; +} + +a { + background-color: transparent; +} + +a:active, +a:hover { + outline: 0; +} + +h1 { + margin: .67em 0; +} + +img { + border: 0; + vertical-align: middle; +} + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */ + +@media print { + img { + page-break-inside: avoid; + } + + *, + :after, + :before { + background: 0 0!important; + color: #000!important; + box-shadow: none!important; + text-shadow: none!important; + } + + a, + a:visited { + text-decoration: underline; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + a[href^="#"]:after { + content: ""; + } + + img { + max-width: 100%!important; + } + + h3 { + orphans: 3; + widows: 3; + } + + h3 { + page-break-after: avoid; + } +} + +body { + background-color: #fff; +} + +.btn, +.btn-primary:active, +.btn:active { + background-image: none; +} + +@font-face { + font-family: 'Glyphicons Halflings'; + src: url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot); + src: url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot?#iefix) format("embedded-opentype"),url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2) format("woff2"),url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.woff) format("woff"),url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf) format("truetype"),url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format("svg"); +} + +*, +:after, +:before { + box-sizing: border-box; +} + +body { + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; + font-size: 14px; + line-height: 1.428571429; + color: #333; +} + +a { + color: #337ab7; + text-decoration: none; +} + +a:focus, +a:hover { + color: #23527c; + text-decoration: underline; +} + +a:focus { + outline: dotted thin; + outline: -webkit-focus-ring-color auto 5px; + outline-offset: -2px; +} + +h1, +h3, +h4 { + font-family: inherit; + font-weight: 500; + line-height: 1.1; + color: inherit; +} + +h1, +h3 { + margin-top: 20px; + margin-bottom: 10px; +} + +h4 { + margin-top: 10px; + margin-bottom: 10px; +} + +h1 { + font-size: 36px; +} + +h3 { + font-size: 24px; +} + +h4 { + font-size: 18px; +} + +.btn { + text-align: center; +} + +.page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: 1px solid #eee; +} + +ul { + margin-top: 0; +} + +ul { + margin-bottom: 10px; +} + +.container:after, +.row:after, +[class*=block-grid-]:after { + clear: both; +} + +.container { + margin-right: auto; + margin-left: auto; +} + +.container:after, +.container:before, +.row:after, +.row:before { + content: " "; + display: table; +} + +.container { + padding-left: 15px; + padding-right: 15px; +} + +@media (min-width:768px) { + .container { + width: 750px; + } +} + +@media (min-width:992px) { + .container { + width: 970px; + } +} + +@media (min-width:1200px) { + .container { + width: 1170px; + } +} + +.row { + margin-left: -15px; + margin-right: -15px; +} + +.col-md-12 { + position: relative; + min-height: 1px; + padding-left: 15px; + padding-right: 15px; +} + +@media (min-width:992px) { + .col-md-12 { + float: left; + } + + .col-md-12 { + width: 100%; + } +} + +.form-control::-moz-placeholder { + color: #999; + opacity: 1; +} + +.form-control:-ms-input-placeholder { + color: #999; +} + +.btn { + display: inline-block; + margin-bottom: 0; + font-weight: 400; + vertical-align: middle; + touch-action: manipulation; + cursor: pointer; + border: 1px solid transparent; + white-space: nowrap; + padding: 6px 12px; + font-size: 14px; + line-height: 1.428571429; + border-radius: 4px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.btn:active:focus, +.btn:focus { + outline: dotted thin; + outline: -webkit-focus-ring-color auto 5px; + outline-offset: -2px; +} + +.btn:focus, +.btn:hover { + color: #333; + text-decoration: none; +} + +.btn:active { + outline: 0; + box-shadow: inset 0 3px 5px rgba(0,0,0,.125); +} + +.btn-primary { + color: #fff; + background-color: #337ab7; + border-color: #2e6da4; +} + +.btn-primary:focus { + color: #fff; + background-color: #286090; + border-color: #122b40; +} + +.btn-primary:active, +.btn-primary:hover { + color: #fff; + background-color: #286090; + border-color: #204d74; +} + +.btn-primary:active:focus, +.btn-primary:active:hover { + color: #fff; + background-color: #204d74; + border-color: #122b40; +} + +.btn-lg { + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} + +.page-header h1 { + vertical-align: bottom; +} + +@-ms-viewport { + width: device-width; +} + +[class*=block-grid-] { + display: block; + margin: -15px; + padding: 0; +} + +[class*=block-grid-]:after, +[class*=block-grid-]:before { + content: " "; + display: table; +} + +.block-grid-item { + display: inline; + margin: 0; + padding: 15px 15px 0; + height: auto; + float: left; + list-style: none; +} + +.block-grid-xs-2>.block-grid-item { + width: 50%; +} + +.block-grid-xs-2>.block-grid-item:nth-of-type(n) { + clear: none; +} + +.block-grid-xs-2>.block-grid-item:nth-of-type(2n+1) { + clear: both; +} + +@media (min-width:768px) { + .block-grid-sm-3>.block-grid-item { + width: 33.3333333333%; + } + + .block-grid-sm-3>.block-grid-item:nth-of-type(n) { + clear: none; + } + + .block-grid-sm-3>.block-grid-item:nth-of-type(3n+1) { + clear: both; + } +} + +@media (min-width:992px) { + .block-grid-md-4>.block-grid-item { + width: 25%; + } + + .block-grid-md-4>.block-grid-item:nth-of-type(n) { + clear: none; + } + + .block-grid-md-4>.block-grid-item:nth-of-type(4n+1) { + clear: both; + } +} + +.page-header h1 { + line-height: 1; +} + +.edb-brick { + height: 40px; + width: auto; +} + +.block-grid-item img { + max-width: 100%; +} + +h3 { + font-weight: 700; +} + +@media (min-width:768px) { + .form-link { + display: none; + } +} + +.join-us-title { + margin-top: 40px; + margin-bottom: 0; +} + +#contact_form { + border: 0; + margin: 0; +} + +.love { + color: #faafba; +} + +.credits { + margin-top: 25px; + margin-bottom: 25px; + text-align: center; + color: #666; + font-size: 12px; +} diff --git a/gulpfile.js b/gulpfile.js index 08d3dd3..a3e8869 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,48 +1,43 @@ 'use strict'; -// generated on 2014-09-08 using generator-gulp-webapp 0.1.0 var gulp = require('gulp'); -// load plugins var $ = require('gulp-load-plugins')(); -var mainBowerFiles = require('main-bower-files'); +var bowerFiles = require('main-bower-files'); +var del = require('del'); +var browserSync = require('browser-sync'); +var reload = browserSync.reload; gulp.task('styles', function () { return gulp.src('app/styles/main.scss') .pipe($.plumber()) - .pipe($.rubySass({ - style: 'expanded', - precision: 10 - })) - .pipe($.autoprefixer('last 1 version')) + .pipe($.sass.sync({ + outputStyle: 'expanded', + precision: 10, + includePaths: ['.'] + }).on('error', $.sass.logError)) + .pipe($.autoprefixer({browsers: ['last 1 version']})) .pipe(gulp.dest('.tmp/styles')) - .pipe($.size()); + .pipe(reload({stream: true})); }); gulp.task('scripts', function () { return gulp.src('app/scripts/**/*.js') .pipe($.jshint()) .pipe($.jshint.reporter(require('jshint-stylish'))) - .pipe($.size()); }); gulp.task('html', ['styles', 'scripts'], function () { - var jsFilter = $.filter('**/*.js'); - var cssFilter = $.filter('**/*.css'); + var assets = $.useref.assets({searchPath: '{.tmp,app}'}) return gulp.src('app/*.html') - .pipe($.useref.assets({searchPath: '{.tmp,app}'})) - .pipe(jsFilter) - .pipe($.uglify()) - .pipe(jsFilter.restore()) - .pipe(cssFilter) - .pipe($.uncss(({html: ['app/index.html']}))) - .pipe($.csso()) - .pipe(cssFilter.restore()) - .pipe($.useref.restore()) + .pipe(assets) + .pipe($.if('*.js', $.uglify())) + .pipe($.if('*.css', $.minifyCss({compatibility: '*'}))) + .pipe($.if('*.css', $.uncss(({html: ['app/index.html']})))) + .pipe(assets.restore()) .pipe($.useref()) - .pipe(gulp.dest('dist')) - .pipe($.size()); + .pipe(gulp.dest('dist')); }); gulp.task('images', function () { @@ -53,15 +48,13 @@ gulp.task('images', function () { interlaced: true })) .pipe(gulp.dest('dist/images')) - .pipe($.size()); }); gulp.task('fonts', function () { - return gulp.src(mainBowerFiles()) + return gulp.src(bowerFiles()) .pipe($.filter('**/*.{eot,svg,ttf,woff}')) .pipe($.flatten()) .pipe(gulp.dest('dist/fonts')) - .pipe($.size()); }); gulp.task('extras', function () { @@ -69,33 +62,29 @@ gulp.task('extras', function () { .pipe(gulp.dest('dist')); }); -gulp.task('clean', function () { - return gulp.src(['.tmp', 'dist'], { read: false }).pipe($.clean()); +gulp.task('clean', function (cb) { + del(['.tmp', 'dist'], cb); }); -gulp.task('build', ['html', 'images', 'fonts', 'extras']); +gulp.task('build', ['html', 'images', 'fonts', 'extras'], function() { + return gulp.src('dist/**/*').pipe($.size({title: 'build', gzip: true})); +}); gulp.task('default', ['clean'], function () { gulp.start('build'); }); -gulp.task('connect', function () { - var connect = require('connect'); - var app = connect() - .use(require('connect-livereload')({ port: 35729 })) - .use(connect.static('app')) - .use(connect.static('.tmp')) - .use(connect.directory('app')); - - require('http').createServer(app) - .listen(9000) - .on('listening', function () { - console.log('Started connect web server on http://localhost:9000'); - }); -}); - -gulp.task('serve', ['connect', 'styles'], function () { - require('opn')('http://localhost:9000'); +gulp.task('serve', ['styles'], function () { + browserSync({ + notify: false, + port: 9000, + server: { + baseDir: ['.tmp', 'app'], + routes: { + '/bower_components': 'bower_components' + } + } + }); }); // inject bower components @@ -111,7 +100,7 @@ gulp.task('wiredep', function () { gulp.src('app/*.html') .pipe(wiredep({ directory: 'app/bower_components', - exclude: ['bootstrap-sass-official'] + exclude: ['bootstrap-sass'] })) .pipe(gulp.dest('app')); }); diff --git a/index.html b/index.html deleted file mode 100644 index 32e7baa..0000000 --- a/index.html +++ /dev/null @@ -1,91 +0,0 @@ - - - -
- kak-edb@studentersamfundet.no -
- Leder: Jonas +47 454 80 454 -
- Twitter: @KAK_DNS -
- IRC: #EDB @ OFTC -
- IRL: Møte hver onsdag kl. 18.13.37 på KAK (4. etg) -
-
-
-
-
-
-
diff --git a/package.json b/package.json
index b60dce3..d7e48b8 100644
--- a/package.json
+++ b/package.json
@@ -1,32 +1,32 @@
{
"name": "edb-www",
"version": "0.0.0",
+ "private": true,
"dependencies": {},
"devDependencies": {
- "connect": "^2.14.4",
- "connect-livereload": "^0.4.0",
- "gulp": "^3.6.0",
- "gulp-autoprefixer": "^0.0.7",
- "gulp-bower-files": "^0.2.1",
- "gulp-cache": "^0.1.11",
- "gulp-clean": "^0.2.4",
- "gulp-csso": "^0.2.6",
- "gulp-filter": "^0.4.1",
- "gulp-flatten": "^0.0.2",
- "gulp-imagemin": "^0.5.1",
- "gulp-jshint": "^1.5.3",
- "gulp-livereload": "^1.2.0",
- "gulp-load-plugins": "^0.5.0",
- "gulp-plumber": "^0.6.5",
- "gulp-ruby-sass": "^0.4.3",
- "gulp-size": "^0.3.0",
- "gulp-uglify": "^0.2.1",
- "gulp-uncss": "^0.4.5",
- "gulp-useref": "^0.4.2",
- "jshint-stylish": "^0.2.0",
- "main-bower-files": "^2.0.0",
- "opn": "^0.1.1",
- "wiredep": "^1.4.3"
+ "browser-sync": "^2.7.13",
+ "connect": "^3.4.0",
+ "del": "^1.2.0",
+ "gulp": "^3.9.0",
+ "gulp-autoprefixer": "^2.3.1",
+ "gulp-csso": "^1.0.0",
+ "gulp-filter": "^2.0.2",
+ "gulp-flatten": "^0.0.4",
+ "gulp-if": "^1.2.5",
+ "gulp-imagemin": "^2.3.0",
+ "gulp-jshint": "^1.11.0",
+ "gulp-load-plugins": "^1.0.0-rc",
+ "gulp-minify-css": "^1.2.0",
+ "gulp-plumber": "~1.0.1",
+ "gulp-sass": "~2.0.3",
+ "gulp-size": "^1.2.2",
+ "gulp-uglify": "^1.2.0",
+ "gulp-uncss": "^1.0.1",
+ "gulp-useref": "^1.2.0",
+ "jshint-stylish": "^2.0.1",
+ "main-bower-files": "^2.8.2",
+ "opn": "^2.0.1",
+ "wiredep": "^2.2.2"
},
"engines": {
"node": ">=0.10.0"
diff --git a/test/.bowerrc b/test/.bowerrc
deleted file mode 100644
index 44491d3..0000000
--- a/test/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "directory": "bower_components"
-}
diff --git a/test/bower.json b/test/bower.json
deleted file mode 100644
index 4dde029..0000000
--- a/test/bower.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "name": "edb-www",
- "private": true,
- "dependencies": {
- "chai": "~1.8.0",
- "mocha": "~1.14.0"
- },
- "devDependencies": {}
-}
diff --git a/test/index.html b/test/index.html
deleted file mode 100644
index d18b7d3..0000000
--- a/test/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
- EDB
Kommunikasjonsavdelingen, Det Norske Studentersamfund, Chateau Neuf, Oslo -
-
-
- 
- 
- 
- 
- 
-
- Interressert i EDB? meld din interesse!
-Kontaktinfo:
--
-
EDBWiki
- MDB
- Brukerinfo
- Oliver - Current track
- MBFTNS
-
-
-
-