From 48a1ad68f761aa5b1a5c19c510bd1cfa55d65330 Mon Sep 17 00:00:00 2001
From: elraphty <elraphtyofficial@gmail.com>
Date: Fri, 24 May 2024 10:09:55 +0100
Subject: [PATCH] fix row design

---
 .github/workflows/build_on_master_merge.yml |  2 +-
 src/pages/tickets/style.ts                  | 25 +++++++++++++++++----
 src/people/widgetViews/WorkspaceFeature.tsx | 10 ++++-----
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_on_master_merge.yml b/.github/workflows/build_on_master_merge.yml
index 6ef27ea7..ef235111 100644
--- a/.github/workflows/build_on_master_merge.yml
+++ b/.github/workflows/build_on_master_merge.yml
@@ -4,7 +4,7 @@ env:
 
 on:
   push:
-    branch:
+    branches:
       - master
 
 # https://docs.github.com/en/actions/learn-github-actions/expressions
diff --git a/src/pages/tickets/style.ts b/src/pages/tickets/style.ts
index 30482e87..7ead20ba 100644
--- a/src/pages/tickets/style.ts
+++ b/src/pages/tickets/style.ts
@@ -56,14 +56,31 @@ export const HeaderWrap = styled.div`
 
 export const DataWrap = styled.div`
   display: flex;
-  width: 100%;
   justify-content: space-between;
   padding: 40px 50px;
-  display: flex;
-  width: 58%;
+  width: 60%;
   margin: 0 auto;
+  align-items: left;
+  justify-content: center;
+
+  @media only screen and (max-width: 900px) {
+    width: 90%;
+    padding: 30px 40px;
+  }
+
+  @media only screen and (max-width: 500px) {
+    width: 90%;
+    padding: 20px 10px;
+  }
+`;
+
+export const FeatureDataWrap = styled.div`
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
+  justify-content: space-between;
+  padding: 40px 50px;
+  width: 60%;
+  margin: 0 auto;
   align-items: left;
   justify-content: center;
 
diff --git a/src/people/widgetViews/WorkspaceFeature.tsx b/src/people/widgetViews/WorkspaceFeature.tsx
index 2ee18ee7..b9211198 100644
--- a/src/people/widgetViews/WorkspaceFeature.tsx
+++ b/src/people/widgetViews/WorkspaceFeature.tsx
@@ -2,7 +2,7 @@ import { EuiGlobalToastList, EuiLoadingSpinner } from '@elastic/eui';
 import {
   Body,
   FeatureBody,
-  DataWrap,
+  FeatureDataWrap,
   FieldWrap,
   Label,
   Data,
@@ -230,18 +230,16 @@ const UserStoryModal: React.FC<UserStoryModalProps> = ({
               <ButtonGroup>
                 <StoryButtonWrap>
                   <ActionButton
-                    borderRadius="50px"
                     data-testid="user-story-save-btn"
                     onClick={() => handleSave(inputValue)}
                   >
                     Save
                   </ActionButton>
-                  <ActionButton borderRadius="50px" color="cancel" onClick={handleClose}>
+                  <ActionButton color="cancel" onClick={handleClose}>
                     Cancel
                   </ActionButton>
                 </StoryButtonWrap>
                 <ActionButton
-                  borderRadius="50px"
                   data-testid="user-story-delete-btn"
                   marginTop="30px"
                   color="cancel"
@@ -432,7 +430,7 @@ const WorkspaceFeature: React.FC = () => {
           <WorkspaceName>{featureData?.name}</WorkspaceName>
         </HeadNameWrap>
       </FeatureHeadWrap>
-      <DataWrap>
+      <FeatureDataWrap>
         <FieldWrap>
           <Label>User Stories</Label>
           <Data>
@@ -525,7 +523,7 @@ const WorkspaceFeature: React.FC = () => {
           onSubmit={() => submitField('architecture', architecture, setEditArchitecture)}
           main={main}
         />
-      </DataWrap>
+      </FeatureDataWrap>
       {toastsEl}
       <UserStoryModal
         open={modalOpen}