diff --git a/bower.json b/bower.json
index 31f5bf1..ad128b0 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,7 @@
"name": "edb-www",
"private": true,
"dependencies": {
- "bootstrap-sass": "~3.3.5"
+ "bootstrap-sass": "~3.3.6"
},
"overrides": {
"bootstrap-sass": {
diff --git a/dist/index.html b/dist/index.html
index dd1dba6..9252452 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -57,7 +57,7 @@
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
+
Twitter: @edbgjengen eller @KAK_DNS
diff --git a/dist/styles/main.css b/dist/styles/main.css
index 896f249..fcfbba1 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -1,11 +1,17 @@
+@charset "UTF-8";
+
/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.6 (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 */
+img {
+ border: 0;
+}
+
body {
margin: 0;
}
@@ -14,8 +20,6 @@ html {
font-family: sans-serif;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
- font-size: 10px;
- -webkit-tap-highlight-color: transparent;
}
header {
@@ -36,7 +40,6 @@ h1 {
}
img {
- border: 0;
vertical-align: middle;
}
@@ -89,16 +92,16 @@ input::-moz-focus-inner {
}
}
-body {
- background-color: #fff;
-}
-
.btn,
.btn-primary:active,
.btn:active {
background-image: none;
}
+body {
+ background-color: #fff;
+}
+
@font-face {
font-family: 'Glyphicons Halflings';
src: url(../bower_components/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.eot);
@@ -111,6 +114,11 @@ body {
box-sizing: border-box;
}
+html {
+ font-size: 10px;
+ -webkit-tap-highlight-color: transparent;
+}
+
body {
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
@@ -167,10 +175,6 @@ h4 {
font-size: 18px;
}
-.btn {
- text-align: center;
-}
-
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;
@@ -185,36 +189,36 @@ ul {
margin-bottom: 10px;
}
+@media (min-width:768px) {
+ .container {
+ width: 750px;
+ }
+}
+
.container:after,
.row:after,
[class*=block-grid-]:after {
clear: both;
}
+.container:after,
+.container:before,
+.row:after,
+.row:before {
+ display: table;
+ content: " ";
+}
+
.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;
@@ -258,10 +262,16 @@ ul {
color: #999;
}
+.form-control::-ms-expand {
+ border: 0;
+ background-color: transparent;
+}
+
.btn {
display: inline-block;
margin-bottom: 0;
font-weight: 400;
+ text-align: center;
vertical-align: middle;
touch-action: manipulation;
cursor: pointer;
@@ -381,6 +391,10 @@ ul {
.block-grid-sm-3>.block-grid-item:nth-of-type(3n+1) {
clear: both;
}
+
+ .form-link {
+ display: none;
+ }
}
@media (min-width:992px) {
@@ -414,12 +428,6 @@ h3 {
font-weight: 700;
}
-@media (min-width:768px) {
- .form-link {
- display: none;
- }
-}
-
.join-us-title {
margin-top: 40px;
margin-bottom: 0;
diff --git a/gulpfile.js b/gulpfile.js
index a3e8869..4bdb1ee 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -28,15 +28,11 @@ gulp.task('scripts', function () {
});
gulp.task('html', ['styles', 'scripts'], function () {
- var assets = $.useref.assets({searchPath: '{.tmp,app}'})
-
return gulp.src('app/*.html')
- .pipe(assets)
+ .pipe($.useref({searchPath: '{.tmp,app}'}))
.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'));
});
@@ -63,7 +59,7 @@ gulp.task('extras', function () {
});
gulp.task('clean', function (cb) {
- del(['.tmp', 'dist'], cb);
+ return del(['.tmp', 'dist'], cb);
});
gulp.task('build', ['html', 'images', 'fonts', 'extras'], function() {
@@ -80,9 +76,6 @@ gulp.task('serve', ['styles'], function () {
port: 9000,
server: {
baseDir: ['.tmp', 'app'],
- routes: {
- '/bower_components': 'bower_components'
- }
}
});
});
@@ -93,21 +86,19 @@ gulp.task('wiredep', function () {
gulp.src('app/styles/*.scss')
.pipe(wiredep({
- directory: 'app/bower_components'
+ directory: 'bower_components'
}))
.pipe(gulp.dest('app/styles'));
gulp.src('app/*.html')
.pipe(wiredep({
- directory: 'app/bower_components',
+ directory: 'bower_components',
exclude: ['bootstrap-sass']
}))
.pipe(gulp.dest('app'));
});
-gulp.task('watch', ['connect', 'serve'], function () {
- var server = $.livereload();
-
+gulp.task('watch', ['serve'], function () {
// watch for changes
gulp.watch([
@@ -115,9 +106,7 @@ gulp.task('watch', ['connect', 'serve'], function () {
'.tmp/styles/**/*.css',
'app/scripts/**/*.js',
'app/images/**/*'
- ]).on('change', function (file) {
- server.changed(file.path);
- });
+ ]).on('change', reload);
gulp.watch('app/styles/**/*.scss', ['styles']);
gulp.watch('app/scripts/**/*.js', ['scripts']);
diff --git a/package.json b/package.json
index d7e48b8..fe903ff 100644
--- a/package.json
+++ b/package.json
@@ -6,27 +6,28 @@
"devDependencies": {
"browser-sync": "^2.7.13",
"connect": "^3.4.0",
- "del": "^1.2.0",
+ "del": "^2.1.0",
"gulp": "^3.9.0",
- "gulp-autoprefixer": "^2.3.1",
+ "gulp-autoprefixer": "^3.1.0",
"gulp-csso": "^1.0.0",
- "gulp-filter": "^2.0.2",
- "gulp-flatten": "^0.0.4",
- "gulp-if": "^1.2.5",
+ "gulp-filter": "^3.0.1",
+ "gulp-flatten": "^0.2.0",
+ "gulp-if": "^2.0.0",
"gulp-imagemin": "^2.3.0",
- "gulp-jshint": "^1.11.0",
+ "gulp-jshint": "^2.0.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-sass": "~2.1.0",
+ "gulp-size": "^2.0.0",
"gulp-uglify": "^1.2.0",
"gulp-uncss": "^1.0.1",
- "gulp-useref": "^1.2.0",
+ "gulp-useref": "^3.0.3",
+ "jshint": "^2.8.0",
"jshint-stylish": "^2.0.1",
"main-bower-files": "^2.8.2",
- "opn": "^2.0.1",
- "wiredep": "^2.2.2"
+ "opn": "^3.0.3",
+ "wiredep": "^3.0.0-beta"
},
"engines": {
"node": ">=0.10.0"