Merge pull request #5626 from Countly/anna/next

Cookiezaurs · web-flow · commit cac746b7b5cd · 2024-10-03T13:52:30.000+03:00
Anna/next
diff --git a/frontend/express/public/javascripts/countly/vue/components/date.js b/frontend/express/public/javascripts/countly/vue/components/date.js
@@ -929,7 +929,7 @@
                     var lengthStr = this.rangeLimits.maxLength[0] + ' ' + CV.i18n('common.buckets.' + this.rangeLimits.maxLength[1]);
                     return {'maxLength': CV.i18n('common.range-length-limit', lengthStr)};
                 }
-                return {};
+                return "";
             },
             setMinuteAndHourStyle: function() {
                 return { display: this.tableType === 'minute' || this.tableType === 'hour' ? 'none' : '' };
diff --git a/frontend/express/public/stylesheets/vue/clyvue.scss b/frontend/express/public/stylesheets/vue/clyvue.scss
@@ -3861,6 +3861,20 @@
                 padding: 8px 14px;
             }
         }
+        .x-button {
+            border: 0;
+            box-shadow: none;
+            padding-left: 0px;
+            padding-right: 1rem;
+        }
+        .vertical-divider {
+            border-left: 1px solid #ECECEC;
+            height: 16px;
+        }
+        .cly-io-16 {
+            display: contents;
+        }
+        
     }
 
     .cly-vue-empty-home {

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@`
`929`	`929`	`var lengthStr = this.rangeLimits.maxLength[0] + ' ' + CV.i18n('common.buckets.' + this.rangeLimits.maxLength[1]);`
`930`	`930`	`return {'maxLength': CV.i18n('common.range-length-limit', lengthStr)};`
`931`	`931`	`}`
`932`		`- return {};`
	`932`	`+ return "";`
`933`	`933`	`},`
`934`	`934`	`setMinuteAndHourStyle: function() {`
`935`	`935`	`return { display: this.tableType === 'minute' \|\| this.tableType === 'hour' ? 'none' : '' };`