Merge branch 'hint-develop-merged' of github.com:bluewave-labs/bluewa…

…ve-onboarding into hint-develop-merged
bluewave-labs · Dec 18, 2024 · b785608 · b785608
2 parents 537b53f + 566e291
commit b785608
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/frontend/src/components/DropdownList/DropdownList.jsx b/frontend/src/components/DropdownList/DropdownList.jsx
@@ -48,6 +48,7 @@ const DropdownList = ({
       value={selectedAction}
       onChange={handleChange}
       className={`select ${className}`}
+      sx={{marginTop: 1 }}
     >
       {actions.length > 0 ? (
         actions.map((action, index) => (

diff --git a/frontend/src/products/Popup/PopupComponent.jsx b/frontend/src/products/Popup/PopupComponent.jsx
@@ -73,7 +73,7 @@ const PopupComponent = ({
                 style={{
                   backgroundColor: buttonBackgroundColor,
                   color: buttonTextColor,
-                  margin: "1rem",
+                  marginRight: "1rem",
                 }}
                 text={previewBtnText}
                 onClick={handleButtonClick} // Add onClick handler

diff --git a/...c/scenes/banner/BannerPageComponents/BannerLeftAppearance/BannerLeftApperance.module.scss b/...c/scenes/banner/BannerPageComponents/BannerLeftAppearance/BannerLeftApperance.module.scss
@@ -8,6 +8,7 @@
     h2{
         @include text-style(regular);
         margin-top: 1.5rem;
+        margin-bottom: 10px;
     }
     .color{
         display: flex;

diff --git a/frontend/src/scenes/banner/BannerPageComponents/BannerLeftContent/BannerLeftContent.jsx b/frontend/src/scenes/banner/BannerPageComponents/BannerLeftContent/BannerLeftContent.jsx
@@ -39,7 +39,7 @@ const BannerLeftContent = ({
         onActionChange={handleActionChange}
         selectedActionString={buttonAction}
       />
-      <h2>Position</h2>
+      <h2 style={{ marginBottom: '10px'}}>Position</h2>
       <div className={styles.radioContent}>
         <RadioButton
           label='Top (centered)'
@@ -55,14 +55,14 @@ const BannerLeftContent = ({
         />
       </div>
 
-      <h2 style={{ marginBottom: 0, marginTop: "1.2rem" }}>URL</h2>
+      <h2>URL</h2>
       <CustomTextField
         TextFieldWidth='241px'
         value={url}
         onChange={handleSetUrl}
       />
 
-      <h2 style={{ marginBottom: 0, marginTop: "1.2rem" }}>Action URL</h2>
+      <h2>Action URL</h2>
       <CustomTextField
         TextFieldWidth='241px'
         value={actionUrl}

diff --git a/...nd/src/scenes/banner/BannerPageComponents/BannerLeftContent/BannerLeftContent.module.scss b/...nd/src/scenes/banner/BannerPageComponents/BannerLeftContent/BannerLeftContent.module.scss
@@ -8,6 +8,7 @@
     h2{
         @include text-style(regular);
         margin-top: 1.5rem;
+        margin-bottom: 0;
     }
     h3{
         @include text-style(regular);

diff --git a/frontend/src/scenes/popup/PopupPageComponents/PopupAppearance/PopupAppearance.jsx b/frontend/src/scenes/popup/PopupPageComponents/PopupAppearance/PopupAppearance.jsx
@@ -20,7 +20,7 @@ const PopupAppearance = ({ data = [], setPopupSize, popupSize }) => {
                     </div>
                 </div>
             ))}
-            <h2 style={{ marginBottom: '1rem' }}>Popup Size</h2>
+            <h2 style={{ marginBottom: 0 }}>Popup Size</h2>
             <DropdownList
                 actions={['Small', 'Medium', 'Large']}
                 onActionChange={handleActionChange}