Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[next] chore(master): merge master into next #5193

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint-eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,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
Expand Down
24 changes: 21 additions & 3 deletions l10n/es.pot
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand All @@ -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"

Expand Down Expand Up @@ -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}\""

Expand Down Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions src/assets/NcAppNavigationItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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;
Expand Down
Loading