Thanks to visit codestin.com
Credit goes to github.com

Skip to content

chore: Increase border radius #3493

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
Aug 12, 2022
Merged

chore: Increase border radius #3493

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
2 changes: 1 addition & 1 deletion site/src/components/BorderedMenu/BorderedMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const useStyles = makeStyles((theme) => ({
paperRoot: {
width: "292px",
border: `2px solid ${theme.palette.secondary.dark}`,
borderRadius: 7,
borderRadius: theme.shape.borderRadius,
boxShadow: `4px 4px 0px ${fade(theme.palette.secondary.dark, 0.2)}`,
},
}))
2 changes: 1 addition & 1 deletion site/src/components/BorderedMenuRow/BorderedMenuRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const useStyles = makeStyles((theme) => ({
padding: `0 ${theme.spacing(1.5)}px`,
},
content: {
borderRadius: 7,
borderRadius: theme.shape.borderRadius,
display: "flex",
flexDirection: "column",
padding: theme.spacing(2),
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/CopyButton/CopyButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const useStyles = makeStyles((theme) => ({
marginLeft: theme.spacing(1),
},
copyButton: {
borderRadius: 7,
borderRadius: theme.shape.borderRadius,
padding: theme.spacing(0.85),
minWidth: 32,

Expand Down
4 changes: 2 additions & 2 deletions site/src/components/TemplateStats/TemplateStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { makeStyles } from "@material-ui/core/styles"
import { FC } from "react"
import { createDayString } from "util/createDayString"
import { Template, TemplateVersion } from "../../api/typesGenerated"
import { CardRadius, MONOSPACE_FONT_FAMILY } from "../../theme/constants"
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"

const Language = {
usedByLabel: "Used by",
Expand Down Expand Up @@ -59,7 +59,7 @@ const useStyles = makeStyles((theme) => ({
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
backgroundColor: theme.palette.background.paper,
borderRadius: CardRadius,
borderRadius: theme.shape.borderRadius,
display: "flex",
alignItems: "center",
color: theme.palette.text.secondary,
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/WorkspaceBuildLogs/WorkspaceBuildLogs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const WorkspaceBuildLogs: FC<WorkspaceBuildLogsProps> = ({ logs }) => {
const useStyles = makeStyles((theme) => ({
logs: {
border: `1px solid ${theme.palette.divider}`,
borderRadius: 2,
borderRadius: theme.shape.borderRadius,
fontFamily: MONOSPACE_FONT_FAMILY,
},

Expand Down
4 changes: 2 additions & 2 deletions site/src/components/WorkspaceBuildStats/WorkspaceBuildStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { makeStyles, useTheme } from "@material-ui/core/styles"
import { FC } from "react"
import { Link as RouterLink } from "react-router-dom"
import { WorkspaceBuild } from "../../api/typesGenerated"
import { CardRadius, MONOSPACE_FONT_FAMILY } from "../../theme/constants"
import { MONOSPACE_FONT_FAMILY } from "../../theme/constants"
import { combineClasses } from "../../util/combineClasses"
import {
displayWorkspaceBuildDuration,
Expand Down Expand Up @@ -72,7 +72,7 @@ const useStyles = makeStyles((theme) => ({
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
backgroundColor: theme.palette.background.paper,
borderRadius: CardRadius,
borderRadius: theme.shape.borderRadius,
display: "flex",
alignItems: "center",
color: theme.palette.text.secondary,
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const useStyles = makeStyles((theme) => ({
},
},
iconButton: {
borderRadius: 2,
borderRadius: theme.shape.borderRadius,
},
popoverPaper: {
padding: `${theme.spacing(2)}px ${theme.spacing(3)}px ${theme.spacing(3)}px`,
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/WorkspaceSection/WorkspaceSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Paper from "@material-ui/core/Paper"
import { makeStyles } from "@material-ui/core/styles"
import Typography from "@material-ui/core/Typography"
import React, { HTMLProps } from "react"
import { CardPadding, CardRadius } from "../../theme/constants"
import { CardPadding } from "../../theme/constants"
import { combineClasses } from "../../util/combineClasses"

export interface WorkspaceSectionProps {
Expand Down Expand Up @@ -44,7 +44,7 @@ export const WorkspaceSection: React.FC<WorkspaceSectionProps> = ({
const useStyles = makeStyles((theme) => ({
root: {
border: `1px solid ${theme.palette.divider}`,
borderRadius: CardRadius,
borderRadius: theme.shape.borderRadius,
},
contents: {
margin: theme.spacing(2),
Expand Down
2 changes: 1 addition & 1 deletion site/src/theme/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export const spacing = 8
export const borderRadius = 4
export const borderRadius = 8
export const buttonBorderWidth = 2
export const MONOSPACE_FONT_FAMILY =
"'IBM Plex Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'Liberation Mono', 'Monaco', 'Courier New', Courier, monospace"
Expand Down
8 changes: 4 additions & 4 deletions site/src/theme/overrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Theme } from "@material-ui/core/styles"
import { SimplePaletteColorOptions } from "@material-ui/core/styles/createPalette"
import { Overrides } from "@material-ui/core/styles/overrides"
import { MONOSPACE_FONT_FAMILY } from "./constants"
import { borderRadius, MONOSPACE_FONT_FAMILY } from "./constants"

export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
return {
Expand Down Expand Up @@ -74,7 +74,7 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
},
MuiTableContainer: {
root: {
borderRadius: 2,
borderRadius,
border: `1px solid ${palette.divider}`,
},
},
Expand Down Expand Up @@ -117,7 +117,7 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
},
MuiInputBase: {
root: {
borderRadius: 2,
borderRadius,
},
},
MuiOutlinedInput: {
Expand All @@ -141,7 +141,7 @@ export const getOverrides = ({ palette, breakpoints }: Theme): Overrides => {
},
MuiPaper: {
root: {
borderRadius: 2,
borderRadius,
border: `1px solid ${palette.divider}`,
},
},
Expand Down