Merge branch 'next' into anna/next

Cookiezaurs · web-flow · commit dda76137a93b · 2024-10-03T17:15:57.000+03:00
diff --git a/frontend/express/public/javascripts/countly/vue/components/date.js b/frontend/express/public/javascripts/countly/vue/components/date.js
@@ -936,7 +936,7 @@
             },
             customStyle: function() {
                 return {
-                    height: (this.isVisible && (this.customRangeSelection || this.presetSelection)) ? "447px" : "auto",
+                    height: (this.isVisible && this.presetSelection) ? "447px" : "auto"
                 };
             }
         },

Original file line number	Diff line number	Diff line change
`@@ -936,7 +936,7 @@`
`936`	`936`	`},`
`937`	`937`	`customStyle: function() {`
`938`	`938`	`return {`
`939`		`- height: (this.isVisible && (this.customRangeSelection \|\| this.presetSelection)) ? "447px" : "auto",`
	`939`	`+ height: (this.isVisible && this.presetSelection) ? "447px" : "auto"`
`940`	`940`	`};`
`941`	`941`	`}`
`942`	`942`	`},`