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

Jump to bottom

Fix the toggle button text style #40950

Merged
merged 10 commits into from
May 14, 2024
Merged

Fix the toggle button text style #40950

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e47da43
fix: don't mute text
Apr 25, 2024
766cb92
fix: the toggle text style on the tags screen
Apr 25, 2024
378b6fb
Merge branch 'main' into hayata-fix-toggle-text-style
Apr 30, 2024
2c38da9
fix: don't make the toggle text bold
May 1, 2024
9003dea
fix: update the UI text
May 1, 2024
b9d51e9
fix: spanish translation
May 2, 2024
ecc3ece
fix: do not mute the text next to Switch for requiring tags
May 11, 2024
28a56f3
Merge branch 'main' into hayata-fix-toggle-text-style
May 11, 2024
ccb9fef
fix: spacing
May 13, 2024
7ab4750
Merge branch 'main' into hayata-fix-toggle-text-style
May 13, 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/categories/WorkspaceCategoriesSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function WorkspaceCategoriesSettingsPage({route, policyCategories}: WorkspaceCat
>
<View style={[styles.mt2, styles.mh4]}>
<View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
<Text style={[styles.textNormal, styles.colorMuted, styles.flexShrink1, styles.mr2]}>{translate('workspace.categories.requiresCategory')}</Text>
<Text style={[styles.textNormal, styles.flexShrink1, styles.mr2]}>{translate('workspace.categories.requiresCategory')}</Text>
<Switch
isOn={policy?.requiresCategory ?? false}
accessibilityLabel={translate('workspace.categories.requiresCategory')}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
>
<View style={[styles.mt2, styles.mh4]}>
<View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
<Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.requiresTag')}</Text>
<Text style={[styles.textNormal]}>{translate('workspace.tags.requiresTag')}</Text>
<Switch
isOn={policy?.requiresTag ?? false}
accessibilityLabel={translate('workspace.tags.requiresTag')}
Expand Down
Loading