Sidebar fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud · Jun 28, 2018 · 723ec29 · 723ec29
1 parent 1df6d31
commit 723ec29
Show file tree

Hide file tree

Showing 4 changed files with 3,810 additions and 141 deletions.
diff --git a/core/css/apps.scss b/core/css/apps.scss
@@ -599,9 +599,6 @@ kbd {
 	> .section:first-child {
 		border-top: none;
 	}
-	&.with-app-sidebar {
-		margin-right: 27%;
-	}
 }
 
 /* APP-SIDEBAR ----------------------------------------------------------------*/
@@ -617,7 +614,7 @@ kbd {
 	right: 0;
 	left: auto;
 	bottom: 0;
-	width: 27%;
+	width: 27vw;
 	min-width: 300px;
 	display: block;
 	background: var(--color-main-background);
@@ -1016,6 +1013,9 @@ $popovericon-size: 16px;
 	padding-top: 50px;
 	box-sizing: border-box;
 	position: relative;
+	&.with-app-sidebar {
+		margin-right: 27vw;
+	}
 }
 /* if app-content-list is present */
 #app-content-wrapper {

diff --git a/settings/js/settings-vue.js b/settings/js/settings-vue.js
diff --git a/settings/js/settings-vue.js.map b/settings/js/settings-vue.js.map
diff --git a/settings/src/views/Apps.vue b/settings/src/views/Apps.vue
@@ -21,13 +21,13 @@
   -->
 
 <template>
-	<div id="content" class="app-settings">
+	<div id="content" class="app-settings" :class="{ 'with-app-sidebar': currentApp}">
 		<app-navigation :menu="menu" />
-		<div id="app-content" class="app-settings-content" :class="{ 'with-app-sidebar': currentApp, 'icon-loading': loadingList }">
+		<div id="app-content" class="app-settings-content" :class="{ 'icon-loading': loadingList }">
 			<app-list :category="category" :app="currentApp" :search="searchQuery"></app-list>
-			<div id="app-sidebar" v-if="id && currentApp">
-				<app-details :category="category" :app="currentApp"></app-details>
-			</div>
+		</div>
+		<div id="app-sidebar" v-if="id && currentApp">
+			<app-details :category="category" :app="currentApp"></app-details>
 		</div>
 	</div>
 </template>