Merge pull request #5195 from nextcloud-libraries/chore/noid/merge-ma…

…ster-next [next] chore(master): merge `master` into `next`
nextcloud-libraries · Jan 31, 2024 · e9a1a98 · e9a1a98
2 parents 9116758 + 6cb1bef
commit e9a1a98
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml
@@ -25,7 +25,7 @@ jobs:
       src: ${{ steps.changes.outputs.src}}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
         id: changes
         continue-on-error: true
         with:

diff --git a/.github/workflows/node-test.yml b/.github/workflows/node-test.yml
@@ -23,7 +23,7 @@ jobs:
       src: ${{ steps.changes.outputs.src}}
 
     steps:
-      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
+      - uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
         id: changes
         continue-on-error: true
         with:
@@ -80,7 +80,7 @@ jobs:
         run: npm run test:coverage --if-present
 
       - name: Collect coverage
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
         with:
           files: ./coverage/lcov.info
 

diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -54,9 +54,16 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      - name: Set up Github Package Registry ${{ steps.versions.outputs.nodeVersion }}
+        uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
+        with:
+          node-version: ${{ steps.versions.outputs.nodeVersion }}
+          registry-url: https://npm.pkg.github.com/
+          scope: nextcloud-libraries
+
       - name: Publish package on Github Package Registry
         run: |
-          npm config set //npm.pkg.github.com/:_authToken=$NODE_AUTH_TOKEN
+          npm config set registry=https://npm.pkg.github.com/
           npm publish --tag $RELEASE_GROUP
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -97,6 +97,7 @@ All notable changes to this project will be documented in this file.
 * feat: Implement widget flag for requesting interactive view by @juliushaertl in /~https://github.com/nextcloud-libraries/nextcloud-vue/pull/5144
 * feat(NcListItem): introduce 'details' slot by @Antreesy in /~https://github.com/nextcloud-libraries/nextcloud-vue/pull/5146
 * feat(NcNoteCard): provide a slot for inserting a custom icon instead of default by @Antreesy in /~https://github.com/nextcloud-libraries/nextcloud-vue/pull/4894
+* feat(NcActionButton): support boolean value for radio type by @ShGKme in /~https://github.com/nextcloud-libraries/nextcloud-vue/pull/5134
 
 ### 🐛 Fixed bugs
 * fix(NcActions): keyboard navigation by @ShGKme in /~https://github.com/nextcloud-libraries/nextcloud-vue/pull/5153

diff --git a/l10n/es.pot b/l10n/es.pot
@@ -118,6 +118,9 @@ msgstr "Confirmar cambios"
 msgid "Custom"
 msgstr "Personalizado"
 
+msgid "Dark skin tone"
+msgstr "Tono de piel obscuro"
+
 #. TRANSLATORS: A color name for RGB(136, 85, 168)
 msgid "Deluge"
 msgstr "Diluvio"
@@ -181,13 +184,25 @@ msgstr "invisible"
 msgid "Keyboard navigation help"
 msgstr "Ayuda de navegación del teclado"
 
+msgid "Light skin tone"
+msgstr "Tono de piel claro"
+
 msgid "Load more \"{options}\""
 msgstr "Cargar más \"{options}\""
 
 #. TRANSLATORS: A color name for RGB(45, 115, 190)
 msgid "Mariner"
 msgstr "Marinero"
 
+msgid "Medium dark skin tone"
+msgstr "Tono de piel medio oscuro"
+
+msgid "Medium light skin tone"
+msgstr "Tono de piel medio claro"
+
+msgid "Medium skin tone"
+msgstr "Tono de piel medio"
+
 msgid "Message limit of {count} characters reached"
 msgstr "Se ha alcanzado el límite de {count} caracteres en el mensaje"
 
@@ -197,6 +212,9 @@ msgstr "Más ítems ..."
 msgid "More options"
 msgstr "Más opciones"
 
+msgid "Neutral skin color"
+msgstr "Color de piel neutral"
+
 msgid "Next"
 msgstr "Siguiente"
 
@@ -225,9 +243,6 @@ msgstr "Olivino"
 msgid "online"
 msgstr "en línea"
 
-msgid "Open contact menu"
-msgstr "Abrir menú de contactos"
-
 msgid "Open link to \"{resourceName}\""
 msgstr "Abrir enlace a \"{resourceName}\""
 
@@ -334,6 +349,9 @@ msgstr "Navegación de ajustes"
 msgid "Show password"
 msgstr "Mostrar contraseña"
 
+msgid "Skin tone"
+msgstr "Tono de piel"
+
 msgid "Skip to app navigation"
 msgstr "Saltar a la navegación de apps"
 

diff --git a/src/assets/NcAppNavigationItem.scss b/src/assets/NcAppNavigationItem.scss
@@ -34,7 +34,7 @@
 		}
 
 		// overwrite active text color
-		.app-navigation-entry-link {
+		.app-navigation-entry-link, .app-navigation-entry-button {
 			color: var(--color-primary-element-text) !important;
 		}
 	}
@@ -68,12 +68,14 @@
 		display: none;
 	}
 
-	&:not(.app-navigation-entry--editing) .app-navigation-entry-link {
-		padding-right: $icon-margin;
+	&:not(.app-navigation-entry--editing) {
+		.app-navigation-entry-link, .app-navigation-entry-button {
+			padding-right: $icon-margin;
+		}
 	}
 
 	// Main entry link
-	.app-navigation-entry-link {
+	.app-navigation-entry-link, .app-navigation-entry-button {
 		z-index: 100; /* above the bullet to allow click*/
 		display: flex;
 		overflow: hidden;