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

Proclaim theme updates #547

Merged
merged 2 commits into from
Sep 5, 2024
+21 −18
Merged

Proclaim theme updates #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f7f71e
Update Proclaim theme's hover and pressed buttons
JordanSjodinFaithlife Sep 5, 2024
bbe7848
Publich 6.12.5
JordanSjodinFaithlife Sep 5, 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
3 changes: 3 additions & 0 deletions VersionHistory.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## 6.12.5
- Updates to Proclaim's theme

## 6.12.2

- `Menu.Item`: Stop showing hover background when disabled
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@faithlife/styled-ui",
"version": "6.12.4",
"version": "6.12.5",
"main": "dist/main.js",
"repository": "[email protected]:Faithlife/styled-ui.git",
"license": "MIT",
Expand Down
34 changes: 17 additions & 17 deletions theme/brandOverrides/proclaim.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const theme = {

multi: {
border: '#46444F',
selectedBackground: '#323232',
selectedBackground: '#383643',
selectedForeground: 'foregroundPrimary',
},
},
Expand Down Expand Up @@ -79,8 +79,8 @@ export const theme = {
},
'&:disabled': {
color: '#999999',
backgroundColor: '#666666',
borderColor: '#666666',
backgroundColor: '#838290',
borderColor: '#838290',
},
},
secondary: {
Expand All @@ -94,8 +94,8 @@ export const theme = {
},
'&:active': {
color: 'foregroundPrimary',
backgroundColor: '#323232',
borderColor: '#323232',
backgroundColor: '#383643',
borderColor: '#383643',
},
'&:disabled': {
color: '#999999',
Expand All @@ -109,17 +109,17 @@ export const theme = {
backgroundColor: '#5A5962',
borderColor: '#5A5962',
'&:hover': {
backgroundColor: '#666666',
borderColor: '#666666',
backgroundColor: '#838290',
borderColor: '#838290',
},
'&:active': {
backgroundColor: '#323232',
borderColor: '#323232',
backgroundColor: '#383643',
borderColor: '#383643',
},
'&:disabled': {
color: '#999999',
backgroundColor: '#666666',
borderColor: '#666666',
backgroundColor: '#838290',
borderColor: '#838290',
},
},
transparent: {
Expand All @@ -128,12 +128,12 @@ export const theme = {
backgroundColor: 'transparent',
borderColor: 'transparent',
'&:hover': {
backgroundColor: '#666666',
borderColor: '#666666',
backgroundColor: '#838290',
borderColor: '#838290',
},
'&:active,&.active': {
backgroundColor: '#323232',
borderColor: '#323232',
backgroundColor: '#383643',
borderColor: '#383643',
},
'&:disabled': {
color: '#999999',
Expand Down Expand Up @@ -206,8 +206,8 @@ export const theme = {
},
'&:disabled': {
color: '#999999',
borderColor: '#666666',
backgroundColor: '#666666',
borderColor: '#838290',
backgroundColor: '#838290',
},
},
},
Expand Down
Loading