Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

refactor: Initial color palette changes#3087

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
BrunoQuaresma merged 4 commits intomainfromcolor-palette
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
1 change: 1 addition & 0 deletionssite/src/components/AvatarData/AvatarData.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,5 +48,6 @@ const useStyles = makeStyles((theme) => ({
},
avatar: {
marginRight: theme.spacing(1.5),
background: "hsl(219, 8%, 52%)",
Copy link
CollaboratorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Do you think we could have it as apalette object liketheme.palette.paper.dark? Or something like that?

},
}))
2 changes: 1 addition & 1 deletionsite/src/components/BuildsTable/BuildsTable.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,7 @@ export const BuildsTable: FC<BuildsTableProps> = ({ builds, className }) => {
const useStyles = makeStyles((theme) => ({
clickableTableRow: {
"&:hover td": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.dark, 0.1),
},

"&:focus": {
Expand Down
3 changes: 2 additions & 1 deletionsite/src/components/CodeExample/CodeExample.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,8 @@ const useStyles = makeStyles((theme) => ({
display: "flex",
flexDirection: "row",
alignItems: "center",
background: theme.palette.background.default,
background: "hsl(223, 27%, 3%)",
border: `1px solid ${theme.palette.divider}`,
color: theme.palette.primary.contrastText,
fontFamily: MONOSPACE_FONT_FAMILY,
fontSize: 14,
Expand Down
2 changes: 0 additions & 2 deletionssite/src/components/CopyButton/CopyButton.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -82,8 +82,6 @@ const useStyles = makeStyles((theme) => ({
},
copyButton: {
borderRadius: 7,
background: theme.palette.background.default,
color: theme.palette.primary.contrastText,
padding: theme.spacing(0.85),
minWidth: 32,

Expand Down
4 changes: 2 additions & 2 deletionssite/src/components/NavbarView/NavbarView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,7 +104,7 @@ const useStyles = makeStyles((theme) => ({
},
link: {
alignItems: "center",
color: "#A7A7A7",
color: "hsl(220, 11%, 71%)",
display: "flex",
fontSize: 16,
height: navHeight,
Expand All@@ -113,7 +113,7 @@ const useStyles = makeStyles((theme) => ({
transition: "background-color 0.3s ease",

"&:hover": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.light, 0.05),
},

// NavLink adds this class when the current route matches.
Expand Down
2 changes: 1 addition & 1 deletionsite/src/components/UserDropdown/UsersDropdown.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ export const useStyles = makeStyles((theme) => ({
padding: `${theme.spacing(1.5)}px ${theme.spacing(2.75)}px`,

"&:hover": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.light, 0.05),
transition: "background-color 0.3s ease",
},
},
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@ const useStyles = makeStyles((theme) => ({
padding: `${theme.spacing(1.5)}px ${theme.spacing(2.75)}px`,

"&:hover": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.light, 0.05),
transition: "background-color 0.3s ease",
},
},
Expand Down
2 changes: 1 addition & 1 deletionsite/src/components/WorkspacesTable/WorkspacesRow.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,7 +91,7 @@ export const WorkspacesRow: FC<{ workspaceRef: WorkspaceItemMachineRef }> = ({ w
const useStyles = makeStyles((theme) => ({
clickableTableRow: {
"&:hover td": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.dark, 0.1),
},

"&:focus": {
Expand Down
2 changes: 1 addition & 1 deletionsite/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -174,7 +174,7 @@ const useStyles = makeStyles((theme) => ({
},
clickableTableRow: {
"&:hover td": {
backgroundColor: fade(theme.palette.primary.light, 0.1),
backgroundColor: fade(theme.palette.primary.dark, 0.1),
},

"&:focus": {
Expand Down
24 changes: 20 additions & 4 deletionssite/src/theme/overrides.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,23 @@ import { MONOSPACE_FONT_FAMILY } from "./constants"
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
export const getOverrides = (palette: PaletteOptions) => {
return {
MuiCssBaseline: {
"@global": {
body: {
backgroundImage:
"linear-gradient(to right bottom, hsl(223, 38%, 14%), hsl(221, 53%, 3%))",
backgroundRepeat: "no-repeat",
backgroundAttachment: "fixed",
letterSpacing: "-0.015em",
},
},
},
MuiAvatar: {
root: {
borderColor: palette.divider,
width: 36,
height: 36,
fontSize:20,
fontSize:18,
},
},
MuiButton: {
Expand All@@ -26,7 +37,7 @@ export const getOverrides = (palette: PaletteOptions) => {
contained: {
boxShadow: "none",
color: palette.text?.primary,
backgroundColor: "#151515",
backgroundColor: "hsl(223, 27%, 3%)",
"&:hover": {
boxShadow: "none",
backgroundColor: "#000000",
Expand DownExpand Up@@ -62,11 +73,12 @@ export const getOverrides = (palette: PaletteOptions) => {
root: {
// Gives the appearance of a border!
borderRadius: 2,
border: `1px solid ${palette.divider}`,
background: "hsla(222, 31%, 19%, .5)",

"& td": {
paddingTop: 16,
paddingBottom: 16,
background: "transparent",
},
},
},
Expand DownExpand Up@@ -97,11 +109,15 @@ export const getOverrides = (palette: PaletteOptions) => {
},
MuiOutlinedInput: {
root: {
"& .MuiOutlinedInput-notchedOutline": {
borderColor: palette.divider,
},

"& input:-webkit-autofill": {
WebkitBoxShadow: `0 0 0 1000px ${palette.background?.paper} inset`,
},
"&:hover .MuiOutlinedInput-notchedOutline": {
borderColor:(palette.primary as SimplePaletteColorOptions).light,
borderColor: palette.divider,
},
},
},
Expand Down
28 changes: 14 additions & 14 deletionssite/src/theme/palettes.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,29 @@ import { PaletteOptions } from "@material-ui/core/styles/createPalette"
export const darkPalette: PaletteOptions = {
type: "dark",
primary: {
main: "#409BF4",
contrastText: "#f8f8f8",
light: "#79B8FF",
dark: "#1976D2",
main: "hsl(215, 81%, 63%)",
contrastText: "hsl(218, 44%, 92%)",
light: "hsl(215, 83%, 70%)",
dark: "hsl(215, 74%, 51%)",
},
secondary: {
main: "#008510",
contrastText: "#f8f8f8",
dark: "#7057FF",
main: "hsl(142, 64%, 34%)",
contrastText: "hsl(218, 44%, 92%)",
dark: "hsl(233, 73%, 63%)",
},
background: {
default: "#1F1F1F",
paper: "#292929",
default: "hsl(222, 38%, 14%)",
paper: "hsl(222, 32%, 19%)",
},
text: {
primary: "#F8F8F8",
secondary: "#C1C1C1",
primary: "hsl(218, 44%, 92%)",
secondary: "hsl(218, 32%, 77%)",
},
divider: "#383838",
divider: "hsl(221, 32%, 26%)",
warning: {
main: "#C16800",
main: "hsl(20, 79%, 53%)",
},
success: {
main: "#6BBE00",
main: "hsl(142, 58%, 41%)",
},
}
[8]ページ先頭
©2009-2025 Movatter.jp