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

Fix some styles for laptop screens #1977

Merged
merged 1 commit into from
May 20, 2021
Merged

Fix some styles for laptop screens #1977

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/app/web/src/components/app-sync-status/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { UI_TEXT_NOT_AVAILABLE_TEXT } from "../../constants/ui-text";
const useStyles = makeStyles((theme) => ({
statusText: {
marginLeft: theme.spacing(0.5),
whiteSpace: "nowrap",
},
}));

Expand All @@ -28,7 +29,7 @@ export const AppSyncStatus: FC<AppSyncStatusProps> = ({
size = "medium",
}) => {
const classes = useStyles();
const fontVariant = size === "medium" ? "body1" : "h6";
const fontVariant = size === "medium" ? "body2" : "h6";

if (deploying) {
return (
Expand Down
29 changes: 16 additions & 13 deletions pkg/app/web/src/components/deployment-detail/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,20 +181,23 @@ export const DeploymentDetail: FC<DeploymentDetailProps> = memo(
<Box display="flex">
<Typography variant="body2">
{deployment.trigger.commit.message}
<span className={classes.textMargin}>
(
<Link
variant="body2"
href={deployment.trigger.commit.url}
target="_blank"
rel="noreferrer"
>
{`${deployment.trigger.commit.hash.slice(
0,
7
)}`}
<OpenInNewIcon className={classes.linkIcon} />
</Link>
)
</span>
</Typography>
<span className={classes.textMargin}>
(
<Link
variant="body2"
href={deployment.trigger.commit.url}
target="_blank"
rel="noreferrer"
>
{`${deployment.trigger.commit.hash.slice(0, 7)}`}
<OpenInNewIcon className={classes.linkIcon} />
</Link>
)
</span>
</Box>
}
/>
Expand Down
2 changes: 2 additions & 0 deletions pkg/app/web/src/components/detail-table-row/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { makeStyles, Typography } from "@material-ui/core";
const useStyles = makeStyles((theme) => ({
head: {
textAlign: "left",
whiteSpace: "nowrap",
display: "block",
},
value: {
marginLeft: theme.spacing(1),
Expand Down
62 changes: 30 additions & 32 deletions pkg/app/web/src/pages/settings/api-key.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,38 +132,36 @@ export const APIKeyPage: FC = memo(function APIKeyPage() {
</Toolbar>
<Divider />

<Box display="flex" height="100%">
<TableContainer component={Paper} square>
<Table size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell colSpan={2}>Name</TableCell>
<TableCell>Role</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>
<TableBody>
{loading ? (
<LoadingSkelton />
) : keys.length === 0 ? (
<EmptyTableContent />
) : (
keys.map((key) => (
<TableRow key={key.id}>
<TableCell colSpan={2}>{key.name}</TableCell>
<TableCell>{API_KEY_ROLE_TEXT[key.role]}</TableCell>
<TableCell align="right">
<IconButton data-id={key.id} onClick={handleOpenMenu}>
<MenuIcon />
</IconButton>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</TableContainer>
</Box>
<TableContainer component={Paper} square>
<Table size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell colSpan={2}>Name</TableCell>
<TableCell>Role</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>
<TableBody>
{loading ? (
<LoadingSkelton />
) : keys.length === 0 ? (
<EmptyTableContent />
) : (
keys.map((key) => (
<TableRow key={key.id}>
<TableCell colSpan={2}>{key.name}</TableCell>
<TableCell>{API_KEY_ROLE_TEXT[key.role]}</TableCell>
<TableCell align="right">
<IconButton data-id={key.id} onClick={handleOpenMenu}>
<MenuIcon />
</IconButton>
</TableCell>
</TableRow>
))
)}
</TableBody>
</Table>
</TableContainer>

<Menu
id="api-key-menu"
Expand Down
43 changes: 20 additions & 23 deletions pkg/app/web/src/pages/settings/environment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
Box,
Button,
Divider,
Drawer,
Expand Down Expand Up @@ -56,29 +55,27 @@ export const SettingsEnvironmentPage: FC = memo(
</Toolbar>
<Divider />

<Box display="flex" height="100%">
<TableContainer component={Paper} square>
<Table aria-label="environment list" size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell>Name</TableCell>
<TableCell colSpan={2}>Description</TableCell>
<TableCell>ID</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>
<TableContainer component={Paper} square>
<Table aria-label="environment list" size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell>Name</TableCell>
<TableCell colSpan={2}>Description</TableCell>
<TableCell>ID</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>

<TableBody>
{envIds.map((envId) => (
<EnvironmentListItem
id={envId}
key={`env-list-item-${envId}`}
/>
))}
</TableBody>
</Table>
</TableContainer>
</Box>
<TableBody>
{envIds.map((envId) => (
<EnvironmentListItem
id={envId}
key={`env-list-item-${envId}`}
/>
))}
</TableBody>
</Table>
</TableContainer>

<Drawer anchor="right" open={isOpenForm} onClose={handleClose}>
<AddEnvForm
Expand Down
22 changes: 16 additions & 6 deletions pkg/app/web/src/pages/settings/piped/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
selectAllPipeds,
} from "../../../modules/pipeds";
import { AppDispatch } from "../../../store";
import { useSettingsStyles } from "../styles";
import { PipedTableRow } from "./piped-table-row";

const useStyles = makeStyles(() => ({
Expand Down Expand Up @@ -79,6 +80,7 @@ const OLD_KEY_ALERT_MESSAGE =

export const SettingsPipedPage: FC = memo(function SettingsPipedPage() {
const classes = useStyles();
const settingsClasses = useSettingsStyles();
const [openFilter, setOpenFilter] = useState(false);
const [isOpenForm, setIsOpenForm] = useState(false);
const [editPipedId, setEditPipedId] = useState<string | null>(null);
Expand Down Expand Up @@ -149,16 +151,24 @@ export const SettingsPipedPage: FC = memo(function SettingsPipedPage() {
</Toolbar>
<Divider />

<Box display="flex" height="100%">
<Box display="flex" flex={1} overflow="hidden">
<TableContainer component={Paper} square>
<Table aria-label="piped list" size="small" stickyHeader>
<TableHead>
<TableRow>
<TableCell>Name</TableCell>
<TableCell>ID</TableCell>
<TableCell>Version</TableCell>
<TableCell>Description</TableCell>
<TableCell>Started At</TableCell>
<TableCell className={settingsClasses.tableCell}>
Name
</TableCell>
<TableCell className={settingsClasses.tableCell}>ID</TableCell>
<TableCell className={settingsClasses.tableCell}>
Version
</TableCell>
<TableCell className={settingsClasses.tableCell}>
Description
</TableCell>
<TableCell className={settingsClasses.tableCell}>
Started At
</TableCell>
<TableCell align="right" />
</TableRow>
</TableHead>
Expand Down
7 changes: 7 additions & 0 deletions pkg/app/web/src/pages/settings/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { makeStyles } from "@material-ui/core";

export const useSettingsStyles = makeStyles({
tableCell: {
whiteSpace: "nowrap",
},
});