Skip to content

Commit

Permalink
Merge pull request #74 from moritzebeling/develop
Browse files Browse the repository at this point in the history
v1.2
  • Loading branch information
moritzebeling authored Jul 30, 2020
2 parents 71ed3c8 + df6cfd6 commit 3d6d4c8
Show file tree
Hide file tree
Showing 108 changed files with 12,504 additions and 1,721 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@
[submodule "assets/apps/liebling-house"]
path = assets/apps/liebling-house
url = https://moritzebeling@bitbucket.org/cdaweimar/liebling-house-world.git
[submodule "site/plugins/kirby-bettersearch"]
path = site/plugins/kirby-bettersearch
url = https://github.com/bvdputte/kirby-bettersearch.git
[submodule "site/plugins/kirby-sitemapper"]
path = site/plugins/kirby-sitemapper
url = https://gitlab.com/cre8ivclick/sitemapper.git
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sass --watch --style=compressed assets/scss:assets/css
```
Run Svelte
```
cd site/plugins/frontend/assets
cd assets/frontend/app
npm run dev
npm run build
```
Expand All @@ -55,6 +55,7 @@ npm run build
- [OrbitControls](https://threejs.org/examples/?q=orbit#misc_controls_orbit)
- [Equirectangular Panorama](https://threejs.org/examples/?q=panorama#webgl_panorama_equirectangular)
- **[UnityLoader](https://docs.unity3d.com/Manual/webgl-gettingstarted.html)**
- **[Sitemapper](https://gitlab.com/kirbyzone/sitemapper)**

## Web APIs
The website offeres some public APIs
Expand Down
2 changes: 1 addition & 1 deletion assets/css/global.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/global.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion assets/css/normalize.css

This file was deleted.

1 change: 0 additions & 1 deletion assets/css/normalize.css.map

This file was deleted.

4 changes: 3 additions & 1 deletion assets/es6/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ function scrollControl(){
}

window.onload = function() {
// console.log('onload');
scrollControl();
aboutBar = document.getElementById('cda');
}
Expand All @@ -48,12 +47,15 @@ window.onscroll = function() {

var aboutBar;
function toggleAboutBar(){
document.body.classList.toggle('about-open');
aboutBar.classList.toggle('open');
}
function openAboutBar(){
document.body.classList.add('about-open');
aboutBar.classList.add('open');
}
function closeAboutBar( e ){
document.body.classList.remove('about-open');
aboutBar.classList.remove('open');
e.stopPropagation();
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default {
sourcemap: true,
format: 'iife',
name: 'app',
file: '../../../../assets/frontend/bundle.js'
file: '../bundle.js'
},
plugins: [
svelte({
Expand All @@ -21,7 +21,7 @@ export default {
// we'll extract any component CSS out into
// a separate file — better for performance
css: css => {
css.write('../../../../assets/frontend/bundle.css');
css.write('../bundle.css');
}
}),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<svelte:window on:popstate={popState} on:click={clickAnyLink}></svelte:window>

<svelte:head>
<title>CDA {page.title}</title>
<title>C D A → {page.title}</title>
</svelte:head>

<HistoryBar />
Expand Down
Loading

0 comments on commit 3d6d4c8

Please sign in to comment.