merging conflicts

nie-ine · Sep 16, 2020 · 687a85e · 687a85e
2 parents 52b5761 + 4fa01b6
commit 687a85e
Show file tree

Hide file tree

Showing 99 changed files with 36,670 additions and 195 deletions.
diff --git a/documentation/css/agency.min.css b/documentation/css/agency.min.css
@@ -256,7 +256,7 @@ header .intro-text .intro-heading {
   header .intro-text .intro-heading {
     font-family: Montserrat, "Helvetica Neue", Helvetica, Arial, sans-serif;
     text-transform: uppercase;
-    font-weight: 700;
+    font-weight: 500;
     font-size: 75px;
     line-height: 75px;
     margin-bottom: 50px
@@ -279,7 +279,7 @@ section h3.section-subheading {
   text-transform: none;
   font-style: italic;
   font-weight: 400;
-  margin-bottom: 75px
+  margin-bottom: 15px
 }
 
 @media (min-width: 768px) {

diff --git a/documentation/gulpfile.js b/documentation/gulpfile.js
@@ -0,0 +1,105 @@
+var gulp = require('gulp');
+var less = require('gulp-less');
+var sass = require('gulp-sass');
+var browserSync = require('browser-sync').create();
+var header = require('gulp-header');
+var cleanCSS = require('gulp-clean-css');
+var rename = require("gulp-rename");
+var uglify = require('gulp-uglify');
+var pkg = require('./package.json');
+
+// Set the banner content
+var banner = ['/*!\n',
+    ' * Start Bootstrap - <%= pkg.title %> v<%= pkg.version %> (<%= pkg.homepage %>)\n',
+    ' * Copyright 2013-' + (new Date()).getFullYear(), ' <%= pkg.author %>\n',
+    ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n',
+    ' */\n',
+    ''
+].join('');
+
+// Compile LESS files from /less into /css
+gulp.task('less', function() {
+    return gulp.src('less/agency.less')
+        .pipe(less())
+        .pipe(header(banner, { pkg: pkg }))
+        .pipe(gulp.dest('css'))
+        .pipe(browserSync.reload({
+            stream: true
+        }))
+});
+
+// Minify compiled CSS
+gulp.task('minify-css', ['less'], function() {
+    return gulp.src('css/agency.css')
+        .pipe(cleanCSS({ compatibility: 'ie8' }))
+        .pipe(rename({ suffix: '.min' }))
+        .pipe(gulp.dest('css'))
+        .pipe(browserSync.reload({
+            stream: true
+        }))
+});
+
+// Minify JS
+gulp.task('minify-js', function() {
+    return gulp.src('js/agency.js')
+        .pipe(uglify())
+        .pipe(header(banner, { pkg: pkg }))
+        .pipe(rename({ suffix: '.min' }))
+        .pipe(gulp.dest('js'))
+        .pipe(browserSync.reload({
+            stream: true
+        }))
+});
+
+// Copy vendor libraries from /node_modules into /vendor
+gulp.task('copy', function() {
+    gulp.src(['node_modules/bootstrap/dist/**/*', '!**/npm.js', '!**/bootstrap-theme.*', '!**/*.map'])
+        .pipe(gulp.dest('vendor/bootstrap'))
+
+    gulp.src(['node_modules/jquery/dist/jquery.js', 'node_modules/jquery/dist/jquery.min.js'])
+        .pipe(gulp.dest('vendor/jquery'))
+
+    gulp.src([
+            'node_modules/font-awesome/**',
+            '!node_modules/font-awesome/**/*.map',
+            '!node_modules/font-awesome/.npmignore',
+            '!node_modules/font-awesome/*.txt',
+            '!node_modules/font-awesome/*.md',
+            '!node_modules/font-awesome/*.json'
+        ])
+        .pipe(gulp.dest('vendor/font-awesome'))
+})
+
+// Run everything
+gulp.task('default', ['less', 'minify-css', 'minify-js', 'copy']);
+
+// Configure the browserSync task
+gulp.task('browserSync', function() {
+    browserSync.init({
+        server: {
+            baseDir: ''
+        },
+    })
+})
+
+// Dev task with browserSync
+gulp.task('dev', ['browserSync', 'less', 'minify-css', 'minify-js'], function() {
+    gulp.watch('less/*.less', ['less']);
+    gulp.watch('css/*.css', ['minify-css']);
+    gulp.watch('js/*.js', ['minify-js']);
+    // Reloads the browser whenever HTML or JS files change
+    gulp.watch('*.html', browserSync.reload);
+    gulp.watch('js/**/*.js', browserSync.reload);
+});
+
+// Compiles SCSS files from /scss into /css
+// NOTE: This theme uses LESS by default. To swtich to SCSS you will need to update this gulpfile by changing the 'less' tasks to run 'sass'!
+gulp.task('sass', function() {
+    return gulp.src('scss/agency.scss')
+        .pipe(sass())
+        .pipe(header(banner, { pkg: pkg }))
+        .pipe(gulp.dest('css'))
+        .pipe(browserSync.reload({
+            stream: true
+        }))
+});
diff --git a/documentation/img/background_image_webapps.png b/documentation/img/background_image_webapps.png
diff --git a/documentation/img/cloudStorage.gif b/documentation/img/cloudStorage.gif
diff --git a/documentation/img/cloudStorage.png b/documentation/img/cloudStorage.png
diff --git a/documentation/img/dasch.png b/documentation/img/dasch.png
diff --git a/documentation/img/gifs/allMembersLinked.png b/documentation/img/gifs/allMembersLinked.png
diff --git a/documentation/img/gifs/dataProviders.gif b/documentation/img/gifs/dataProviders.gif
diff --git a/documentation/img/gifs/dataProviders.png b/documentation/img/gifs/dataProviders.png
diff --git a/documentation/img/gifs/microservice.gif b/documentation/img/gifs/microservice.gif
diff --git a/documentation/img/gifs/microservice.png b/documentation/img/gifs/microservice.png
diff --git a/documentation/img/gifs/ownData.png b/documentation/img/gifs/ownData.png
diff --git a/documentation/img/gifs/wbeComponents.png b/documentation/img/gifs/wbeComponents.png
diff --git a/documentation/img/gifs/webComponent.gif b/documentation/img/gifs/webComponent.gif
diff --git a/documentation/img/institutions_vision.png b/documentation/img/institutions_vision.png
diff --git a/documentation/img/microserivces.png b/documentation/img/microserivces.png
diff --git a/documentation/img/s3it.jpg b/documentation/img/s3it.jpg
diff --git a/documentation/img/swissuniversities.jpg b/documentation/img/swissuniversities.jpg
diff --git a/documentation/img/ubasel.jpg b/documentation/img/ubasel.jpg
diff --git a/documentation/img/ubbasel.png b/documentation/img/ubbasel.png
diff --git a/documentation/img/ubern.jpg b/documentation/img/ubern.jpg
diff --git a/documentation/img/ubern.png b/documentation/img/ubern.png
diff --git a/documentation/img/uzh.png b/documentation/img/uzh.png
diff --git a/documentation/img/zb.png b/documentation/img/zb.png