fixup! More small improvements (e.g. dashboard, user status dialog)

nextcloud · Mar 30, 2022 · f5b6ef9 · f5b6ef9
1 parent 920a56c
commit f5b6ef9
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 36 deletions.
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
@@ -1686,7 +1686,9 @@
 				td.append(
 					'<input id="select-' + this.id + '-' + fileData.id +
 					'" type="checkbox" class="selectCheckBox checkbox"/><label for="select-' + this.id + '-' + fileData.id + '">' +
-					'<span class="hidden-visually">' + t('files', 'Select') + '</span>' +
+					'<span class="hidden-visually">' + (fileData.type === 'dir' ?
+						t('files', 'Select directory "{dirName}"', {dirName: name}) :
+						t('files', 'Select file "{fileName}"', {fileName: name})) + '</span>' +
 					'</label>'
 				);
 

diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss
@@ -554,6 +554,9 @@ table.nostyle {
 .social-button {
 	padding-left: 0 !important;
 	margin-left: -10px;
+	a {
+		display: inline-block;
+	}
 
 	img {
 		padding: 10px;

diff --git a/core/css/apps.scss b/core/css/apps.scss
@@ -160,12 +160,9 @@ kbd {
 				}
 			}
 			a:focus-visible {
-				border: 2px solid var(--color-primary);
 				border-radius: var(--border-radius);
+				box-shadow: var(--color-primary) inset 0 0 0 2px;
 				outline: none;
-				background-position: 12px center;
-				line-height: 40px;
-				padding: 0 10px 0 12px;
 			}
 			&.active,
 			a:active,

diff --git a/core/css/header.scss b/core/css/header.scss
@@ -21,9 +21,9 @@
 	-moz-user-select: none;
 	-ms-user-select: none;
 	a:focus-visible, button:focus-visible, div[role="button"]:focus-visible {
-		border: 2px solid var(--color-primary-text);
+		box-shadow: inset 0 0 0 2px var(--color-primary-text);
 		border-radius: var(--border-radius);
-		margin: 0;
+		outline: none;
 	}
 }
 
@@ -150,10 +150,8 @@
 						background-color: var(--color-primary-light);
 					}
 					&:focus-visible {
-						padding: 8px 10px;
-						margin: 2px;
-						width: calc(100% - 4px);
-						height: $header-menu-entry-height - 4px !important;
+						box-shadow: inset 0 0 0 2px var(--color-primary);
+						outline: none;
 					}
 					span {
 						display: inline-block;
@@ -254,8 +252,6 @@
 
 				&:focus-visible {
 					outline: none;
-					margin: 0;
-					margin-top: 1px;
 				}
 			}
 		}
@@ -469,9 +465,6 @@ nav[role='navigation'] {
 			letter-spacing: -0.5px;
 			font-size: 12px;
 			margin: 2px;
-			&:focus-visible {
-			  height: 43px;
-			}
 		}
 
 		/* focused app visual feedback */

diff --git a/core/css/inputs.scss b/core/css/inputs.scss
@@ -70,16 +70,16 @@ div[contenteditable=true],
 			background-color: var(--color-main-background);
 			color: var(--color-text-light);
 		}
+		&:focus-visible {
+			box-shadow: 0 0 0 2px var(--color-primary);
+		}
 	}
 	&:disabled {
 		background-color: var(--color-background-dark);
 		color: var(--color-text-maxcontrast);
 		cursor: default;
 		opacity: 0.5;
 	}
-	&:focus-visible {
-		border-width: 2px;
-	}
 	&:required {
 		box-shadow: none;
 	}

diff --git a/core/src/components/HeaderMenu.vue b/core/src/components/HeaderMenu.vue
@@ -188,9 +188,8 @@ export default {
 		opacity: 1;
 	}
 
-	&__trigger:focus-active {
+	&__trigger:focus-visible {
 		outline: none;
-		margin-top: 1px !important;
 	}
 
 	&__wrapper {

diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/dashboard-main.js b/dist/dashboard-main.js
diff --git a/dist/dashboard-main.js.map b/dist/dashboard-main.js.map
diff --git a/dist/user_status-menu.js b/dist/user_status-menu.js
diff --git a/dist/user_status-menu.js.map b/dist/user_status-menu.js.map