Merge pull request #468 from nextcloud/design/rich-workspaces-padding

Rich workspaces: Slightly reduce vertical space
nextcloud · Dec 10, 2019 · f8e33ee · f8e33ee
2 parents 25b0630 + 3abe1ba
commit f8e33ee
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git a/js/editor-rich.js b/js/editor-rich.js
diff --git a/js/editor-rich.js.map b/js/editor-rich.js.map
diff --git a/js/files.js b/js/files.js
diff --git a/js/files.js.map b/js/files.js.map
diff --git a/js/public.js b/js/public.js
diff --git a/js/public.js.map b/js/public.js.map
diff --git a/js/text.js b/js/text.js
diff --git a/js/text.js.map b/js/text.js.map
diff --git a/src/views/RichWorkspace.vue b/src/views/RichWorkspace.vue
@@ -120,7 +120,7 @@ export default {
 				return
 			}
 			this.creating = true
-			window.FileList.createFile('README.md', { scrollTo: false, animate: false }).then((status, data) => {
+			window.FileList.createFile('Readme.md', { scrollTo: false, animate: false }).then((status, data) => {
 				this.getFileInfo()
 				this.autofocus = true
 				this.creating = false
@@ -134,11 +134,18 @@ export default {
 	#rich-workspace {
 		padding: 0 60px;
 		min-height: 90px;
+		/* Slightly reduce vertical space */
+		margin-bottom: -24px;
 		text-align: left;
 	}
 
+	/* For subfolders, where there are no Recommendations */
+	#rich-workspace:only-child {
+		margin-bottom: 0;
+	}
+
 	.empty-workspace {
-		margin-top: 54px;
+		padding-top: 43px;
 		color: var(--color-text-maxcontrast);
 		height: 0;
 	}
@@ -165,6 +172,12 @@ export default {
 		margin: 0;
 	}
 
+	#rich-workspace::v-deep .menubar {
+		z-index: 50;
+		/* Slightly reduce vertical space */
+		margin-bottom: -10px;
+	}
+
 	#rich-workspace::v-deep .menubar .menubar-icons {
 		margin-left: 0;
 	}