-
Notifications
You must be signed in to change notification settings - Fork 3
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.
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
VE-252 Combine dark and light themes for mui v6 #1009
Merged
m4manjesh
merged 49 commits into
release/v10.0.0
from
enhancement/ve-252-combine-theme-for-mui-v6
Jan 6, 2025
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit
Hold shift + click to select a range
3861160
trying combined theme
m4manjesh 264fb14
sort -order fix
m4manjesh ba38641
useColorTheme hook from mui
mattcorner b5a45bb
Merge branch 'enhancement/ve-252-combine-theme-for-mui-v6' of https:/…
m4manjesh b19b8df
fixing test to use useColorScheme
m4manjesh c254436
removing context for use theme
m4manjesh 4a9ab81
fixing warning
m4manjesh 8a12323
adding missing tokens
m4manjesh 4bab5b4
updating props to correct values
m4manjesh 07fd7ec
Merge branch 'migrate-depricated-apis-to-v6' into enhancement/ve-252-…
m4manjesh f0935bb
fix test
m4manjesh e4d7efd
fix sorting
m4manjesh 9993061
adding the color schemes
m4manjesh 0f7089a
10.0.0-3
m4manjesh e5313f4
updating colors and unwanted space removed
m4manjesh 4add550
change the prefix to ipg
m4manjesh f88a2af
update theme color prefix
m4manjesh a067452
10.0.0-4
m4manjesh 913d61e
update hook comments
m4manjesh 13bb88e
remove commented code
m4manjesh db855f7
Merge branch 'release/v10.0.0' into enhancement/ve-252-combine-theme-…
m4manjesh c507a4e
set mode to light when theme mode is system
m4manjesh 3c8608d
fix type values
m4manjesh 15df447
set defaultComponents
m4manjesh ec2aae7
10.0.0-5
m4manjesh a0a443d
Convert VirtoLogo to typescript
m4manjesh 190b5c5
10.0.0-6
m4manjesh d1ad40a
fixing font picker
m4manjesh 0c01d06
using grid2 and updated border color
m4manjesh 4294cc2
fixed/added broken theme definitions
m4manjesh 0a72cfc
rename and update doc
m4manjesh 18a10b8
fixing tests
m4manjesh e0072d4
enable themeCssVarsAugmentation and update interfaces
m4manjesh a18e56b
using old theme colors
m4manjesh 74f22fe
fixing the colors
m4manjesh d235e5c
adding grey bg color to story
m4manjesh 87d45b6
using theme colors for buttons
m4manjesh 0079504
remove console log
m4manjesh f65f34e
setting mode to correct local storage
m4manjesh 47d7b5e
10.0.0-7
m4manjesh 3a2a01c
fixing the icon button color
m4manjesh f508bcd
fixing the label color
m4manjesh a0ff0d3
fixing the missing spacing by moving font family to allVariants
m4manjesh 7247bca
button colour use default action.active
m4manjesh 6971838
label color to text secondary
m4manjesh c972d9d
removing hardcoded color for close buttons
m4manjesh 55a6e6f
fixing font
m4manjesh 4fda39d
10.0.0-8
m4manjesh 1364279
fixing the font for step icon text
m4manjesh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,70 +1,72 @@ | ||
.dark { | ||
background: #1b1c1d; | ||
|
||
.sb-nopreview_main { | ||
background: #1B1C1D; | ||
background: #1b1c1d; | ||
} | ||
|
||
.sb-nopreview_heading { | ||
text-align: center; | ||
text-align: center; | ||
} | ||
|
||
.sb-errordisplay { | ||
background: #2c2f33; | ||
color: white; | ||
background: #2c2f33; | ||
color: white; | ||
} | ||
|
||
.sb-errordisplay_main { | ||
background: #1e1e1e; | ||
box-shadow: 0 0 64px rgba(255, 255, 255, 0.1); | ||
background: #1e1e1e; | ||
box-shadow: 0 0 64px rgba(255, 255, 255, 0.1); | ||
} | ||
|
||
.sb-errordisplay_code { | ||
background: #1c1c1c; | ||
color: #d4d4d4; | ||
background: #1c1c1c; | ||
color: #d4d4d4; | ||
} | ||
|
||
.sb-preparing-story, | ||
.sb-preparing-docs { | ||
background-color: #1B1C1D; | ||
background-color: #1b1c1d; | ||
} | ||
|
||
.sb-loader { | ||
border-color: rgba(158, 158, 158, 0.29); | ||
border-color: rgba(158, 158, 158, 0.29); | ||
} | ||
|
||
.sb-previewBlock { | ||
background: #2c2f33; | ||
border: 1px solid rgba(255, 255, 255, 0.1); | ||
box-shadow: rgba(255, 255, 255, 0.1) 0 1px 3px 0; | ||
background: #2c2f33; | ||
border: 1px solid rgba(255, 255, 255, 0.1); | ||
box-shadow: rgba(255, 255, 255, 0.1) 0 1px 3px 0; | ||
} | ||
|
||
.sb-previewBlock_header { | ||
box-shadow: rgba(255, 255, 255, 0.1) 0 -1px 0 0 inset; | ||
box-shadow: rgba(255, 255, 255, 0.1) 0 -1px 0 0 inset; | ||
} | ||
|
||
.sb-previewBlock_icon { | ||
background: #3c3f43; | ||
background: #3c3f43; | ||
} | ||
|
||
.sb-argstableBlock th span, | ||
.sb-argstableBlock td span { | ||
background-color: rgba(255, 255, 255, 0.1); | ||
background-color: rgba(255, 255, 255, 0.1); | ||
} | ||
|
||
.sb-argstableBlock-body { | ||
box-shadow: | ||
rgba(255, 255, 255, 0.1) 0 1px 3px 1px, | ||
rgba(255, 255, 255, 0.065) 0 0 0 1px; | ||
box-shadow: | ||
rgba(255, 255, 255, 0.1) 0 1px 3px 1px, | ||
rgba(255, 255, 255, 0.065) 0 0 0 1px; | ||
} | ||
|
||
.sb-argstableBlock-body tr:not(:first-child) { | ||
border-top: 1px solid #3c3f43; | ||
border-top: 1px solid #3c3f43; | ||
} | ||
|
||
.sb-argstableBlock-body td { | ||
background: #1B1C1D; | ||
background: #1b1c1d; | ||
} | ||
|
||
.sb-argstableBlock-body button { | ||
background-color: rgba(255, 255, 255, 0.1); | ||
background-color: rgba(255, 255, 255, 0.1); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import { Meta, StoryFn } from "@storybook/react"; | ||
|
||
import React from "react"; | ||
import { VirtoLogo } from "./VirtoLogo"; | ||
import { VirtoLogoProps } from "./VirtoLogo.types"; | ||
|
||
/** | ||
* Story metadata | ||
*/ | ||
const meta: Meta<typeof VirtoLogo> = { | ||
component: VirtoLogo, | ||
title: "General/SvgIcons/VirtoLogo" | ||
}; | ||
export default meta; | ||
|
||
const Template: StoryFn<VirtoLogoProps> = args => { | ||
return <VirtoLogo {...args} />; | ||
}; | ||
|
||
export const Default = { | ||
args: { | ||
sx: { height: 40, width: 160 } | ||
}, | ||
|
||
render: Template | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { SvgIconProps } from "../SvgIcons.types"; | ||
|
||
export type VirtoLogoProps = SvgIconProps; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,2 @@ | ||
import { SvgIconProps } from "../SvgIcons.types"; | ||
import VirtoLogo from "./VirtoLogo"; | ||
|
||
export type VirtoLogoProps = SvgIconProps; | ||
|
||
export default VirtoLogo as React.FC<VirtoLogoProps>; | ||
export { VirtoLogo } from "./VirtoLogo"; | ||
export type { VirtoLogoProps } from "./VirtoLogo.types"; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added background , this was getting overwritten by dark color-scheme from mui