Skip to content

Commit e9a1a98

Browse files
authored
Merge pull request #5195 from nextcloud-libraries/chore/noid/merge-master-next
[next] chore(master): merge `master` into `next`
2 parents 9116758 + 6cb1bef commit e9a1a98

File tree

6 files changed

+39
-11
lines changed

6 files changed

+39
-11
lines changed

.github/workflows/lint-eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
src: ${{ steps.changes.outputs.src}}
2626

2727
steps:
28-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
28+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2929
id: changes
3030
continue-on-error: true
3131
with:

.github/workflows/node-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
src: ${{ steps.changes.outputs.src}}
2424

2525
steps:
26-
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
26+
- uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
2727
id: changes
2828
continue-on-error: true
2929
with:
@@ -80,7 +80,7 @@ jobs:
8080
run: npm run test:coverage --if-present
8181

8282
- name: Collect coverage
83-
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
83+
uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
8484
with:
8585
files: ./coverage/lcov.info
8686

.github/workflows/npm-publish.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,16 @@ jobs:
5454
env:
5555
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5656

57+
- name: Set up Github Package Registry ${{ steps.versions.outputs.nodeVersion }}
58+
uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8 # v3
59+
with:
60+
node-version: ${{ steps.versions.outputs.nodeVersion }}
61+
registry-url: https://npm.pkg.github.com/
62+
scope: nextcloud-libraries
63+
5764
- name: Publish package on Github Package Registry
5865
run: |
59-
npm config set //npm.pkg.github.com/:_authToken=$NODE_AUTH_TOKEN
66+
npm config set registry=https://npm.pkg.github.com/
6067
npm publish --tag $RELEASE_GROUP
6168
env:
6269
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ All notable changes to this project will be documented in this file.
9797
* feat: Implement widget flag for requesting interactive view by @juliushaertl in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5144
9898
* feat(NcListItem): introduce 'details' slot by @Antreesy in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5146
9999
* 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
100+
* feat(NcActionButton): support boolean value for radio type by @ShGKme in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5134
100101

101102
### 🐛 Fixed bugs
102103
* fix(NcActions): keyboard navigation by @ShGKme in https://github.com/nextcloud-libraries/nextcloud-vue/pull/5153

l10n/es.pot

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ msgstr "Confirmar cambios"
118118
msgid "Custom"
119119
msgstr "Personalizado"
120120

121+
msgid "Dark skin tone"
122+
msgstr "Tono de piel obscuro"
123+
121124
#. TRANSLATORS: A color name for RGB(136, 85, 168)
122125
msgid "Deluge"
123126
msgstr "Diluvio"
@@ -181,13 +184,25 @@ msgstr "invisible"
181184
msgid "Keyboard navigation help"
182185
msgstr "Ayuda de navegación del teclado"
183186

187+
msgid "Light skin tone"
188+
msgstr "Tono de piel claro"
189+
184190
msgid "Load more \"{options}\""
185191
msgstr "Cargar más \"{options}\""
186192

187193
#. TRANSLATORS: A color name for RGB(45, 115, 190)
188194
msgid "Mariner"
189195
msgstr "Marinero"
190196

197+
msgid "Medium dark skin tone"
198+
msgstr "Tono de piel medio oscuro"
199+
200+
msgid "Medium light skin tone"
201+
msgstr "Tono de piel medio claro"
202+
203+
msgid "Medium skin tone"
204+
msgstr "Tono de piel medio"
205+
191206
msgid "Message limit of {count} characters reached"
192207
msgstr "Se ha alcanzado el límite de {count} caracteres en el mensaje"
193208

@@ -197,6 +212,9 @@ msgstr "Más ítems ..."
197212
msgid "More options"
198213
msgstr "Más opciones"
199214

215+
msgid "Neutral skin color"
216+
msgstr "Color de piel neutral"
217+
200218
msgid "Next"
201219
msgstr "Siguiente"
202220

@@ -225,9 +243,6 @@ msgstr "Olivino"
225243
msgid "online"
226244
msgstr "en línea"
227245

228-
msgid "Open contact menu"
229-
msgstr "Abrir menú de contactos"
230-
231246
msgid "Open link to \"{resourceName}\""
232247
msgstr "Abrir enlace a \"{resourceName}\""
233248

@@ -334,6 +349,9 @@ msgstr "Navegación de ajustes"
334349
msgid "Show password"
335350
msgstr "Mostrar contraseña"
336351

352+
msgid "Skin tone"
353+
msgstr "Tono de piel"
354+
337355
msgid "Skip to app navigation"
338356
msgstr "Saltar a la navegación de apps"
339357

src/assets/NcAppNavigationItem.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535

3636
// overwrite active text color
37-
.app-navigation-entry-link {
37+
.app-navigation-entry-link, .app-navigation-entry-button {
3838
color: var(--color-primary-element-text) !important;
3939
}
4040
}
@@ -68,12 +68,14 @@
6868
display: none;
6969
}
7070

71-
&:not(.app-navigation-entry--editing) .app-navigation-entry-link {
72-
padding-right: $icon-margin;
71+
&:not(.app-navigation-entry--editing) {
72+
.app-navigation-entry-link, .app-navigation-entry-button {
73+
padding-right: $icon-margin;
74+
}
7375
}
7476

7577
// Main entry link
76-
.app-navigation-entry-link {
78+
.app-navigation-entry-link, .app-navigation-entry-button {
7779
z-index: 100; /* above the bullet to allow click*/
7880
display: flex;
7981
overflow: hidden;

0 commit comments

Comments
 (0)