Skip to content

chore: adjust the style and wording of the license page #7396

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 2 commits into from
May 14, 2023
Merged

chore: adjust the style and wording of the license page #7396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20c3d7e
chore: adjust the style and wording of the license page
kylecarbs May 3, 2023
da0ddda
Merge branch 'main' into licensestyle
kylecarbs May 14, 2023
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
Prev Previous commit
Merge branch 'main' into licensestyle
  • Loading branch information
@kylecarbs
kylecarbs committed May 14, 2023
commit da0ddda681db80a819d55a71af3e510343db342d
8 changes: 4 additions & 4 deletions site/src/components/LicenseCard/LicenseCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Button from "@material-ui/core/Button"
import Paper from "@material-ui/core/Paper"
import { makeStyles } from "@material-ui/core/styles"
import Button from "@mui/material/Button"
import Paper from "@mui/material/Paper"
import { makeStyles } from "@mui/styles"
import { License } from "api/typesGenerated"
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
import { Stack } from "components/Stack/Stack"
Expand Down Expand Up @@ -120,7 +120,7 @@ const useStyles = makeStyles((theme) => ({
color: theme.palette.text.secondary,
},
secondaryMaincolor: {
color: theme.palette.text.hint,
color: theme.palette.text.secondary,
},
removeButton: {
height: "17px",
Expand Down
5 changes: 2 additions & 3 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { AlertBanner } from "components/AlertBanner/AlertBanner"
import { Fieldset } from "components/DeploySettingsLayout/Fieldset"
import { Header } from "components/DeploySettingsLayout/Header"
import { FileUpload } from "components/FileUpload/FileUpload"
import KeyboardArrowLeft from "@material-ui/icons/KeyboardArrowLeft"
import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft"
import { displayError } from "components/GlobalSnackbar/utils"
import { Stack } from "components/Stack/Stack"
import { DividerWithText } from "pages/DeploySettingsPage/LicensesSettingsPage/DividerWithText"
Expand Down Expand Up @@ -59,9 +59,8 @@ export const AddNewLicensePageView: FC<AddNewLicenseProps> = ({
/>
<Button
component={RouterLink}
to="/settings/deployment/licenses"
variant="outlined"
startIcon={<KeyboardArrowLeft />}
to="/settings/deployment/licenses"
>
All Licenses
</Button>
Expand Down
9 changes: 4 additions & 5 deletions site/src/pages/DeploySettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Button from "@material-ui/core/Button"
import { makeStyles, useTheme } from "@material-ui/core/styles"
import AddIcon from "@material-ui/icons/AddOutlined"
import Skeleton from "@material-ui/lab/Skeleton"
import Button from "@mui/material/Button"
import { makeStyles, useTheme } from "@mui/styles"
import Skeleton from "@mui/material/Skeleton"
import AddIcon from "@mui/icons-material/AddOutlined"
import { GetLicensesResponse } from "api/api"
import { Header } from "components/DeploySettingsLayout/Header"
import { LicenseCard } from "components/LicenseCard/LicenseCard"
Expand Down Expand Up @@ -55,7 +55,6 @@ const LicensesSettingsPageView: FC<Props> = ({
/>

<Button
variant="outlined"
component={Link}
to="/settings/deployment/licenses/add"
startIcon={<AddIcon />}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.