Skip to content

Commit

Permalink
Merge pull request #6540 from owncloud/nav-tags
Browse files Browse the repository at this point in the history
[full-ci] Introduce nav tags
  • Loading branch information
Pascal Wengerter authored Mar 9, 2022
2 parents 3367cac + 22df1d6 commit 3f3340c
Show file tree
Hide file tree
Showing 28 changed files with 196 additions and 144 deletions.
8 changes: 8 additions & 0 deletions changelog/unreleased/bugfix-enter-in-forms
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
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
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
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
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
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
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
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

0 comments on commit 3f3340c

Please sign in to comment.