Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CP Staging] Fix: align badge in workspace list #40599

Merged
merged 6 commits into from
Apr 21, 2024
Merged

[CP Staging] Fix: align badge in workspace list #40599

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57c59e8
Fix: align badge in workspace list
dragnoir Apr 19, 2024
2b4e55a
make values base4
dragnoir Apr 19, 2024
8bdb014
fix typo
dragnoir Apr 20, 2024
2e52103
ts fix
dragnoir Apr 20, 2024
db8c442
fix margin
dragnoir Apr 21, 2024
24db85d
fix spacing
dragnoir Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspacesListPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
{translate('workspace.common.workspaceType')}
</Text>
</View>
<View style={[styles.ml10, styles.mr2]} />
<View style={[styles.WorkspaceRightColumn, styles.mr2]} />
</View>
);
}, [isLessThanMediumScreen, styles, translate]);
Expand Down
20 changes: 17 additions & 3 deletions src/pages/workspace/WorkspacesListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ function WorkspacesListRow({
</>
)}
</View>
<View style={[styles.flexRow, isWide && !isJoinRequestPending && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
<View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
<Icon
src={workspaceTypeIcon(workspaceType)}
width={variables.workspaceTypeIconWidth}
Expand All @@ -206,7 +206,18 @@ function WorkspacesListRow({
</View>
<View style={[isNarrow && styles.mr5]}>
{isJoinRequestPending && (
<View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, styles.mln6, styles.pr4]}>
<View
style={[
styles.flexRow,
styles.gap2,
styles.alignItemsCenter,
styles.flex1,
styles.justifyContentEnd,
styles.mln6,
!isNarrow && styles.pr4,
isNarrow && styles.workspaceListBadge,
]}
>
<Badge
text={translate('workspace.common.requested')}
textStyles={styles.textStrong}
Expand All @@ -220,7 +231,10 @@ function WorkspacesListRow({
<View style={[styles.flexRow, styles.flex0, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
<BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
</View>
<View ref={threeDotsMenuContainerRef}>
<View
ref={threeDotsMenuContainerRef}
style={[styles.workspaceThreeDotMenu]}
>
<ThreeDotsMenu
onIconPress={() => {
if (isSmallScreenWidth) {
Expand Down
14 changes: 14 additions & 0 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3207,6 +3207,20 @@ const styles = (theme: ThemeColors) =>
marginLeft: 3,
},

WorkspaceRightColumn: {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
WorkspaceRightColumn: {
workspaceRightColumn: {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

solved.

marginLeft: 100,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you show me exactly what this looks like? I don't understand why we are hard coding so much margin. Does that mean we have 100px of space that can only be occupied by margin? How does that work when the viewport is bigger or smaller? It just feels like these hard coded margins are a hack and don't provide good responsiveness.

},

workspaceThreeDotMenu: {
marginLeft: 60,
},

workspaceListBadge: {
flexDirection: 'column',
justifyContent: 'flex-start',
marginTop: 6,
},

autoGrowHeightMultilineInput: {
maxHeight: 115,
},
Expand Down
Loading