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

Improve delete/close button colors #2179

Merged
merged 1 commit into from
May 8, 2024
Merged

Improve delete/close button colors #2179

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
8 changes: 5 additions & 3 deletions components/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ function Button(props: ButtonProps) {
? themeColor('highlight')
: secondary
? themeColor('secondary')
: warning
? themeColor('delete')
: themeColor('text'),
...buttonStyle
}}
Expand All @@ -101,9 +103,9 @@ function Button(props: ButtonProps) {
color: iconOnly
? textColor
: quaternary
? warning
? themeColor('warning')
: textColor
? textColor
: warning
? themeColor('text')
: secondary
? themeColor('highlight')
: themeColor('background'),
Expand Down
7 changes: 0 additions & 7 deletions views/Channels/Channel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,12 +592,6 @@ export default class ChannelView extends React.Component<
})
}
warning={!confirmCloseChannel}
titleStyle={{
color: 'white'
}}
buttonStyle={{
backgroundColor: themeColor('delete')
}}
/>
</View>
)}
Expand Down Expand Up @@ -694,7 +688,6 @@ export default class ChannelView extends React.Component<
deliveryAddress
)
}
quaternary
warning
/>
</View>
Expand Down
8 changes: 1 addition & 7 deletions views/Settings/AddContact.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,13 +1252,7 @@ export default class AddContact extends React.Component<
this.deleteContact();
}
}}
containerStyle={{
borderColor: themeColor('delete')
}}
titleStyle={{
color: themeColor('delete')
}}
secondary
warning
/>
</View>
)}
Expand Down
8 changes: 1 addition & 7 deletions views/Settings/NodeConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1737,13 +1737,7 @@ export default class NodeConfiguration extends React.Component<
this.deleteNodeConfig();
}
}}
containerStyle={{
borderColor: themeColor('delete')
}}
titleStyle={{
color: themeColor('delete')
}}
secondary
warning
/>
</View>
)}
Expand Down
Loading