diff --git a/.gitignore b/.gitignore index 1f61f16..d901322 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,16 @@ _site .project .settings/ .settings/* + +node_modules/ + +# files generated by jekyll (the final static site) +site/ + +# files generated by webpack +manifest.js +*-bundle* +*.bundle* + +# fonts from npm are copied to this directory +static/fonts/ diff --git a/.travis.yml b/.travis.yml index a9482f4..fcdd838 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,17 +16,23 @@ cache: - node_modules before_install: + # use nvm to install npm, as it is only included by Travis CI in node_js projects - . $HOME/.nvm/nvm.sh - nvm install stable - nvm use stable - npm install + # install yarn (explanation for npm is true here as well) + # for documentation, see https://yarnpkg.com/lang/en/docs/install-ci/#travis-tab - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.27.5 - export PATH=$HOME/.yarn/bin:$PATH before_script: + # run yarn to install our dependencies from package.json - yarn script: + # pack libs, fonts, etc. together + - node_modules/.bin/webpack -p # use additional config for CI (changes baseurl for GH Pages) # settings defined in later files overwrite ones from earlier files - bundle exec jekyll build --config _config.yml,_config_travis.yml diff --git a/_config.yml b/_config.yml index 90d971b..c9d1f33 100644 --- a/_config.yml +++ b/_config.yml @@ -44,6 +44,9 @@ metatag: # Build settings markdown: kramdown +source: sources +destination: site + plugins: - jekyll-coffeescript @@ -60,7 +63,6 @@ keep_files: exclude: - .c9 - .git - - vendor/bundle permalink: none @@ -95,9 +97,6 @@ defaults: values: layout: "en-page" -sass: - style: :compressed - collections: news: sidebar: diff --git a/_config_travis.yml b/_config_travis.yml index c5bb939..1e4f032 100644 --- a/_config_travis.yml +++ b/_config_travis.yml @@ -3,9 +3,5 @@ username: fsr repo: ese-website branch: development -# build settings -source: . -destination: _site - # change the baseurl when deploying to GitHub Pages baseurl: "/ese-website" diff --git a/_data/scripts.yaml b/_data/scripts.yaml deleted file mode 100644 index 8c7dd78..0000000 --- a/_data/scripts.yaml +++ /dev/null @@ -1,20 +0,0 @@ -default: - pre: - # The following scripts are included in the - - - src: /vendor/modernizr/modernizr.min.js - - - src: /coffee/news.js - - - src: /vendor/pace/pace.min.js - #- - # src: /coffee/switchheader.js - - post: - # these scripts are included as the last elements in - - - src: /vendor/jquery/dist/jquery.min.js - - - src: /vendor/foundation/js/foundation.min.js - - - src: /vendor/js/app.js diff --git a/_data/stylesheets.yaml b/_data/stylesheets.yaml deleted file mode 100644 index 2fc1d38..0000000 --- a/_data/stylesheets.yaml +++ /dev/null @@ -1,8 +0,0 @@ -default: - head: - - - src: /css/style.css - - - src: /vendor/slick/slick.css - - - src: /vendor/slick/slick-theme.css \ No newline at end of file diff --git a/_includes/lateload-scripts.html b/_includes/lateload-scripts.html deleted file mode 100644 index 5120045..0000000 --- a/_includes/lateload-scripts.html +++ /dev/null @@ -1,3 +0,0 @@ -{% for s in site.data.scripts.default.post %} - {% include script.html script=s %} -{% endfor %} diff --git a/_includes/layout-default.html b/_includes/layout-default.html deleted file mode 100644 index f735314..0000000 --- a/_includes/layout-default.html +++ /dev/null @@ -1,42 +0,0 @@ - - - {% if include.sidebar-items %}{% assign items = include.sidebar-items %}{% else %}{% assign items = site.sidebar %}{% endif %} - {% if include.pages %}{% assign pages = include.pages %}{% else %}{% assign pages = site.pages %}{% endif %} - {% include head.html lang=include.lang %} - - - - -
- {% include header.html pages=pages %} -
-
-
- {{ content }} -
- -
-
- {% include footer.html %} -
- - {% include lateload-scripts.html %} - - - {% js slider %} - - - - {% if jekyll.environment == "development" %} - {% js development %} - {% include developer-preview.html %} - {% endif %} - - - diff --git a/_includes/script.html b/_includes/script.html deleted file mode 100644 index e9b93ad..0000000 --- a/_includes/script.html +++ /dev/null @@ -1,5 +0,0 @@ -{% if include.script %} - {% assign script = include.script %} -{% endif %} - - diff --git a/eva b/eva deleted file mode 160000 index 134775b..0000000 --- a/eva +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 134775b2d7fa9e5da31adf7130a11561038597c2 diff --git a/package.json b/package.json index b5d1095..a56a943 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,22 @@ { "dependencies": { - "slick-carousel": "^1.6.0" + "jquery": "^2.2.4", + "modernizr": "^3.5.0", + "pace-progress": "^1.0.2", + "slick-carousel": "^1.6.0", + "typeface-open-sans": "^0.0.31", + "typeface-work-sans": "^0.0.31" + }, + "devDependencies": { + "css-loader": "^0.28.4", + "expose-loader": "^0.7.3", + "extract-text-webpack-plugin": "^3.0.0", + "file-loader": "^0.11.2", + "node-sass": "^4.5.3", + "sass-loader": "^6.0.6", + "script-loader": "^0.7.0", + "style-loader": "^0.18.2", + "url-loader": "^0.5.9", + "webpack": "^3.4.1" } } diff --git a/sources/.jekyll-metadata b/sources/.jekyll-metadata new file mode 100644 index 0000000..acfc5c8 Binary files /dev/null and b/sources/.jekyll-metadata differ diff --git a/404.md b/sources/404.md similarity index 100% rename from 404.md rename to sources/404.md diff --git a/ESE-en.ics b/sources/ESE-en.ics similarity index 100% rename from ESE-en.ics rename to sources/ESE-en.ics diff --git a/ESE.ics b/sources/ESE.ics similarity index 100% rename from ESE.ics rename to sources/ESE.ics diff --git a/_assets/css/_custom.scss b/sources/_assets/css/_custom.scss similarity index 91% rename from _assets/css/_custom.scss rename to sources/_assets/css/_custom.scss index 18f28fa..63c2ce0 100644 --- a/_assets/css/_custom.scss +++ b/sources/_assets/css/_custom.scss @@ -1,3 +1,33 @@ +/* + * Font settings + * TODO: get rid of all those !important statements when final and use foundation variables instead :) + +$body-font-weight: 300; +$header-font-family: "Work Sans", sans-serif; +$header-font-weight: 400; +$header-font-color: #323232; +$paragraph-font-weight: $body-font-weight; + + */ + + + +h1, h2, h3, h4, h5, h6{ +font-family: 'Work Sans', sans-serif !important; +} + +.sidebar h4{ + font-weight: 300; +} + +p{ + font-weight:300 !important; +} + +strong{ + font-weight:400 !important; +} + /* * Pace */ @@ -36,6 +66,10 @@ header { box-shadow: 0 1.5px 3px rgba(0, 0, 0, .24), 0 3px 8px rgba(0, 0, 0, .05); } +header a{ + font-weight: 300 !important; +} + header a:hover{ text-decoration: none; diff --git a/_assets/css/_foundation.scss b/sources/_assets/css/_foundation.scss similarity index 100% rename from _assets/css/_foundation.scss rename to sources/_assets/css/_foundation.scss diff --git a/_assets/css/_init.scss b/sources/_assets/css/_init.scss similarity index 94% rename from _assets/css/_init.scss rename to sources/_assets/css/_init.scss index 020c586..b33b814 100644 --- a/_assets/css/_init.scss +++ b/sources/_assets/css/_init.scss @@ -7,9 +7,6 @@ $base-font-size: 100%; $base-line-height: 150%; - -@import url('https://fonts.googleapis.com/css?family=Open+Sans:300'); - $font-family-sans-serif: "Open Sans", Arial, sans-serif; $font-family-serif: Georgia, Cambria, "Times New Roman", Times, serif; $font-family-monospace: Consolas, "Liberation Mono", Courier, monospace; @@ -48,8 +45,7 @@ $info-color : #A0D3E8; // We use these to control various global styles $body-bg: $white-smoke; -$body-font-color: $jet; -$body-font-family: $font-family-sans-serif; +$body-font-color: #323232; // Accordion $accordion-navigation-bg-color: $brand-color; diff --git a/_assets/css/_normalize.scss b/sources/_assets/css/_normalize.scss similarity index 100% rename from _assets/css/_normalize.scss rename to sources/_assets/css/_normalize.scss diff --git a/sources/_assets/css/fonts.scss b/sources/_assets/css/fonts.scss new file mode 100644 index 0000000..6b273e5 --- /dev/null +++ b/sources/_assets/css/fonts.scss @@ -0,0 +1,43 @@ +/* DEPRECATED */ + +/* open-sans-300normal - latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 300; + src: url(asset_path('open-sans-latin-300.eot')); /* IE9 Compat Modes */ + src: + url(asset_path('open-sans-latin-300.eot?#iefix')) format('embedded-opentype'), /* IE6-IE8 */ + url(asset_path('open-sans-latin-300.woff2')) format('woff2'), /* Super Modern Browsers */ + url(asset_path('open-sans-latin-300.woff')) format('woff'), /* Modern Browsers */ + url(asset_path('open-sans-latin-300.svg#OpenSans')) format('svg'); /* Legacy iOS */ +} +/* open-sans-300italic - latin */ +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 300; + src: url(asset_path('open-sans-latin-300italic.eot')); /* IE9 Compat Modes */ + src: + local('Open Sans Light italic'), + local('Open Sans-Lightitalic'), + url(asset_path('open-sans-latin-300italic.eot?#iefix')) format('embedded-opentype'), /* IE6-IE8 */ + url(asset_path('open-sans-latin-300italic.woff2')) format('woff2'), /* Super Modern Browsers */ + url(asset_path('open-sans-latin-300italic.woff')) format('woff'), /* Modern Browsers */ + url(asset_path('open-sans-latin-300italic.svg#OpenSans')) format('svg'); /* Legacy iOS */ +} + +/* open-sans-400normal - latin */ +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 400; + src: url(asset_path('open-sans-latin-400.eot')); /* IE9 Compat Modes */ + src: + local('Open Sans Regular '), + local('Open Sans-Regular'), + url(asset_path('open-sans-latin-400.eot?#iefix')) format('embedded-opentype'), /* IE6-IE8 */ + url(asset_path('open-sans-latin-400.woff2')) format('woff2'), /* Super Modern Browsers */ + url(asset_path('open-sans-latin-400.woff')) format('woff'), /* Modern Browsers */ + url(asset_path('open-sans-latin-400.svg#OpenSans')) format('svg'); /* Legacy iOS */ +} diff --git a/_assets/css/foundation/_functions.scss b/sources/_assets/css/foundation/_functions.scss similarity index 100% rename from _assets/css/foundation/_functions.scss rename to sources/_assets/css/foundation/_functions.scss diff --git a/_assets/css/foundation/_settings.scss b/sources/_assets/css/foundation/_settings.scss similarity index 100% rename from _assets/css/foundation/_settings.scss rename to sources/_assets/css/foundation/_settings.scss diff --git a/_assets/css/foundation/components/_accordion.scss b/sources/_assets/css/foundation/components/_accordion.scss similarity index 100% rename from _assets/css/foundation/components/_accordion.scss rename to sources/_assets/css/foundation/components/_accordion.scss diff --git a/_assets/css/foundation/components/_alert-boxes.scss b/sources/_assets/css/foundation/components/_alert-boxes.scss similarity index 100% rename from _assets/css/foundation/components/_alert-boxes.scss rename to sources/_assets/css/foundation/components/_alert-boxes.scss diff --git a/_assets/css/foundation/components/_block-grid.scss b/sources/_assets/css/foundation/components/_block-grid.scss similarity index 100% rename from _assets/css/foundation/components/_block-grid.scss rename to sources/_assets/css/foundation/components/_block-grid.scss diff --git a/_assets/css/foundation/components/_breadcrumbs.scss b/sources/_assets/css/foundation/components/_breadcrumbs.scss similarity index 100% rename from _assets/css/foundation/components/_breadcrumbs.scss rename to sources/_assets/css/foundation/components/_breadcrumbs.scss diff --git a/_assets/css/foundation/components/_button-groups.scss b/sources/_assets/css/foundation/components/_button-groups.scss similarity index 100% rename from _assets/css/foundation/components/_button-groups.scss rename to sources/_assets/css/foundation/components/_button-groups.scss diff --git a/_assets/css/foundation/components/_buttons.scss b/sources/_assets/css/foundation/components/_buttons.scss similarity index 100% rename from _assets/css/foundation/components/_buttons.scss rename to sources/_assets/css/foundation/components/_buttons.scss diff --git a/_assets/css/foundation/components/_clearing.scss b/sources/_assets/css/foundation/components/_clearing.scss similarity index 100% rename from _assets/css/foundation/components/_clearing.scss rename to sources/_assets/css/foundation/components/_clearing.scss diff --git a/_assets/css/foundation/components/_dropdown-buttons.scss b/sources/_assets/css/foundation/components/_dropdown-buttons.scss similarity index 100% rename from _assets/css/foundation/components/_dropdown-buttons.scss rename to sources/_assets/css/foundation/components/_dropdown-buttons.scss diff --git a/_assets/css/foundation/components/_dropdown.scss b/sources/_assets/css/foundation/components/_dropdown.scss similarity index 100% rename from _assets/css/foundation/components/_dropdown.scss rename to sources/_assets/css/foundation/components/_dropdown.scss diff --git a/_assets/css/foundation/components/_flex-video.scss b/sources/_assets/css/foundation/components/_flex-video.scss similarity index 100% rename from _assets/css/foundation/components/_flex-video.scss rename to sources/_assets/css/foundation/components/_flex-video.scss diff --git a/_assets/css/foundation/components/_forms.scss b/sources/_assets/css/foundation/components/_forms.scss similarity index 100% rename from _assets/css/foundation/components/_forms.scss rename to sources/_assets/css/foundation/components/_forms.scss diff --git a/_assets/css/foundation/components/_global.scss b/sources/_assets/css/foundation/components/_global.scss similarity index 100% rename from _assets/css/foundation/components/_global.scss rename to sources/_assets/css/foundation/components/_global.scss diff --git a/_assets/css/foundation/components/_grid.scss b/sources/_assets/css/foundation/components/_grid.scss similarity index 100% rename from _assets/css/foundation/components/_grid.scss rename to sources/_assets/css/foundation/components/_grid.scss diff --git a/_assets/css/foundation/components/_icon-bar.scss b/sources/_assets/css/foundation/components/_icon-bar.scss similarity index 100% rename from _assets/css/foundation/components/_icon-bar.scss rename to sources/_assets/css/foundation/components/_icon-bar.scss diff --git a/_assets/css/foundation/components/_inline-lists.scss b/sources/_assets/css/foundation/components/_inline-lists.scss similarity index 100% rename from _assets/css/foundation/components/_inline-lists.scss rename to sources/_assets/css/foundation/components/_inline-lists.scss diff --git a/_assets/css/foundation/components/_joyride.scss b/sources/_assets/css/foundation/components/_joyride.scss similarity index 100% rename from _assets/css/foundation/components/_joyride.scss rename to sources/_assets/css/foundation/components/_joyride.scss diff --git a/_assets/css/foundation/components/_keystrokes.scss b/sources/_assets/css/foundation/components/_keystrokes.scss similarity index 100% rename from _assets/css/foundation/components/_keystrokes.scss rename to sources/_assets/css/foundation/components/_keystrokes.scss diff --git a/_assets/css/foundation/components/_labels.scss b/sources/_assets/css/foundation/components/_labels.scss similarity index 100% rename from _assets/css/foundation/components/_labels.scss rename to sources/_assets/css/foundation/components/_labels.scss diff --git a/_assets/css/foundation/components/_magellan.scss b/sources/_assets/css/foundation/components/_magellan.scss similarity index 100% rename from _assets/css/foundation/components/_magellan.scss rename to sources/_assets/css/foundation/components/_magellan.scss diff --git a/_assets/css/foundation/components/_offcanvas.scss b/sources/_assets/css/foundation/components/_offcanvas.scss similarity index 100% rename from _assets/css/foundation/components/_offcanvas.scss rename to sources/_assets/css/foundation/components/_offcanvas.scss diff --git a/_assets/css/foundation/components/_orbit.scss b/sources/_assets/css/foundation/components/_orbit.scss similarity index 100% rename from _assets/css/foundation/components/_orbit.scss rename to sources/_assets/css/foundation/components/_orbit.scss diff --git a/_assets/css/foundation/components/_pagination.scss b/sources/_assets/css/foundation/components/_pagination.scss similarity index 100% rename from _assets/css/foundation/components/_pagination.scss rename to sources/_assets/css/foundation/components/_pagination.scss diff --git a/_assets/css/foundation/components/_panels.scss b/sources/_assets/css/foundation/components/_panels.scss similarity index 100% rename from _assets/css/foundation/components/_panels.scss rename to sources/_assets/css/foundation/components/_panels.scss diff --git a/_assets/css/foundation/components/_pricing-tables.scss b/sources/_assets/css/foundation/components/_pricing-tables.scss similarity index 100% rename from _assets/css/foundation/components/_pricing-tables.scss rename to sources/_assets/css/foundation/components/_pricing-tables.scss diff --git a/_assets/css/foundation/components/_progress-bars.scss b/sources/_assets/css/foundation/components/_progress-bars.scss similarity index 100% rename from _assets/css/foundation/components/_progress-bars.scss rename to sources/_assets/css/foundation/components/_progress-bars.scss diff --git a/_assets/css/foundation/components/_range-slider.scss b/sources/_assets/css/foundation/components/_range-slider.scss similarity index 100% rename from _assets/css/foundation/components/_range-slider.scss rename to sources/_assets/css/foundation/components/_range-slider.scss diff --git a/_assets/css/foundation/components/_reveal.scss b/sources/_assets/css/foundation/components/_reveal.scss similarity index 100% rename from _assets/css/foundation/components/_reveal.scss rename to sources/_assets/css/foundation/components/_reveal.scss diff --git a/_assets/css/foundation/components/_side-nav.scss b/sources/_assets/css/foundation/components/_side-nav.scss similarity index 100% rename from _assets/css/foundation/components/_side-nav.scss rename to sources/_assets/css/foundation/components/_side-nav.scss diff --git a/_assets/css/foundation/components/_split-buttons.scss b/sources/_assets/css/foundation/components/_split-buttons.scss similarity index 100% rename from _assets/css/foundation/components/_split-buttons.scss rename to sources/_assets/css/foundation/components/_split-buttons.scss diff --git a/_assets/css/foundation/components/_sub-nav.scss b/sources/_assets/css/foundation/components/_sub-nav.scss similarity index 100% rename from _assets/css/foundation/components/_sub-nav.scss rename to sources/_assets/css/foundation/components/_sub-nav.scss diff --git a/_assets/css/foundation/components/_switches.scss b/sources/_assets/css/foundation/components/_switches.scss similarity index 100% rename from _assets/css/foundation/components/_switches.scss rename to sources/_assets/css/foundation/components/_switches.scss diff --git a/_assets/css/foundation/components/_tables.scss b/sources/_assets/css/foundation/components/_tables.scss similarity index 100% rename from _assets/css/foundation/components/_tables.scss rename to sources/_assets/css/foundation/components/_tables.scss diff --git a/_assets/css/foundation/components/_tabs.scss b/sources/_assets/css/foundation/components/_tabs.scss similarity index 100% rename from _assets/css/foundation/components/_tabs.scss rename to sources/_assets/css/foundation/components/_tabs.scss diff --git a/_assets/css/foundation/components/_thumbs.scss b/sources/_assets/css/foundation/components/_thumbs.scss similarity index 100% rename from _assets/css/foundation/components/_thumbs.scss rename to sources/_assets/css/foundation/components/_thumbs.scss diff --git a/_assets/css/foundation/components/_tooltips.scss b/sources/_assets/css/foundation/components/_tooltips.scss similarity index 100% rename from _assets/css/foundation/components/_tooltips.scss rename to sources/_assets/css/foundation/components/_tooltips.scss diff --git a/_assets/css/foundation/components/_top-bar.scss b/sources/_assets/css/foundation/components/_top-bar.scss similarity index 100% rename from _assets/css/foundation/components/_top-bar.scss rename to sources/_assets/css/foundation/components/_top-bar.scss diff --git a/_assets/css/foundation/components/_type.scss b/sources/_assets/css/foundation/components/_type.scss similarity index 100% rename from _assets/css/foundation/components/_type.scss rename to sources/_assets/css/foundation/components/_type.scss diff --git a/_assets/css/foundation/components/_visibility.scss b/sources/_assets/css/foundation/components/_visibility.scss similarity index 100% rename from _assets/css/foundation/components/_visibility.scss rename to sources/_assets/css/foundation/components/_visibility.scss diff --git a/_assets/css/img/desaturate.svg b/sources/_assets/css/img/desaturate.svg similarity index 100% rename from _assets/css/img/desaturate.svg rename to sources/_assets/css/img/desaturate.svg diff --git a/_assets/css/style.scss b/sources/_assets/css/style.scss similarity index 100% rename from _assets/css/style.scss rename to sources/_assets/css/style.scss diff --git a/_assets/img/ascii-logo.png b/sources/_assets/img/ascii-logo.png similarity index 100% rename from _assets/img/ascii-logo.png rename to sources/_assets/img/ascii-logo.png diff --git a/_assets/img/cd-logo.png b/sources/_assets/img/cd-logo.png similarity index 100% rename from _assets/img/cd-logo.png rename to sources/_assets/img/cd-logo.png diff --git a/_assets/img/de.png b/sources/_assets/img/de.png similarity index 100% rename from _assets/img/de.png rename to sources/_assets/img/de.png diff --git a/_assets/img/en.png b/sources/_assets/img/en.png similarity index 100% rename from _assets/img/en.png rename to sources/_assets/img/en.png diff --git a/_assets/img/ese-logo.png b/sources/_assets/img/ese-logo.png similarity index 100% rename from _assets/img/ese-logo.png rename to sources/_assets/img/ese-logo.png diff --git a/_assets/img/ese_logo_2016.svg b/sources/_assets/img/ese_logo_2016.svg similarity index 100% rename from _assets/img/ese_logo_2016.svg rename to sources/_assets/img/ese_logo_2016.svg diff --git a/_assets/img/flags/de.png b/sources/_assets/img/flags/de.png similarity index 100% rename from _assets/img/flags/de.png rename to sources/_assets/img/flags/de.png diff --git a/_assets/img/flags/en.png b/sources/_assets/img/flags/en.png similarity index 100% rename from _assets/img/flags/en.png rename to sources/_assets/img/flags/en.png diff --git a/_assets/img/fsr-logo.png b/sources/_assets/img/fsr-logo.png similarity index 100% rename from _assets/img/fsr-logo.png rename to sources/_assets/img/fsr-logo.png diff --git a/_assets/img/header/APB-Namensschild.png b/sources/_assets/img/header/APB-Namensschild.png similarity index 100% rename from _assets/img/header/APB-Namensschild.png rename to sources/_assets/img/header/APB-Namensschild.png diff --git a/_assets/img/header/Die-Kunst.png b/sources/_assets/img/header/Die-Kunst.png similarity index 100% rename from _assets/img/header/Die-Kunst.png rename to sources/_assets/img/header/Die-Kunst.png diff --git a/_assets/img/header/Fassade-vorn.png b/sources/_assets/img/header/Fassade-vorn.png similarity index 100% rename from _assets/img/header/Fassade-vorn.png rename to sources/_assets/img/header/Fassade-vorn.png diff --git a/_assets/img/header/Foyer-Decke.png b/sources/_assets/img/header/Foyer-Decke.png similarity index 100% rename from _assets/img/header/Foyer-Decke.png rename to sources/_assets/img/header/Foyer-Decke.png diff --git a/_assets/img/header/Helmholzstrasse.png b/sources/_assets/img/header/Helmholzstrasse.png similarity index 100% rename from _assets/img/header/Helmholzstrasse.png rename to sources/_assets/img/header/Helmholzstrasse.png diff --git a/_assets/img/header/Innenhof.png b/sources/_assets/img/header/Innenhof.png similarity index 100% rename from _assets/img/header/Innenhof.png rename to sources/_assets/img/header/Innenhof.png diff --git a/_assets/img/header/Reflections.png b/sources/_assets/img/header/Reflections.png similarity index 100% rename from _assets/img/header/Reflections.png rename to sources/_assets/img/header/Reflections.png diff --git a/_assets/img/header/Wendeltreppe.png b/sources/_assets/img/header/Wendeltreppe.png similarity index 100% rename from _assets/img/header/Wendeltreppe.png rename to sources/_assets/img/header/Wendeltreppe.png diff --git a/_assets/img/header/temp-opener.jpg b/sources/_assets/img/header/temp-opener.jpg similarity index 100% rename from _assets/img/header/temp-opener.jpg rename to sources/_assets/img/header/temp-opener.jpg diff --git a/_assets/img/icon_smile.gif b/sources/_assets/img/icon_smile.gif similarity index 100% rename from _assets/img/icon_smile.gif rename to sources/_assets/img/icon_smile.gif diff --git a/_assets/img/icons/android-icon-144x144.png b/sources/_assets/img/icons/android-icon-144x144.png similarity index 100% rename from _assets/img/icons/android-icon-144x144.png rename to sources/_assets/img/icons/android-icon-144x144.png diff --git a/_assets/img/icons/android-icon-192x192.png b/sources/_assets/img/icons/android-icon-192x192.png similarity index 100% rename from _assets/img/icons/android-icon-192x192.png rename to sources/_assets/img/icons/android-icon-192x192.png diff --git a/_assets/img/icons/android-icon-36x36.png b/sources/_assets/img/icons/android-icon-36x36.png similarity index 100% rename from _assets/img/icons/android-icon-36x36.png rename to sources/_assets/img/icons/android-icon-36x36.png diff --git a/_assets/img/icons/android-icon-48x48.png b/sources/_assets/img/icons/android-icon-48x48.png similarity index 100% rename from _assets/img/icons/android-icon-48x48.png rename to sources/_assets/img/icons/android-icon-48x48.png diff --git a/_assets/img/icons/android-icon-72x72.png b/sources/_assets/img/icons/android-icon-72x72.png similarity index 100% rename from _assets/img/icons/android-icon-72x72.png rename to sources/_assets/img/icons/android-icon-72x72.png diff --git a/_assets/img/icons/android-icon-96x96.png b/sources/_assets/img/icons/android-icon-96x96.png similarity index 100% rename from _assets/img/icons/android-icon-96x96.png rename to sources/_assets/img/icons/android-icon-96x96.png diff --git a/_assets/img/icons/apple-icon-114x114.png b/sources/_assets/img/icons/apple-icon-114x114.png similarity index 100% rename from _assets/img/icons/apple-icon-114x114.png rename to sources/_assets/img/icons/apple-icon-114x114.png diff --git a/_assets/img/icons/apple-icon-120x120.png b/sources/_assets/img/icons/apple-icon-120x120.png similarity index 100% rename from _assets/img/icons/apple-icon-120x120.png rename to sources/_assets/img/icons/apple-icon-120x120.png diff --git a/_assets/img/icons/apple-icon-144x144.png b/sources/_assets/img/icons/apple-icon-144x144.png similarity index 100% rename from _assets/img/icons/apple-icon-144x144.png rename to sources/_assets/img/icons/apple-icon-144x144.png diff --git a/_assets/img/icons/apple-icon-152x152.png b/sources/_assets/img/icons/apple-icon-152x152.png similarity index 100% rename from _assets/img/icons/apple-icon-152x152.png rename to sources/_assets/img/icons/apple-icon-152x152.png diff --git a/_assets/img/icons/apple-icon-180x180.png b/sources/_assets/img/icons/apple-icon-180x180.png similarity index 100% rename from _assets/img/icons/apple-icon-180x180.png rename to sources/_assets/img/icons/apple-icon-180x180.png diff --git a/_assets/img/icons/apple-icon-57x57.png b/sources/_assets/img/icons/apple-icon-57x57.png similarity index 100% rename from _assets/img/icons/apple-icon-57x57.png rename to sources/_assets/img/icons/apple-icon-57x57.png diff --git a/_assets/img/icons/apple-icon-60x60.png b/sources/_assets/img/icons/apple-icon-60x60.png similarity index 100% rename from _assets/img/icons/apple-icon-60x60.png rename to sources/_assets/img/icons/apple-icon-60x60.png diff --git a/_assets/img/icons/apple-icon-72x72.png b/sources/_assets/img/icons/apple-icon-72x72.png similarity index 100% rename from _assets/img/icons/apple-icon-72x72.png rename to sources/_assets/img/icons/apple-icon-72x72.png diff --git a/_assets/img/icons/apple-icon-76x76.png b/sources/_assets/img/icons/apple-icon-76x76.png similarity index 100% rename from _assets/img/icons/apple-icon-76x76.png rename to sources/_assets/img/icons/apple-icon-76x76.png diff --git a/_assets/img/icons/apple-icon-precomposed.png b/sources/_assets/img/icons/apple-icon-precomposed.png similarity index 100% rename from _assets/img/icons/apple-icon-precomposed.png rename to sources/_assets/img/icons/apple-icon-precomposed.png diff --git a/_assets/img/icons/apple-icon.png b/sources/_assets/img/icons/apple-icon.png similarity index 100% rename from _assets/img/icons/apple-icon.png rename to sources/_assets/img/icons/apple-icon.png diff --git a/_assets/img/icons/favicon-16x16.png b/sources/_assets/img/icons/favicon-16x16.png similarity index 100% rename from _assets/img/icons/favicon-16x16.png rename to sources/_assets/img/icons/favicon-16x16.png diff --git a/_assets/img/icons/favicon-32x32.png b/sources/_assets/img/icons/favicon-32x32.png similarity index 100% rename from _assets/img/icons/favicon-32x32.png rename to sources/_assets/img/icons/favicon-32x32.png diff --git a/_assets/img/icons/favicon-96x96.png b/sources/_assets/img/icons/favicon-96x96.png similarity index 100% rename from _assets/img/icons/favicon-96x96.png rename to sources/_assets/img/icons/favicon-96x96.png diff --git a/_assets/img/icons/favicon.ico b/sources/_assets/img/icons/favicon.ico similarity index 100% rename from _assets/img/icons/favicon.ico rename to sources/_assets/img/icons/favicon.ico diff --git a/_assets/img/icons/manifest.json b/sources/_assets/img/icons/manifest.json similarity index 100% rename from _assets/img/icons/manifest.json rename to sources/_assets/img/icons/manifest.json diff --git a/_assets/img/icons/ms-icon-144x144.png b/sources/_assets/img/icons/ms-icon-144x144.png similarity index 100% rename from _assets/img/icons/ms-icon-144x144.png rename to sources/_assets/img/icons/ms-icon-144x144.png diff --git a/_assets/img/icons/ms-icon-150x150.png b/sources/_assets/img/icons/ms-icon-150x150.png similarity index 100% rename from _assets/img/icons/ms-icon-150x150.png rename to sources/_assets/img/icons/ms-icon-150x150.png diff --git a/_assets/img/icons/ms-icon-310x310.png b/sources/_assets/img/icons/ms-icon-310x310.png similarity index 100% rename from _assets/img/icons/ms-icon-310x310.png rename to sources/_assets/img/icons/ms-icon-310x310.png diff --git a/_assets/img/icons/ms-icon-70x70.png b/sources/_assets/img/icons/ms-icon-70x70.png similarity index 100% rename from _assets/img/icons/ms-icon-70x70.png rename to sources/_assets/img/icons/ms-icon-70x70.png diff --git a/_assets/img/maps/apb.png b/sources/_assets/img/maps/apb.png similarity index 100% rename from _assets/img/maps/apb.png rename to sources/_assets/img/maps/apb.png diff --git a/_assets/img/maps/cd.png b/sources/_assets/img/maps/cd.png similarity index 100% rename from _assets/img/maps/cd.png rename to sources/_assets/img/maps/cd.png diff --git a/_assets/img/maps/kik.png b/sources/_assets/img/maps/kik.png similarity index 100% rename from _assets/img/maps/kik.png rename to sources/_assets/img/maps/kik.png diff --git a/_assets/img/tutoren2015.jpg b/sources/_assets/img/tutoren2015.jpg similarity index 100% rename from _assets/img/tutoren2015.jpg rename to sources/_assets/img/tutoren2015.jpg diff --git a/_assets/img/tutoren2016.jpg b/sources/_assets/img/tutoren2016.jpg similarity index 100% rename from _assets/img/tutoren2016.jpg rename to sources/_assets/img/tutoren2016.jpg diff --git a/_data/events.yaml b/sources/_data/events.yaml similarity index 97% rename from _data/events.yaml rename to sources/_data/events.yaml index 2bf2330..fe1772c 100644 --- a/_data/events.yaml +++ b/sources/_data/events.yaml @@ -4,7 +4,7 @@ days: - name: "Montag" name-en: Monday - date: 02.10.2016 + date: 02.10.2017 events: - begin: "9:00" @@ -42,7 +42,7 @@ days: - name: "Dienstag" name-en: Tuesday - date: 03.10.2016 + date: 03.10.2017 events: - title: "Wanderung" @@ -63,7 +63,7 @@ days: - name: "Mittwoch" name-en: Wednesday - date: 04.10.2016 + date: 04.10.2017 events: - begin: "9:00" @@ -103,7 +103,7 @@ days: - name: "Don­ners­tag" name-en: Thurs­day - date: 05.10.2016 + date: 05.10.2017 events: - title: "Frühstück" @@ -143,7 +143,7 @@ days: - name: "Freitag" name-en: Friday - date: 06.10.2016 + date: 06.10.2017 events: - title: "Frühstück" @@ -174,7 +174,7 @@ days: - name: "Sams­tag" name-en: Satur­day - date: 08.10.2016 + date: 08.10.2017 events: - title: "Stadt­führung" diff --git a/_data/icons.yaml b/sources/_data/icons.yaml similarity index 100% rename from _data/icons.yaml rename to sources/_data/icons.yaml diff --git a/_data/schedules.yml b/sources/_data/schedules.yml similarity index 100% rename from _data/schedules.yml rename to sources/_data/schedules.yml diff --git a/_data/switchheader.yaml b/sources/_data/switchheader.yaml similarity index 100% rename from _data/switchheader.yaml rename to sources/_data/switchheader.yaml diff --git a/_de/01-news.md b/sources/_de/01-news.md similarity index 100% rename from _de/01-news.md rename to sources/_de/01-news.md diff --git a/_de/02-events.md b/sources/_de/02-events.md similarity index 100% rename from _de/02-events.md rename to sources/_de/02-events.md diff --git a/_de/03-schedules.md b/sources/_de/03-schedules.md similarity index 100% rename from _de/03-schedules.md rename to sources/_de/03-schedules.md diff --git a/_de/04-links.md b/sources/_de/04-links.md similarity index 100% rename from _de/04-links.md rename to sources/_de/04-links.md diff --git a/_de/05-faq.md b/sources/_de/05-faq.md similarity index 100% rename from _de/05-faq.md rename to sources/_de/05-faq.md diff --git a/_en-news/2017-07-31-website-online.md b/sources/_en-news/2017-07-31-website-online.md similarity index 100% rename from _en-news/2017-07-31-website-online.md rename to sources/_en-news/2017-07-31-website-online.md diff --git a/_en-sidebar/fachschaftsrat.md b/sources/_en-sidebar/fachschaftsrat.md similarity index 100% rename from _en-sidebar/fachschaftsrat.md rename to sources/_en-sidebar/fachschaftsrat.md diff --git a/_en-sidebar/footer.html b/sources/_en-sidebar/footer.html similarity index 100% rename from _en-sidebar/footer.html rename to sources/_en-sidebar/footer.html diff --git a/_en-sidebar/kontakt.md b/sources/_en-sidebar/kontakt.md similarity index 100% rename from _en-sidebar/kontakt.md rename to sources/_en-sidebar/kontakt.md diff --git a/_en-sidebar/verwirrt.md b/sources/_en-sidebar/verwirrt.md similarity index 100% rename from _en-sidebar/verwirrt.md rename to sources/_en-sidebar/verwirrt.md diff --git a/_en/01-news.md b/sources/_en/01-news.md similarity index 100% rename from _en/01-news.md rename to sources/_en/01-news.md diff --git a/_en/02-events.md b/sources/_en/02-events.md similarity index 100% rename from _en/02-events.md rename to sources/_en/02-events.md diff --git a/_en/03-schedules.md b/sources/_en/03-schedules.md similarity index 100% rename from _en/03-schedules.md rename to sources/_en/03-schedules.md diff --git a/_en/04-links.md b/sources/_en/04-links.md similarity index 100% rename from _en/04-links.md rename to sources/_en/04-links.md diff --git a/_en/05-faq.md b/sources/_en/05-faq.md similarity index 100% rename from _en/05-faq.md rename to sources/_en/05-faq.md diff --git a/_en/index.md b/sources/_en/index.md similarity index 100% rename from _en/index.md rename to sources/_en/index.md diff --git a/_includes/all-schedules.html b/sources/_includes/all-schedules.html similarity index 100% rename from _includes/all-schedules.html rename to sources/_includes/all-schedules.html diff --git a/_includes/developer-preview.html b/sources/_includes/developer-preview.html similarity index 100% rename from _includes/developer-preview.html rename to sources/_includes/developer-preview.html diff --git a/_includes/eventlist.html b/sources/_includes/eventlist.html similarity index 100% rename from _includes/eventlist.html rename to sources/_includes/eventlist.html diff --git a/_includes/footer.html b/sources/_includes/footer.html similarity index 100% rename from _includes/footer.html rename to sources/_includes/footer.html diff --git a/_includes/head.html b/sources/_includes/head.html similarity index 86% rename from _includes/head.html rename to sources/_includes/head.html index b91b25b..ebb3a43 100644 --- a/_includes/head.html +++ b/sources/_includes/head.html @@ -39,17 +39,15 @@ - - - {% css style %} - - - - {% for s in site.data.scripts.default.pre %} - {% include script.html script=s %} - {% endfor %} + + {% css style %} + + + {% js manifest %} + {% css app_preload-bundle %} + {% js app_preload-bundle %} diff --git a/_includes/header.html b/sources/_includes/header.html similarity index 88% rename from _includes/header.html rename to sources/_includes/header.html index 70eab9d..880f78d 100644 --- a/_includes/header.html +++ b/sources/_includes/header.html @@ -1,4 +1,9 @@ -{% if include.pages %}{% assign pages = include.pages %}{% else %}{% assign pages = site.pages %}{% endif %} +{% if include.pages %} + {% assign pages = include.pages %} +{% else %} + {% assign pages = site.pages %} +{% endif %} +