Merge pull request #909 from owncloud/fix-accounts-scroll

owncloud · Nov 20, 2020 · 4bf0faf · 4bf0faf
2 parents 0ea04c0 + 40449ac
commit 4bf0faf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 34 deletions.
diff --git a/accounts/go.sum b/accounts/go.sum
@@ -487,13 +487,15 @@ github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPX
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=

diff --git a/accounts/pkg/assets/embed.go b/accounts/pkg/assets/embed.go
diff --git a/accounts/ui/components/App.vue b/accounts/ui/components/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="uk-flex uk-flex-column" id="accounts-app">
+    <div class="uk-flex uk-flex-column uk-height-1-1" id="accounts-app">
       <template v-if="isInitialized">
         <div class="oc-app-bar">
           <accounts-batch-actions
@@ -10,7 +10,7 @@
           />
           <accounts-create v-else />
         </div>
-        <oc-grid class="uk-height-1-1 uk-flex-1 uk-overflow-auto">
+        <oc-grid class="uk-flex-1 uk-overflow-auto">
           <div class="uk-width-expand">
             <accounts-list :accounts="accounts" />
           </div>

diff --git a/changelog/unreleased/accounts-list-scroll.md b/changelog/unreleased/accounts-list-scroll.md
@@ -0,0 +1,7 @@
+Bugfix: Enable scrolling in accounts list
+
+Tags: accounts
+
+We've fixed the accounts list to enable scrolling.
+
+https://github.com/owncloud/ocis/pull/909