Merge pull request #2524 from nextcloud/fix-db-selection

Fix db selection design and fix #2511
nextcloud · Dec 6, 2016 · b190153 · b190153
2 parents 5326985 + 0abcba2
commit b190153
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/core/css/inputs.css b/core/css/inputs.css
@@ -351,24 +351,24 @@ select:hover {
 
 /* jQuery UI fixes */
 .ui-menu {
-	padding: 0 !important;
+	padding: 0;
 }
 .ui-menu .ui-menu-item a.ui-state-focus, .ui-menu .ui-menu-item a.ui-state-active {
-    font-weight: inherit !important;
-    margin: 0 !important;
+    font-weight: inherit;
+    margin: 0;
 }
 .ui-widget-content {
-	background: #fff !important;
-	border-top: none !important;
+	background: #fff;
+	border-top: none;
 }
 .ui-corner-all {
-	border-radius: 0 !important;
-	border-bottom-left-radius: 3px !important;
-	border-bottom-right-radius: 3px !important;
+	border-radius: 0;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
 }
 .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: none !important;
-    background: #f8f8f8 !important;
+    border: none;
+    background: #f8f8f8;
 }
 
 

diff --git a/core/css/styles.css b/core/css/styles.css
@@ -473,16 +473,31 @@ label.infield {
 }
 
 /* Database selector */
-#body-login form #selectDbType { text-align:center; white-space: nowrap; }
+#body-login form #selectDbType {
+	text-align:center;
+	white-space: nowrap; 
+	margin: 0;
+}
 #body-login form #selectDbType .info {
 	white-space: normal;
 }
 #body-login form #selectDbType label {
-	position:static; margin:0 -3px 5px; padding:.4em;
-	font-size:12px; background:#f8f8f8; color:#888; cursor:pointer;
+	position: static;
+	margin: 0 -3px 5px;
+	font-size: 12px;
+	background:#f8f8f8;
+	color:#888;
+	cursor:pointer;
 	border: 1px solid #ddd;
 }
-#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
+#body-login form #selectDbType label span {
+	cursor: pointer;
+	padding: 10px 20px;
+}
+#body-login form #selectDbType label.ui-state-hover,
+#body-login form #selectDbType label.ui-state-active {
+	color:#000;
+	background-color:#e8e8e8; }
 
 
 /* Warnings and errors are the same */