Skip to content

Commit

Permalink
Merge pull request #43627 from s77rt/popover-border-radius
Browse files Browse the repository at this point in the history
[NoQA] Change modal border radius to 16px
  • Loading branch information
shawnborton authored Jun 20, 2024
2 parents ed50007 + f4c4476 commit d2ea358
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1702,7 +1702,7 @@ const styles = (theme: ThemeColors) =>

createMenuContainer: {
width: variables.sideBarWidth - 40,
paddingVertical: 12,
paddingVertical: variables.componentBorderRadiusLarge,
},

createMenuHeaderText: {
Expand Down
16 changes: 8 additions & 8 deletions src/styles/utils/generators/ModalStyleUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
};
modalContainerStyle = {
boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)',
borderRadius: 12,
borderRadius: variables.componentBorderRadiusLarge,
overflow: 'hidden',
width: variables.sideBarWidth,
};
Expand All @@ -102,7 +102,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
flex: 1,
marginTop: isSmallScreenWidth ? 0 : 20,
marginBottom: isSmallScreenWidth ? 0 : 20,
borderRadius: isSmallScreenWidth ? 0 : 12,
borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge,
overflow: 'hidden',
...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth),
};
Expand All @@ -129,7 +129,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
flex: 1,
marginTop: isSmallScreenWidth ? 0 : 20,
marginBottom: isSmallScreenWidth ? 0 : 20,
borderRadius: isSmallScreenWidth ? 0 : 12,
borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge,
overflow: 'hidden',
...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth, true),
};
Expand All @@ -151,7 +151,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
};
modalContainerStyle = {
boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)',
borderRadius: 12,
borderRadius: variables.componentBorderRadiusLarge,
borderWidth: 0,
};

Expand All @@ -174,9 +174,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
};
modalContainerStyle = {
width: '100%',
borderTopLeftRadius: 20,
borderTopRightRadius: 20,
paddingTop: 12,
borderTopLeftRadius: variables.componentBorderRadiusLarge,
borderTopRightRadius: variables.componentBorderRadiusLarge,
paddingTop: variables.componentBorderRadiusLarge,
justifyContent: 'center',
overflow: 'hidden',
};
Expand All @@ -197,7 +197,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
},
};
modalContainerStyle = {
borderRadius: 12,
borderRadius: variables.componentBorderRadiusLarge,
borderWidth: 1,
borderColor: theme.border,
justifyContent: 'center',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const createReportActionContextMenuStyleUtils: StyleUtilGenerator<GetReportActio
getDefaultWrapperStyle(theme),

// Small screens use a bottom-docked modal that already has vertical padding.
isSmallScreenWidth ? {} : styles.pv3,
isSmallScreenWidth ? {} : styles.pv4,
];
},
});
Expand Down

0 comments on commit d2ea358

Please sign in to comment.