aboutsummaryrefslogtreecommitdiff
path: root/viewer/src/views
diff options
context:
space:
mode:
authorpacien2021-07-04 17:35:17 +0200
committerpacien2021-07-04 17:35:17 +0200
commitd48a9eb9a75d8e55f78964e884bb94efd23fcd9b (patch)
tree6058cc246b6546ed57b3ac7821a6ae775caf1fd5 /viewer/src/views
parent34fc1501f74f29d29737164e47977b7412c84ceb (diff)
parentdfa1c6e2f2977c32f75c1d93d9e7eb44fbed28c0 (diff)
downloadldgallery-d48a9eb9a75d8e55f78964e884bb94efd23fcd9b.tar.gz
Merge branch 'oz-css-modules' into develop
Reviewed-by: pacien <pacien.trangirard@pacien.net> GitHub: closes #306
Diffstat (limited to 'viewer/src/views')
-rw-r--r--viewer/src/views/GalleryNavigation.vue2
-rw-r--r--viewer/src/views/GallerySearch.vue2
-rw-r--r--viewer/src/views/MainLayout.vue33
-rw-r--r--viewer/src/views/PanelTop.vue2
4 files changed, 19 insertions, 20 deletions
diff --git a/viewer/src/views/GalleryNavigation.vue b/viewer/src/views/GalleryNavigation.vue
index 8bb225a..fdd3922 100644
--- a/viewer/src/views/GalleryNavigation.vue
+++ b/viewer/src/views/GalleryNavigation.vue
@@ -80,5 +80,3 @@ export default class GalleryNavigation extends Vue {
80 } 80 }
81} 81}
82</script> 82</script>
83
84<style lang="scss"></style>
diff --git a/viewer/src/views/GallerySearch.vue b/viewer/src/views/GallerySearch.vue
index 6d3deb4..5ab56e0 100644
--- a/viewer/src/views/GallerySearch.vue
+++ b/viewer/src/views/GallerySearch.vue
@@ -52,5 +52,3 @@ export default class GalleryPicture extends Vue {
52 } 52 }
53} 53}
54</script> 54</script>
55
56<style lang="scss"></style>
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index eee813f..c54f183 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -18,11 +18,17 @@
18--> 18-->
19 19
20<template> 20<template>
21 <div :class="{ fullscreen: $uiStore.fullscreen, fullwidth: $uiStore.fullWidth }"> 21 <div :class="{ [$style.fullscreen]: $uiStore.fullscreen, [$style.fullwidth]: $uiStore.fullWidth }">
22 <ld-title :gallery-title="$galleryStore.galleryTitle" :current-item="$galleryStore.currentItem" /> 22 <ld-title :gallery-title="$galleryStore.galleryTitle" :current-item="$galleryStore.currentItem" />
23 <panel-top v-if="isReady" class="layout layout-top" /> 23 <PanelTop v-if="isReady" :class="[$style.layout, $style.layoutTop]" />
24 <panel-left v-if="isReady" class="layout layout-left" /> 24 <PanelLeft v-if="isReady" :class="[$style.layout, $style.layoutLeft]" />
25 <router-view v-if="!isLoading" ref="content" class="layout layout-content scrollbar" tabindex="01" /> 25 <router-view
26 v-if="!isLoading"
27 ref="content"
28 :class="[$style.layout, $style.layoutContent]"
29 class="scrollbar"
30 tabindex="01"
31 />
26 <b-loading :active="isLoading" is-full-page /> 32 <b-loading :active="isLoading" is-full-page />
27 <ld-key-press :keycode="27" @action="$uiStore.toggleFullscreen(false)" /> 33 <ld-key-press :keycode="27" @action="$uiStore.toggleFullscreen(false)" />
28 </div> 34 </div>
@@ -112,11 +118,11 @@ export default class MainLayout extends Vue {
112} 118}
113</script> 119</script>
114 120
115<style lang="scss"> 121<style lang="scss" module>
116@import "~@/assets/scss/theme.scss"; 122@import "~@/assets/scss/theme.scss";
117 123
118body, 124:global(body),
119html { 125:global(html) {
120 height: 100%; 126 height: 100%;
121 overflow: hidden; 127 overflow: hidden;
122 touch-action: none; 128 touch-action: none;
@@ -131,16 +137,16 @@ html {
131 bottom: 0; 137 bottom: 0;
132 left: 0; 138 left: 0;
133 right: 0; 139 right: 0;
134 &.layout-top { 140 &.layoutTop {
135 height: $layout-top; 141 height: $layout-top;
136 z-index: 1; 142 z-index: 1;
137 } 143 }
138 &.layout-left { 144 &.layoutLeft {
139 top: $layout-top; 145 top: $layout-top;
140 width: $layout-left; 146 width: $layout-left;
141 z-index: 2; 147 z-index: 2;
142 } 148 }
143 &.layout-content { 149 &.layoutContent {
144 top: var(--layout-top); 150 top: var(--layout-top);
145 left: var(--layout-left); 151 left: var(--layout-left);
146 z-index: 3; 152 z-index: 3;
@@ -164,17 +170,16 @@ html {
164} 170}
165 171
166.layout { 172.layout {
167 &.layout-top { 173 &.layoutTop {
168 background-color: $panel-top-bgcolor; 174 background-color: $panel-top-bgcolor;
169 color: $panel-top-txtcolor; 175 color: $panel-top-txtcolor;
170 } 176 }
171 &.layout-left { 177 &.layoutLeft {
172 background-color: $panel-left-bgcolor; 178 background-color: $panel-left-bgcolor;
173 color: $panel-left-txtcolor; 179 color: $panel-left-txtcolor;
174 } 180 }
175 &.layout-content { 181 &.layoutContent {
176 background-color: $content-bgcolor; 182 background-color: $content-bgcolor;
177 } 183 }
178} 184}
179// =====
180</style> 185</style>
diff --git a/viewer/src/views/PanelTop.vue b/viewer/src/views/PanelTop.vue
index f10a722..4e92f07 100644
--- a/viewer/src/views/PanelTop.vue
+++ b/viewer/src/views/PanelTop.vue
@@ -30,5 +30,3 @@ import { Component, Vue } from "vue-property-decorator";
30@Component 30@Component
31export default class PanelTop extends Vue {} 31export default class PanelTop extends Vue {}
32</script> 32</script>
33
34<style lang="scss"></style>