Skip to content

Commit

Permalink
fix row design
Browse files Browse the repository at this point in the history
  • Loading branch information
elraphty committed May 24, 2024
1 parent 6731b3e commit 48a1ad6
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_on_master_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:

on:
push:
branch:
branches:
- master

# https://docs.github.com/en/actions/learn-github-actions/expressions
Expand Down
25 changes: 21 additions & 4 deletions src/pages/tickets/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 4 additions & 6 deletions src/people/widgetViews/WorkspaceFeature.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EuiGlobalToastList, EuiLoadingSpinner } from '@elastic/eui';
import {
Body,
FeatureBody,
DataWrap,
FeatureDataWrap,
FieldWrap,
Label,
Data,
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -432,7 +430,7 @@ const WorkspaceFeature: React.FC = () => {
<WorkspaceName>{featureData?.name}</WorkspaceName>
</HeadNameWrap>
</FeatureHeadWrap>
<DataWrap>
<FeatureDataWrap>
<FieldWrap>
<Label>User Stories</Label>
<Data>
Expand Down Expand Up @@ -525,7 +523,7 @@ const WorkspaceFeature: React.FC = () => {
onSubmit={() => submitField('architecture', architecture, setEditArchitecture)}
main={main}
/>
</DataWrap>
</FeatureDataWrap>
{toastsEl}
<UserStoryModal
open={modalOpen}
Expand Down

0 comments on commit 48a1ad6

Please sign in to comment.