Skip to content

Infra/ update outline design tokens #1959

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

Merged
merged 1 commit into from
Apr 10, 2022
Merged

Infra/ update outline design tokens #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions demo/src/screens/componentScreens/AvatarsScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const examples = [
icon: star,
size: 14,
borderWidth: 1.5,
borderColor: Colors.$outlineLight,
borderColor: Colors.$outlineInverted,
iconStyle: {backgroundColor: Colors.$backgroundWarningHeavy}
}
},
Expand Down Expand Up @@ -107,7 +107,7 @@ const examples = [
label: '+2',
size: 24,
borderWidth: 1.5,
borderColor: Colors.$outlineLight
borderColor: Colors.$outlineInverted
}
}
];
Expand Down
2 changes: 1 addition & 1 deletion demo/src/screens/componentScreens/SliderScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ const styles = StyleSheet.create({
height: 20,
borderRadius: 4,
borderWidth: 1,
borderColor: Colors.$outlineNeutral
borderColor: Colors.$outlineDefault
},
group: {
backgroundColor: Colors.$backgroundNeutralMedium,
Expand Down
2 changes: 1 addition & 1 deletion demo/src/screens/incubatorScreens/IncubatorToastScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default class ToastsScreen extends Component {
// backgroundColor={Colors.$backgroundSuccess}
// icon={Assets.icons.demo.add}
// iconColor={Colors.$backgroundSuccessHeavy}
// style={{borderWidth: 1, borderColor: Colors.$outlineNeutralMedium}}
// style={{borderWidth: 1, borderColor: Colors.$outlineDisabled}}
// messageStyle={Typography.text80BO}
>
{isCustomContent ? this.renderCustomContent() : undefined}
Expand Down
2 changes: 1 addition & 1 deletion src/components/dateTimePicker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ const styles = StyleSheet.create({
header: {
height: 56,
borderBottomWidth: 1,
borderBottomColor: Colors.$outlineNeutral
borderBottomColor: Colors.$outlineDefault
},
dialog: {
backgroundColor: Colors.$backgroundDefault,
Expand Down
2 changes: 1 addition & 1 deletion src/components/picker/PickerItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const styles = StyleSheet.create({
container: {
height: 56.5,
paddingHorizontal: 23,
borderColor: Colors.$outlineNeutral,
borderColor: Colors.$outlineDefault,
borderBottomWidth: 1
},
labelText: {
Expand Down
2 changes: 1 addition & 1 deletion src/components/picker/PickerItemsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const styles = StyleSheet.create({
alignItems: 'center',
paddingLeft: 16,
borderBottomWidth: StyleSheet.hairlineWidth,
borderBottomColor: Colors.$outlineNeutral
borderBottomColor: Colors.$outlineDefault
},
searchIcon: {
marginRight: 12
Expand Down
2 changes: 1 addition & 1 deletion src/incubator/Dialog/DialogHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const styles = StyleSheet.create({
height: Spacings.s1,
marginTop: Spacings.s2,
marginBottom: Spacings.s2,
backgroundColor: Colors.$outlineNeutral,
backgroundColor: Colors.$outlineDefault,
borderRadius: BorderRadiuses.br10
}
});
2 changes: 1 addition & 1 deletion src/incubator/TextField/presets/default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const colorByState = {
const styles = StyleSheet.create({
field: {
borderBottomWidth: 1,
borderBottomColor: Colors.$outlineNeutralMedium,
borderBottomColor: Colors.$outlineDisabled,
paddingBottom: Spacings.s2
},
input: {
Expand Down
2 changes: 1 addition & 1 deletion src/incubator/WheelPicker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ const styles = StyleSheet.create({
borderTopWidth: 1,
borderBottomWidth: 1,
height: Spacings.s9,
borderColor: Colors.$outlineNeutral
borderColor: Colors.$outlineDefault
},
label: {
position: 'absolute',
Expand Down
4 changes: 1 addition & 3 deletions src/style/designTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ export default {
$iconDisabled: colorsPalette.grey50,

// OUTLINE
$outlineLight: colorsPalette.white,
$outlineNeutral: colorsPalette.grey60,
$outlineNeutralMedium: colorsPalette.grey50,
$outlineDefault: colorsPalette.grey60,
$outlineDisabled: colorsPalette.grey50,
$outlineDisabledHeavy: colorsPalette.grey30,
$outlinePrimary: colorsPalette.violet30,
Expand Down
4 changes: 1 addition & 3 deletions src/style/designTokensDM.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@ export default {
$iconDisabled: colorsPalette.grey20,

// OUTLINE
$outlineLight: colorsPalette.grey70,
$outlineNeutral: colorsPalette.grey10,
$outlineNeutralMedium: colorsPalette.grey20,
$outlineDefault: colorsPalette.grey10,
$outlineDisabled: colorsPalette.grey20,
$outlineDisabledHeavy: colorsPalette.grey40,
$outlinePrimary: colorsPalette.violet50,
Expand Down