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

Jump to bottom

style: antd style adjustments #732

Merged
merged 3 commits into from
Jun 23, 2020
Merged

style: antd style adjustments #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2af3e63
style: conform page styles
Jun 17, 2020
f61f5ef
style: adjust antd table styles
Jun 17, 2020
4226ebb
style: fix badge style for diplaying in table cells
Jun 22, 2020
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 webui/react/src/components/Badge.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
background-color: var(--theme-colors-monochrome-7);
border-radius: var(--theme-sizes-border-radius);
color: var(--theme-colors-monochrome-17);
display: inline-block;
font-size: var(--theme-sizes-font-tiny);
font-weight: bold;
line-height: var(--theme-sizes-font-large);
Expand Down
5 changes: 1 addition & 4 deletions webui/react/src/components/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import { Typography } from 'antd';
import React from 'react';

import { CommonProps } from 'types';
import { toHtmlId } from 'utils/string';

import css from './Page.module.scss';

const { Title } = Typography;

interface Props extends CommonProps {
title: string;
hideTitle?: boolean;
Expand All @@ -22,7 +19,7 @@ const Page: React.FC<Props> = (props: Props) => {

return (
<main className={classes.join(' ')} id={toHtmlId(props.title)}>
{props.hideTitle || <Title className={css.title}>{props.title}</Title>}
{props.hideTitle || <h5 className={css.title}>{props.title}</h5>}
<div className={css.body}>
{props.children}
</div>
Expand Down
8 changes: 7 additions & 1 deletion webui/react/src/styles/antd.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ html {
/* Input */

.ant-input-affix-wrapper {
border-radius: 0.3rem;
border-radius: var(--theme-border-radius);
padding: 0.6rem;
}
.ant-input-affix-wrapper.ant-input-affix-wrapper-lg { padding: 0.65rem 0.75rem; }
Expand Down Expand Up @@ -81,4 +81,10 @@ html {
align-items: center;
display: inline-flex;
}

/* Table */

.ant-table {
border: solid var(--theme-sizes-border-width) var(--theme-colors-monochrome-13);
}
}