Merge pull request #10691 from nextcloud/various-beta14-design-fixes

Various beta14 design fixes
nextcloud · Aug 15, 2018 · f7ae477 · f7ae477
2 parents 52995a0 + 0e23193
commit f7ae477
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 26 deletions.
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
@@ -168,6 +168,7 @@
 		margin-left: auto;
 		display: flex;
 		align-items: center;
+		white-space: nowrap;
 		// can edit label
 		> .shareOption > label {
 			padding: 13px;
@@ -196,12 +197,15 @@
 	}
 	.username {
 		padding: 0 8px;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
 	}
 }
 
 .ui-autocomplete {
 	/* limit dropdown height to 4 1/2 entries */
-	max-height: 200px;
+	max-height: calc(36px * 4.5);;
 	overflow-y: auto;
 	overflow-x: hidden;
 	z-index: 1550 !important;

diff --git a/apps/theming/css/settings-admin.scss b/apps/theming/css/settings-admin.scss
@@ -26,6 +26,8 @@
         vertical-align: top;
         display: inline-block;
         visibility: hidden;
+        height: 32px;
+        width: 32px;
     }
     form.uploadButton {
         width: 411px;

diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss
@@ -173,6 +173,7 @@
 		.ui-menu-item a {
 			&.ui-state-focus, &.ui-state-active {
 				font-weight: inherit;
+				box-shadow: inset 4px 0 var(--color-primary);
 			}
 		}
 	}
@@ -184,15 +185,25 @@
 
 	&.ui-corner-all {
 		border-radius: 0;
-		border-bottom-left-radius: 3px;
-		border-bottom-right-radius: 3px;
+		border-bottom-left-radius: var(--border-radius);
+		border-bottom-right-radius: var(--border-radius);
 	}
 
-	.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+	.ui-state-hover, .ui-widget-content .ui-state-hover,
+	.ui-widget-header .ui-state-hover,
+	.ui-state-focus,
+	.ui-widget-content .ui-state-focus,
+	.ui-widget-header .ui-state-focus {
 		border: 1px solid transparent;
 		background: inherit;
 		color: var(--color-primary-element);
 	}
+
+	.ui-menu-item {
+		a {
+			border-radius: 0 !important;
+		}
+	}
 }
 
 .ui-button.primary {

diff --git a/core/css/public.scss b/core/css/public.scss
@@ -1,3 +1,5 @@
+$footer-height: 60px;
+
 #body-public {
 	.header-right {
 
@@ -36,8 +38,9 @@
 	}
 
 	#content {
-		height: initial;
-		min-height: calc(100vh - 160px);
+		// 100% - footer
+		min-height: calc(100% - #{$footer-height});
+
 	}
 
 	/** don't apply content header padding on the base layout */
@@ -64,4 +67,22 @@
 	form input[type='checkbox']+label {
 		text-align: center;
 	}
+
+	/* public footer */
+	footer {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: $footer-height;
+		p {
+			color: var(--color-text-lighter);
+			a {
+				color: var(--color-text-lighter);
+				font-weight: 600;
+				padding: 13px;
+				margin: -13px;
+			}
+		}
+	}
 }
diff --git a/core/css/styles.scss b/core/css/styles.scss
@@ -1049,25 +1049,6 @@ div.crumb {
 	}
 }
 
-/* public footer */
-
-#body-public footer {
-	position: relative;
-	text-align: center;
-	.info {
-		color: var(--color-text-lighter);
-		text-align: center;
-		margin: 0 auto;
-		padding: 20px 0;
-		a {
-			color: var(--color-text-lighter);
-			font-weight: 600;
-			padding: 13px;
-			margin: -13px;
-		}
-	}
-}
-
 /* LEGACY FIX only - do not use fieldsets for settings */
 
 fieldset {

diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
@@ -78,7 +78,7 @@
 	</div>
 	<?php if(isset($template) && $template->getFooterVisible()) { ?>
 	<footer>
-		<p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p>
+		<p><?php print_unescaped($theme->getLongFooter()); ?></p>
 	</footer>
 	<?php } ?>