diff --git a/config.toml b/config.toml index 03120eed..ca8a9b24 100755 --- a/config.toml +++ b/config.toml @@ -34,6 +34,8 @@ link = "plugins/animate/animate.css" link = "plugins/venobox/venobox.css" [[params.plugins.css]] link = "plugins/themify-icons/themify-icons.css" +[[params.plugins.css]] +link = "https://code.cdn.mozilla.net/fonts/fira.css" # JS Plugins [[params.plugins.js]] diff --git a/static/de/vr/data.js b/static/de/vr/data.js index c2eec634..14b251dc 100644 --- a/static/de/vr/data.js +++ b/static/de/vr/data.js @@ -41,7 +41,7 @@ var APP_DATA = { "yaw": 2.1959942749563464, "pitch": 0.3502609665210201, "title": "Lorem ipsum
", - "text": "
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
" + "text": "

Lorem ipsum


dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
" } ] }, diff --git a/static/de/vr/img/close.png b/static/de/vr/img/close.png deleted file mode 100644 index 9642d448..00000000 Binary files a/static/de/vr/img/close.png and /dev/null differ diff --git a/static/de/vr/img/close.svg b/static/de/vr/img/close.svg new file mode 100644 index 00000000..4e9ab47f --- /dev/null +++ b/static/de/vr/img/close.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/collapse.png b/static/de/vr/img/collapse.png deleted file mode 100644 index 658e7c20..00000000 Binary files a/static/de/vr/img/collapse.png and /dev/null differ diff --git a/static/de/vr/img/collapse.svg b/static/de/vr/img/collapse.svg new file mode 100644 index 00000000..c8fea4b4 --- /dev/null +++ b/static/de/vr/img/collapse.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/down.png b/static/de/vr/img/down.png deleted file mode 100644 index eb1a59cc..00000000 Binary files a/static/de/vr/img/down.png and /dev/null differ diff --git a/static/de/vr/img/down.svg b/static/de/vr/img/down.svg new file mode 100644 index 00000000..5368bff6 --- /dev/null +++ b/static/de/vr/img/down.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/expand.png b/static/de/vr/img/expand.png deleted file mode 100644 index 88b385a6..00000000 Binary files a/static/de/vr/img/expand.png and /dev/null differ diff --git a/static/de/vr/img/expand.svg b/static/de/vr/img/expand.svg new file mode 100644 index 00000000..90ad3baa --- /dev/null +++ b/static/de/vr/img/expand.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/fullscreen.png b/static/de/vr/img/fullscreen.png deleted file mode 100644 index 8a9c9ade..00000000 Binary files a/static/de/vr/img/fullscreen.png and /dev/null differ diff --git a/static/de/vr/img/fullscreen.svg b/static/de/vr/img/fullscreen.svg new file mode 100644 index 00000000..a260de2c --- /dev/null +++ b/static/de/vr/img/fullscreen.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/info-alt.svg b/static/de/vr/img/info-alt.svg new file mode 100644 index 00000000..ca0100a0 --- /dev/null +++ b/static/de/vr/img/info-alt.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/info.png b/static/de/vr/img/info.png deleted file mode 100644 index 34a2d261..00000000 Binary files a/static/de/vr/img/info.png and /dev/null differ diff --git a/static/de/vr/img/info.svg b/static/de/vr/img/info.svg new file mode 100644 index 00000000..4f249ddd --- /dev/null +++ b/static/de/vr/img/info.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/left.png b/static/de/vr/img/left.png deleted file mode 100644 index 4889ab01..00000000 Binary files a/static/de/vr/img/left.png and /dev/null differ diff --git a/static/de/vr/img/left.svg b/static/de/vr/img/left.svg new file mode 100644 index 00000000..ebaa9cd1 --- /dev/null +++ b/static/de/vr/img/left.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/link.png b/static/de/vr/img/link.png deleted file mode 100644 index c392ea88..00000000 Binary files a/static/de/vr/img/link.png and /dev/null differ diff --git a/static/de/vr/img/minus.png b/static/de/vr/img/minus.png deleted file mode 100644 index 43f84c0d..00000000 Binary files a/static/de/vr/img/minus.png and /dev/null differ diff --git a/static/de/vr/img/pause.png b/static/de/vr/img/pause.png deleted file mode 100644 index a19d7244..00000000 Binary files a/static/de/vr/img/pause.png and /dev/null differ diff --git a/static/de/vr/img/pause.svg b/static/de/vr/img/pause.svg new file mode 100644 index 00000000..e1525328 --- /dev/null +++ b/static/de/vr/img/pause.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/play.png b/static/de/vr/img/play.png deleted file mode 100644 index 611e46f9..00000000 Binary files a/static/de/vr/img/play.png and /dev/null differ diff --git a/static/de/vr/img/play.svg b/static/de/vr/img/play.svg new file mode 100644 index 00000000..0787482a --- /dev/null +++ b/static/de/vr/img/play.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/plus.png b/static/de/vr/img/plus.png deleted file mode 100644 index 575b553f..00000000 Binary files a/static/de/vr/img/plus.png and /dev/null differ diff --git a/static/de/vr/img/right.png b/static/de/vr/img/right.png deleted file mode 100644 index 62b4649a..00000000 Binary files a/static/de/vr/img/right.png and /dev/null differ diff --git a/static/de/vr/img/right.svg b/static/de/vr/img/right.svg new file mode 100644 index 00000000..5947163d --- /dev/null +++ b/static/de/vr/img/right.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/up-circle.svg b/static/de/vr/img/up-circle.svg new file mode 100644 index 00000000..21238e0e --- /dev/null +++ b/static/de/vr/img/up-circle.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/up.png b/static/de/vr/img/up.png deleted file mode 100644 index f50fb0a2..00000000 Binary files a/static/de/vr/img/up.png and /dev/null differ diff --git a/static/de/vr/img/up.svg b/static/de/vr/img/up.svg new file mode 100644 index 00000000..bc237119 --- /dev/null +++ b/static/de/vr/img/up.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/windowed.png b/static/de/vr/img/windowed.png deleted file mode 100644 index 05a207a7..00000000 Binary files a/static/de/vr/img/windowed.png and /dev/null differ diff --git a/static/de/vr/img/windowed.svg b/static/de/vr/img/windowed.svg new file mode 100644 index 00000000..6731bc39 --- /dev/null +++ b/static/de/vr/img/windowed.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/zoom-in.svg b/static/de/vr/img/zoom-in.svg new file mode 100644 index 00000000..8e5842a9 --- /dev/null +++ b/static/de/vr/img/zoom-in.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/img/zoom-out.svg b/static/de/vr/img/zoom-out.svg new file mode 100644 index 00000000..b127d966 --- /dev/null +++ b/static/de/vr/img/zoom-out.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/static/de/vr/index.html b/static/de/vr/index.html index 45090acd..cd940d63 100644 --- a/static/de/vr/index.html +++ b/static/de/vr/index.html @@ -8,6 +8,8 @@ + + @@ -15,27 +17,27 @@ @@ -44,37 +46,37 @@ - - + + - - + + - - + + - + - + - + - + - + - + diff --git a/static/de/vr/index.js b/static/de/vr/index.js index 7004c141..7c8415f5 100644 --- a/static/de/vr/index.js +++ b/static/de/vr/index.js @@ -253,7 +253,7 @@ // Create image element. var icon = document.createElement('img'); - icon.src = 'img/link.png'; + icon.src = 'img/up-circle.svg'; icon.classList.add('link-hotspot-icon'); // Set rotation transform. @@ -299,7 +299,7 @@ var iconWrapper = document.createElement('div'); iconWrapper.classList.add('info-hotspot-icon-wrapper'); var icon = document.createElement('img'); - icon.src = 'img/info.png'; + icon.src = 'img/info.svg'; icon.classList.add('info-hotspot-icon'); iconWrapper.appendChild(icon); @@ -315,7 +315,7 @@ var closeWrapper = document.createElement('div'); closeWrapper.classList.add('info-hotspot-close-wrapper'); var closeIcon = document.createElement('img'); - closeIcon.src = 'img/close.png'; + closeIcon.src = 'img/close.svg'; closeIcon.classList.add('info-hotspot-close-icon'); closeWrapper.appendChild(closeIcon); diff --git a/static/de/vr/style.css b/static/de/vr/style.css index 011d3a76..a9185a49 100755 --- a/static/de/vr/style.css +++ b/static/de/vr/style.css @@ -22,7 +22,7 @@ html, body { padding: 0; margin: 0; overflow: hidden; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Fira Sans", Arial, sans-serif; font-size: 16px; background-color: #000; color: #fff; @@ -49,6 +49,10 @@ a, a:hover, a:active, a:visited { right: 40px; height: 40px; text-align: center; + border-radius: 12px; + margin: 10px; + margin-left: 20px; + margin-right: 30px; } .mobile #titleBar { @@ -77,10 +81,11 @@ body.multiple-scenes.mobile #titleBar { #titleBar .sceneName { width: 100%; height: 100%; - line-height: 30px; + line-height: 27.5px; padding: 5px; background-color: #1a1a37; background-color: #1a1a37; + font-family: "Fira Sans Heavy", sans-serif; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -89,6 +94,7 @@ body.multiple-scenes.mobile #titleBar { -webkit-user-select: text; -ms-user-select: text; user-select: text; + border-radius: 30px; } .mobile #titleBar .sceneName { @@ -104,6 +110,8 @@ body.multiple-scenes.mobile #titleBar { height: 40px; padding: 5px; background-color: #ffbc3b; + border-radius: 50%; + margin: 10px; } .mobile #fullscreenToggle { @@ -153,6 +161,9 @@ body.fullscreen-enabled #fullscreenToggle { height: 40px; padding: 5px; background-color: #ffbc3b; + border-radius: 20px; + margin: 10px; + margin-right: 20px; } .mobile #autorotateToggle { @@ -206,6 +217,8 @@ body.fullscreen-enabled.mobile #autorotateToggle { height: 40px; padding: 5px; background-color: #ffbc3b; + border-radius: 50%; + margin: 10px; } .mobile #sceneListToggle { @@ -252,7 +265,6 @@ body.fullscreen-enabled.mobile #autorotateToggle { #sceneList { position: absolute; - top: 0; left: -220px; padding-top: 40px; width: 220px; @@ -262,6 +274,7 @@ body.fullscreen-enabled.mobile #autorotateToggle { margin-left: 0; -webkit-transition: margin-left 0.5s ease-in-out; transition: margin-left 0.5s ease-in-out; + margin: 20px; } .mobile #sceneList { @@ -288,7 +301,7 @@ body.fullscreen-enabled.mobile #autorotateToggle { } #sceneList.enabled { - margin-left: 220px; + margin-left: 230px; } #sceneList .scene { @@ -311,18 +324,28 @@ body.fullscreen-enabled.mobile #autorotateToggle { white-space: nowrap; } +#sceneList .scene .text:hover { + color: #1a1a37; +} + .mobile #sceneList .scene .text { line-height: 40px; } .no-touch #sceneList .scene:hover { background-color: rgb(103,115,131); - background-color: rgba(103,115,131,0.8); + background-color: #fff; } #sceneList .scene.current { background-color: rgb(103,115,131); background-color: #ffbc3b; + +} + +#sceneList .scene.current .text { + font-family: "Fira Sans Heavy", sans-serif; + } /* Hide scene list when only a single scene exists */ @@ -464,7 +487,7 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { } .desktop.no-touch .info-hotspot .info-hotspot-header:hover { - width: 460px; + width: 560px; border-radius: 5px; -webkit-transition: width 0.3s ease-in-out, border-radius 0.3s ease-in-out; @@ -474,7 +497,7 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { .desktop .info-hotspot.visible .info-hotspot-header, .desktop.no-touch .info-hotspot.visible .info-hotspot-header:hover { - width: 460px; + width: 560px; border-radius: 5px; border-top-right-radius: 0; border-bottom-right-radius: 0; @@ -517,7 +540,7 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { .desktop .info-hotspot.visible .info-hotspot-title-wrapper, .desktop.no-touch .info-hotspot .info-hotspot-header:hover .info-hotspot-title-wrapper { - width: 420px; + width: 520px; padding: 0 5px; -webkit-transition: width 0s 0.4s, padding 0s 0.4s; @@ -544,7 +567,7 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { .info-hotspot .info-hotspot-close-wrapper { position: absolute; - left: 460px; + left: 560px; top: 0; height: 40px; width: 40px; @@ -590,7 +613,7 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { .info-hotspot .info-hotspot-text { position: absolute; - width: 400px; + width: 560px; height: auto; max-height: 200px; top: 40px; @@ -783,7 +806,10 @@ body.single-scene #sceneList, body.single-scene #sceneListToggle { height: 40px; padding: 5px; background-color: rgb(103,115,131); - background-color: #ffbc3b; + background-color: #fff; + border-radius: 50%; + margin-bottom: 10px; + } body.view-control-buttons .viewControlButton {