+
+
+
diff --git a/app/favicon.ico b/app/favicon.ico
new file mode 100644
index 0000000..6527905
Binary files /dev/null and b/app/favicon.ico differ
diff --git a/app/images/brick1.png b/app/images/brick1.png
new file mode 100755
index 0000000..adcde47
Binary files /dev/null and b/app/images/brick1.png differ
diff --git a/app/images/brukerinfo.png b/app/images/brukerinfo.png
new file mode 100644
index 0000000..fd656b0
Binary files /dev/null and b/app/images/brukerinfo.png differ
diff --git a/app/images/mbftns.png b/app/images/mbftns.png
new file mode 100644
index 0000000..febb489
Binary files /dev/null and b/app/images/mbftns.png differ
diff --git a/app/images/mdb.png b/app/images/mdb.png
new file mode 100644
index 0000000..a50ddec
Binary files /dev/null and b/app/images/mdb.png differ
diff --git a/app/images/oliver_current.png b/app/images/oliver_current.png
new file mode 100644
index 0000000..c567e20
Binary files /dev/null and b/app/images/oliver_current.png differ
diff --git a/app/index.html b/app/index.html
new file mode 100644
index 0000000..ca25c6e
--- /dev/null
+++ b/app/index.html
@@ -0,0 +1,103 @@
+
+
+
+
+ Not found :(
+Sorry, but the page you were trying to view does not exist.
+It looks like this was the result of either:
+-
+
- a mistyped address +
- an out-of-date link +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/robots.txt b/app/robots.txt
new file mode 100644
index 0000000..ee2cc21
--- /dev/null
+++ b/app/robots.txt
@@ -0,0 +1,3 @@
+# robotstxt.org/
+
+User-agent: *
diff --git a/app/scripts/main.js b/app/scripts/main.js
new file mode 100644
index 0000000..20ca76d
--- /dev/null
+++ b/app/scripts/main.js
@@ -0,0 +1 @@
+console.log('\'Allo \'Allo!');
\ No newline at end of file
diff --git a/app/styles/main.scss b/app/styles/main.scss
new file mode 100644
index 0000000..e1a86ad
--- /dev/null
+++ b/app/styles/main.scss
@@ -0,0 +1,22 @@
+$icon-font-path: "../bower_components/bootstrap-sass-official/vendor/assets/fonts/bootstrap/";
+
+// bower:scss
+@import "../bower_components/bootstrap-sass-official/vendor/assets/stylesheets/bootstrap.scss";
+// endbower
+
+.browsehappy {
+ margin: 0.2em 0;
+ background: #ccc;
+ color: #000;
+ padding: 0.2em 0;
+}
+
+@media (min-width: 768px) {
+ .form-link {
+ display:none;
+ }
+}
+#contact_form {
+ border:0;
+ margin:0;
+}
diff --git a/bower.json b/bower.json
new file mode 100644
index 0000000..808a365
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,9 @@
+{
+ "name": "edb-www",
+ "private": true,
+ "dependencies": {
+ "bootstrap-sass-official": "~3.1.1",
+ "jquery": "~1.11.0"
+ },
+ "devDependencies": {}
+}
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..da8c8e3
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,134 @@
+'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')();
+
+gulp.task('styles', function () {
+ return gulp.src('app/styles/main.scss')
+ .pipe($.rubySass({
+ style: 'expanded',
+ precision: 10
+ }))
+ .pipe($.autoprefixer('last 1 version'))
+ .pipe(gulp.dest('.tmp/styles'))
+ .pipe($.size());
+});
+
+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');
+
+ return gulp.src('app/*.html')
+ .pipe($.useref.assets({searchPath: '{.tmp,app}'}))
+ .pipe(jsFilter)
+ .pipe($.uglify())
+ .pipe(jsFilter.restore())
+ .pipe(cssFilter)
+ .pipe($.csso())
+ .pipe(cssFilter.restore())
+ .pipe($.useref.restore())
+ .pipe($.useref())
+ .pipe(gulp.dest('dist'))
+ .pipe($.size());
+});
+
+gulp.task('images', function () {
+ return gulp.src('app/images/**/*')
+ .pipe($.cache($.imagemin({
+ optimizationLevel: 3,
+ progressive: true,
+ interlaced: true
+ })))
+ .pipe(gulp.dest('dist/images'))
+ .pipe($.size());
+});
+
+gulp.task('fonts', function () {
+ return $.bowerFiles()
+ .pipe($.filter('**/*.{eot,svg,ttf,woff}'))
+ .pipe($.flatten())
+ .pipe(gulp.dest('dist/fonts'))
+ .pipe($.size());
+});
+
+gulp.task('extras', function () {
+ return gulp.src(['app/*.*', '!app/*.html'], { dot: true })
+ .pipe(gulp.dest('dist'));
+});
+
+gulp.task('clean', function () {
+ return gulp.src(['.tmp', 'dist'], { read: false }).pipe($.clean());
+});
+
+gulp.task('build', ['html', 'images', 'fonts', 'extras']);
+
+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');
+});
+
+// inject bower components
+gulp.task('wiredep', function () {
+ var wiredep = require('wiredep').stream;
+
+ gulp.src('app/styles/*.scss')
+ .pipe(wiredep({
+ directory: 'app/bower_components'
+ }))
+ .pipe(gulp.dest('app/styles'));
+
+ gulp.src('app/*.html')
+ .pipe(wiredep({
+ directory: 'app/bower_components',
+ exclude: ['bootstrap-sass-official']
+ }))
+ .pipe(gulp.dest('app'));
+});
+
+gulp.task('watch', ['connect', 'serve'], function () {
+ var server = $.livereload();
+
+ // watch for changes
+
+ gulp.watch([
+ 'app/*.html',
+ '.tmp/styles/**/*.css',
+ 'app/scripts/**/*.js',
+ 'app/images/**/*'
+ ]).on('change', function (file) {
+ server.changed(file.path);
+ });
+
+ gulp.watch('app/styles/**/*.scss', ['styles']);
+ gulp.watch('app/scripts/**/*.js', ['scripts']);
+ gulp.watch('app/images/**/*', ['images']);
+ gulp.watch('bower.json', ['wiredep']);
+});
diff --git a/index.php b/index.html
similarity index 100%
rename from index.php
rename to index.html
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..2eadf3e
--- /dev/null
+++ b/package.json
@@ -0,0 +1,31 @@
+{
+ "name": "edb-www",
+ "version": "0.0.0",
+ "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.1",
+ "gulp-clean": "^0.2.4",
+ "gulp-csso": "^0.2.6",
+ "gulp-filter": "^0.4.1",
+ "gulp-flatten": "^0.0.2",
+ "gulp-imagemin": "^0.5.0",
+ "gulp-jshint": "^1.5.3",
+ "gulp-livereload": "^1.2.0",
+ "gulp-load-plugins": "^0.5.0",
+ "gulp-ruby-sass": "^0.4.3",
+ "gulp-size": "^0.3.0",
+ "gulp-uglify": "^0.2.1",
+ "gulp-useref": "^0.4.2",
+ "jshint-stylish": "^0.2.0",
+ "opn": "^0.1.1",
+ "wiredep": "^1.4.3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+}
diff --git a/test/.bowerrc b/test/.bowerrc
new file mode 100644
index 0000000..44491d3
--- /dev/null
+++ b/test/.bowerrc
@@ -0,0 +1,3 @@
+{
+ "directory": "bower_components"
+}
diff --git a/test/bower.json b/test/bower.json
new file mode 100644
index 0000000..4dde029
--- /dev/null
+++ b/test/bower.json
@@ -0,0 +1,9 @@
+{
+ "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
new file mode 100644
index 0000000..d18b7d3
--- /dev/null
+++ b/test/index.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+ EDB
Kommunikasjonsavdelingen, Det Norske Studentersamfund, Chateau Neuf, Oslo +
+
+
+ 
+ 
+ 
+ 
+ 
+
+ Interressert i EDB? meld din interesse!
+Kontaktinfo:
+-
+
- 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) +
EDBWiki
+ MDB
+ Brukerinfo
+ Oliver - Current track
+ MBFTNS
+
+
+
+