Merge pull request #1782 from nextcloud/backport/1711/stable21

[stable21] Some Design fixes
nextcloud · Jul 26, 2021 · 15e21a0 · 15e21a0
2 parents fd26c1d + c2fb29c
commit 15e21a0
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 31 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/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.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/js/viewer.js b/js/viewer.js
diff --git a/js/viewer.js.map b/js/viewer.js.map
diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue
@@ -575,11 +575,12 @@ export default {
 
 	.save-status {
 		display: inline-flex;
-		align-items: center;
 		padding: 0;
-		padding-right: 12px;
 		text-overflow: ellipsis;
 		color: var(--color-text-lighter);
+		position: relative;
+		top: 10px;
+		min-width: 85px;
 
 		&.error {
 			background-color: var(--color-error);
@@ -598,7 +599,6 @@ export default {
 	}
 
 	#editor-session-list {
-		padding-right: 16px;
 		display: flex;
 
 		input, div {

diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue
@@ -331,11 +331,11 @@ export default {
 		top: 0;
 		display: flex;
 		justify-content: flex-end;
-		z-index: 10010; // above modal-header so buttons are clickable
+		z-index: 10021; // above modal-header and menububble so menubar is always on top
 		background-color: var(--color-main-background-translucent);
 		-webkit-backdrop-filter: var(--background-blur);
 		backdrop-filter: var(--background-blur);
-		height: 50px;
+		min-height: 50px; // important for mobile so that the buttons are always inside the container
 		padding-top:3px;
 		padding-bottom: 3px;
 
@@ -405,14 +405,6 @@ export default {
 				opacity: .4;
 			}
 		}
-
-		&.icon-redo {
-			margin-right: 22px;
-		}
-
-		&.icon-ul {
-			margin-left: 22px;
-		}
 	}
 
 	.menubar .submenu {