Skip to content

Commit

Permalink
Merge branch 'dev' into release/canary
Browse files Browse the repository at this point in the history
  • Loading branch information
TinyKitten committed Oct 13, 2024
2 parents dbc4a56 + 89919fc commit 505f80e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/components/LineBoardEast.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ const styles = StyleSheet.create({
fontWeight: 'bold',
marginLeft: isTablet ? 5 : 2.5,
marginBottom: Platform.select({
ios: 0,
ios: -6,
android: isTablet ? 0 : -6,
}),
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/LineBoardSaikyo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const styles = StyleSheet.create({
color: '#3a3a3a',
marginLeft: isTablet ? 10 : 5,
marginBottom: Platform.select({
ios: 0,
ios: -6,
android: isTablet ? 0 : -6,
}),
},
Expand Down
2 changes: 0 additions & 2 deletions src/components/TrainTypeBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ const TrainTypeBox: React.FC<Props> = ({ trainType, isTY }: Props) => {
...styles.text,
letterSpacing: prevLetterSpacing,
marginLeft: prevMarginLeft,
width: '100%',
},
]}
adjustsFontSizeToFit
Expand All @@ -260,7 +259,6 @@ const TrainTypeBox: React.FC<Props> = ({ trainType, isTY }: Props) => {
{showNextTrainType && nextTrainType?.nameRoman ? (
<Typography
style={[
styles.text,
styles.nextTrainType,
{
color: theme === APP_THEME.TY ? '#fff' : '#444',
Expand Down

0 comments on commit 505f80e

Please sign in to comment.