Skip to content

refactor: Minor design adjustments #1637

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 4 commits into from
May 20, 2022
Merged

refactor: Minor design adjustments #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ef83c3
Add extra footer margin from the top
BrunoQuaresma May 20, 2022
4ccbbe1
Fix logs header spacing
BrunoQuaresma May 20, 2022
974e592
Merge branch 'main' of github.com:coder/coder into bq/minor-design-up…
BrunoQuaresma May 20, 2022
ea280ea
Make table row padding standard
BrunoQuaresma May 20, 2022
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 deletions site/src/components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const useFooterStyles = makeStyles((theme) => ({
flex: "0",
paddingTop: theme.spacing(2),
paddingBottom: theme.spacing(2),
marginTop: theme.spacing(3),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

The footer was very close to the content. Added some space.

},
copyRight: {
margin: theme.spacing(0.25),
Expand Down
1 change: 0 additions & 1 deletion site/src/pages/LoginPage/LoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export const useStyles = makeStyles((theme) => ({
layout: {
display: "flex",
flexDirection: "column",
gap: theme.spacing(2),
alignItems: "center",
},
container: {
Expand Down
8 changes: 1 addition & 7 deletions site/src/pages/TemplatesPage/TemplatesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const TemplatesPageView: React.FC<TemplatesPageViewProps> = (props) => {
</TableRow>
)}
{props.templates?.map((template) => (
<TableRow key={template.id} className={styles.templateRow}>
<TableRow key={template.id}>
<TableCell>
<Box alignItems="center" display="flex">
<Avatar variant="square" className={styles.templateAvatar}>
Expand Down Expand Up @@ -127,12 +127,6 @@ const useStyles = makeStyles((theme) => ({
lineHeight: `${theme.spacing(3)}px`,
},
},
templateRow: {
"& > td": {
paddingTop: theme.spacing(2),
paddingBottom: theme.spacing(2),
},
},
templateAvatar: {
borderRadius: 2,
marginRight: theme.spacing(1),
Expand Down
3 changes: 2 additions & 1 deletion site/src/pages/WorkspaceBuildPage/WorkspaceBuildPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const WorkspaceBuildPage: React.FC = () => {

const useStyles = makeStyles((theme) => ({
title: {
marginTop: theme.spacing(5),
paddingTop: theme.spacing(5),
paddingBottom: theme.spacing(2),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Add more spacing to the bottom of the Logs title.

},
}))
8 changes: 1 addition & 7 deletions site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const WorkspacesPageView: React.FC<WorkspacesPageViewProps> = (props) =>
{props.workspaces?.map((workspace) => {
const status = getDisplayStatus(theme, workspace.latest_build)
return (
<TableRow key={workspace.id} className={styles.workspaceRow}>
<TableRow key={workspace.id}>
<TableCell>
<div className={styles.workspaceName}>
<Avatar variant="square" className={styles.workspaceAvatar}>
Expand Down Expand Up @@ -134,12 +134,6 @@ const useStyles = makeStyles((theme) => ({
lineHeight: `${theme.spacing(3)}px`,
},
},
workspaceRow: {
"& > td": {
paddingTop: theme.spacing(2),
paddingBottom: theme.spacing(2),
},
},
workspaceAvatar: {
borderRadius: 2,
marginRight: theme.spacing(1),
Expand Down
5 changes: 5 additions & 0 deletions site/src/theme/overrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ export const getOverrides = (palette: PaletteOptions) => {
// Gives the appearance of a border!
borderRadius: 2,
border: `1px solid ${palette.divider}`,

"& td": {
paddingTop: 16,
paddingBottom: 16,
},
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Other tables were using that "manually" so I extracted them to be the standard.

},
},
MuiTableCell: {
Expand Down