Merge remote-tracking branch 'origin/4.17'

Author: yadvr

ui/src/components/view/InfoCard.vue

@@ -772,7 +772,10 @@ export default {
     }
   },
   watch: {
-    '$route.fullPath': function () {
+    '$route.fullPath': function (path) {
+      if (path === '/user/login') {
+        return
+      }
       this.getIcons()
     },
     resource: {

ui/src/views/infra/network/IpRangesTabGuest.vue

@@ -80,7 +80,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"

ui/src/views/infra/network/IpRangesTabManagement.vue

@@ -53,7 +53,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"

ui/src/views/infra/network/IpRangesTabPublic.vue

@@ -91,7 +91,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"

ui/src/views/infra/network/IpRangesTabStorage.vue

@@ -50,7 +50,6 @@
     <a-pagination
       class="row-element pagination"
       size="small"
-      style="overflow-y: auto"
       :current="page"
       :pageSize="pageSize"
       :total="total"