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.

Sign up for GitHub

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

Jump to bottom

[full-ci] Introduce nav tags #6540

Merged
merged 4 commits into from
Mar 9, 2022
Merged

[full-ci] Introduce nav tags #6540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
711e93d
Added tag to left sidebar
Mar 7, 2022
13ef611
Bump ods
Mar 8, 2022
bbf0e26
Mark submit buttons as such explicitly as we changed the default butt…
dschmidt Mar 9, 2022
22df1d6
Rebase & fix snapshots
pascalwengerter Mar 9, 2022
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
8 changes: 8 additions & 0 deletions changelog/unreleased/bugfix-enter-in-forms
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Bugfix: Pressing enter in forms

We fixed behavior when pressing enter in forms. For instance when adding or editing public links
pressing enter in the name or password input fields, instead of saving the link it opened the datepicker.


https://github.com/owncloud/web/pull/6548
https://github.com/owncloud/owncloud-design-system/pull/2009
6 changes: 6 additions & 0 deletions changelog/unreleased/enhancement-sidebar-nav-tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: Side bar nav tags

We have implemented a way to show a tag next to the sidebar navigation item link text

https://github.com/owncloud/web/pull/6540
https://github.com/owncloud/web/issues/6259
11 changes: 11 additions & 0 deletions changelog/unreleased/enhancement-update-ods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Enhancement: Update ODS to v13.0.0-rc.1

We updated the ownCloud Design System to version 13.0.0-rc.1. Please refer to the full changelog in the ODS release (linked) for more details. Summary:

- Change - Default type of OcButton: https//github.com/owncloud/owncloud-design-system/pull/2009
- Enhancement - Apply size property to oc-card: https//github.com/owncloud/owncloud-design-system/pull/2011
- Bugfix - Disabled OcSelect background: https//github.com/owncloud/owncloud-design-system/pull/2008
- Bugfix - Icons/Thumbnails were only visible for clickable resources: https//github.com/owncloud/owncloud-design-system/pull/2007

https://github.com/owncloud/web/pull/6540
https://github.com/owncloud/owncloud-design-system/releases/tag/v13.0.0-rc.1
2 changes: 2 additions & 0 deletions packages/web-app-files/src/components/SideBar/Links/PublicLinks/LinkEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
:disabled="!$_isValid"
variation="primary"
appearance="filled"
submit="submit"
@click="$_addLink"
>
<translate>Create</translate>
Expand All @@ -146,6 +147,7 @@
:disabled="!$_isValid || !$_hasChanges"
variation="primary"
appearance="filled"
submit="submit"
@click="$_updateLink"
>
<translate>Save</translate>
Expand Down
1 change: 1 addition & 0 deletions ...web-app-files/src/components/SideBar/Shares/InviteCollaborator/InviteCollaboratorForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
:disabled="!$_isValid"
variation="primary"
appearance="filled"
submit="submit"
@click="share"
v-text="$gettext('Share')"
/>
Expand Down
1 change: 1 addition & 0 deletions packages/web-app-files/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ const navItems = [
{
name: $gettext('Spaces'),
icon: 'layout-grid',
tag: $gettext('beta'),
route: {
path: `/${appInfo.id}/spaces/projects`
},
Expand Down
1 change: 1 addition & 0 deletions packages/web-app-files/src/views/PublicLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
appearance="filled"
class="oc-login-authorize-button"
:disabled="!password"
submit="submit"
>
<translate>Continue</translate>
</oc-button>
Expand Down
14 changes: 7 additions & 7 deletions ...es/web-app-files/tests/unit/components/AppBar/__snapshots__/SharesNavigation.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@ exports[`SharesNavigation component renders a shares navigation for both mobile
<nav id="shares-navigation" aria-label="Shares pages navigation" class="oc-py-s">
<ul class="oc-list oc-my-rm oc-mx-rm oc-flex oc-visible@s">
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-me/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared with me</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-me/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared with me</span></oc-button-stub>
</li>
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-others/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared with others</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-others/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared with others</span></oc-button-stub>
</li>
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/via-link/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared via link</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/via-link/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class="oc-mr-s"><span>Shared via link</span></oc-button-stub>
</li>
</ul>
<div class="oc-hidden@s">
<oc-button-stub type="button" size="medium" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" id="shares_navigation_mobile">Shares pages</oc-button-stub>
<oc-button-stub type="button" size="medium" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" id="shares_navigation_mobile">Shares pages</oc-button-stub>
<div id="oc-drop-3" class="oc-drop oc-box-shadow-medium oc-rounded">
<div class="oc-card oc-card-body oc-rounded oc-background-secondary oc-p-s">
<ul class="oc-list oc-my-rm oc-mx-rm">
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-me/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared with me</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-me/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared with me</span></oc-button-stub>
</li>
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-others/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared with others</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/with-others/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared with others</span></oc-button-stub>
</li>
<li>
<oc-button-stub type="router-link" size="medium" to="/files/shares/via-link/" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared via link</span></oc-button-stub>
<oc-button-stub type="router-link" size="medium" to="/files/shares/via-link/" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium"><span>Shared via link</span></oc-button-stub>
</li>
</ul>
</div>
Expand Down
Loading