Merge pull request #6235 from Countly/journey+content-main

Journey+content main

Author: coskunaydinoglu

CHANGELOG.md

@@ -1,5 +1,7 @@
 
 ## Version 25.03.x
+Enterprise Features:
+- [journey_engine] Record Event block added
 
 Fixes:
 - [core] Unifying alphabetical order for dropdowns with dashboard apps

frontend/express/public/javascripts/countly/vue/components/content.js

@@ -238,6 +238,11 @@
                 type: String,
                 required: false,
                 default: '#fff'
+            },
+            toolTipLeft: {
+                type: String,
+                required: false,
+                default: 'Screens'
             }
         },
         data: function() {

frontend/express/public/javascripts/countly/vue/templates/content/content-body.html

@@ -1,17 +1,10 @@
 <div class="cly-vue-content-builder__layout-main__body" :class="{ 'bu-is-justify-content-flex-end': hideLeftSidebar, 'bu-is-justify-content-flex-start': hideRightSidebar, 'cly-vue-content-builder__layout-main__body__dashed-bg': hasDashedBackground }" :style="{'background-color': backgroundColor}">
     <transition :name="toggleTransition" @enter="onViewEntered">
-        <div v-if="!hideLeftSidebar" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
-            <template v-if="$slots['content-layout-left-sidebar-wrapper']">
-                <vue-scroll :ops="scrollOps">
-                    <slot name="content-layout-left-sidebar-wrapper"></slot>
-                </vue-scroll>
-            </template>
-        </div>
         <div v-if="!hideLeftSidebar && (collapsible && !isCollapsed)" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
             <div class="cly-vue-content-builder__layout-main__body__left-sidebar__header">
                 <div class="cly-vue-content-builder__layout-main__body__left-sidebar__header__title">
                     <h4>Screens</h4>
-                    <cly-tooltip-icon class="bu-ml-1" tooltip="Screens"></cly-tooltip-icon>
+                    <cly-tooltip-icon class="bu-ml-1" :tooltip="toolTipLeft"></cly-tooltip-icon>
                 </div>
                 <div v-if="collapsible" class="cly-vue-content-builder__layout-main__body__collapse-button" @click="collapseBar('left')">
                     <div class="cly-vue-content-builder__layout-main__body__collapse-button__icon color-warm-gray-80">
@@ -28,6 +21,13 @@ <h4>Screens</h4>
                 <i class="cly-io cly-io-arrow-sm-left"></i>
             </div>
         </div>
+        <div  v-else-if="!hideLeftSidebar" class="cly-vue-content-builder__layout-main__body__left-sidebar" :style="{ 'width': this.leftSidebarWidth + 'px !important'}">
+            <template v-if="$slots['content-layout-left-sidebar-wrapper']">
+                <vue-scroll :ops="scrollOps">
+                    <slot name="content-layout-left-sidebar-wrapper"></slot>
+                </vue-scroll>
+            </template>
+        </div>
     </transition>
     <!-- <component 
         v-if="currentTabComponent" 

frontend/express/public/stylesheets/styles/base/_colors.scss

@@ -31,6 +31,7 @@ $colors: (
     "charts-light-turquoise": #EBF9F9,
     "charts-amber": #F5C900,
     "charts-orange": #F96300,
+    "charts-light-orange": #FEEFE5,
     "charts-magenta": #F34971,
     "charts-light-magenta": #FEEDF1,
     "charts-coral": #FF9382,

frontend/express/public/stylesheets/vue/clyvue.scss

@@ -4941,6 +4941,8 @@
         width: auto;
         height: 100%;
         object-fit: contain;
+        max-width: 100%; // image won't exceed the width of its container
+        max-height: 100%; //
     }
 }