Skip to content

Commit

Permalink
Merge pull request Expensify#12455 from Expensify/luke-update-button-…
Browse files Browse the repository at this point in the history
…styles

Update Button Styles
  • Loading branch information
Luke9389 authored Nov 23, 2022
2 parents caa5dd2 + e62fd52 commit 39a68d1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/components/Onfido/BaseOnfidoWeb.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Onfido extends React.Component {
colorContentTitle: themeColors.text,
colorContentSubtitle: themeColors.text,
colorContentBody: themeColors.text,
borderRadiusButton: `${variables.componentBorderRadius}px`,
borderRadiusButton: `${variables.buttonBorderRadius}px`,
colorBackgroundSurfaceModal: themeColors.appBG,
colorBorderDocTypeButton: themeColors.border,
colorBorderDocTypeButtonHover: themeColors.link,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/getReportActionContextMenuStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const miniWrapperStyle = [
styles.flexRow,
defaultWrapperStyle,
{
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
borderWidth: 1,
borderColor: themeColors.border,
},
Expand Down
2 changes: 1 addition & 1 deletion src/styles/getTooltipStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default function getTooltipStyles(
tooltipWrapperStyle: {
position: 'fixed',
backgroundColor: themeColors.heading,
borderRadius: variables.componentBorderRadiusSmall,
borderRadius: variables.buttonBorderRadius,
...tooltipVerticalPadding,
...spacing.ph2,
zIndex: variables.tooltipzIndex,
Expand Down
28 changes: 14 additions & 14 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,12 +339,12 @@ const styles = {
},

borderRadiusNormal: {
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
},

button: {
backgroundColor: themeColors.buttonDefaultBG,
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeLarge,
justifyContent: 'center',
...spacing.ph3,
Expand All @@ -363,32 +363,31 @@ const styles = {
},

buttonSmall: {
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeSmall,
paddingTop: 6,
paddingRight: 10,
paddingBottom: 6,
paddingLeft: 10,
paddingTop: 10,
paddingHorizontal: 14,
paddingBottom: 10,
backgroundColor: themeColors.buttonDefaultBG,
},

buttonMedium: {
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeNormal,
paddingTop: 6,
paddingRight: 12,
paddingRight: 16,
paddingBottom: 6,
paddingLeft: 12,
paddingLeft: 16,
backgroundColor: themeColors.buttonDefaultBG,
},

buttonLarge: {
borderRadius: variables.componentBorderRadius,
borderRadius: variables.buttonBorderRadius,
height: variables.componentSizeLarge,
paddingTop: 8,
paddingRight: 14,
paddingRight: 18,
paddingBottom: 8,
paddingLeft: 14,
paddingLeft: 18,
backgroundColor: themeColors.buttonDefaultBG,
},

Expand Down Expand Up @@ -612,7 +611,7 @@ const styles = {

border: {
borderWidth: 1,
borderRadius: variables.componentBorderRadiusNormal,
borderRadius: variables.buttonBorderRadius,
borderColor: themeColors.border,
},

Expand Down Expand Up @@ -2685,6 +2684,7 @@ const styles = {
errorPageContainer: {
backgroundColor: themeColors.componentBG,
},

transferBalancePayment: {
borderWidth: 1,
borderRadius: variables.componentBorderRadiusNormal,
Expand Down
1 change: 1 addition & 0 deletions src/styles/variables.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
componentBorderRadiusSmall: 4,
componentBorderRadiusNormal: 8,
componentBorderRadiusCard: 12,
buttonBorderRadius: 100,
avatarSizeLarge: 80,
avatarSizeNormal: 40,
avatarSizeSmall: 28,
Expand Down

0 comments on commit 39a68d1

Please sign in to comment.