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

fix: MUI Theme Base CSS Styles #9636

Merged
merged 3 commits into from
Sep 7, 2023
Merged

fix: MUI Theme Base CSS Styles #9636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c31dfed
fix body styles
bnussman Sep 6, 2023
40d5a1d
Merge branch 'develop' into fix/mui-theme-body-styles
bnussman Sep 6, 2023
990e8a1
fix font size in tables @abailly-akamai
bnussman Sep 6, 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
1 change: 1 addition & 0 deletions packages/manager/src/components/PrimaryNav/PrimaryNav.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const useStyles = makeStyles<void, 'linkItem'>()(
color: '#fff',
display: 'flex',
fontFamily: 'LatoWebBold', // we keep this bold at all times
fontSize: '1rem',
Copy link
Member Author

Choose a reason for hiding this comment

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

Fixes fontSize regression

opacity: 1,
position: 'relative',
transition: theme.transitions.create(['color']),
Expand Down
1 change: 1 addition & 0 deletions packages/manager/src/features/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ interface Props {
const useStyles = makeStyles()((theme: Theme) => ({
container: {
backgroundColor: theme.bg.main,
fontSize: '1rem',
Copy link
Member Author

Choose a reason for hiding this comment

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

Fixes fontSize regression

margin: 0,
padding: '4px 0px',
[theme.breakpoints.down('sm')]: {
Expand Down
1 change: 1 addition & 0 deletions packages/manager/src/foundations/themes/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ export const darkTheme: ThemeOptions = {
name: 'dark',
palette: {
background: {
default: customDarkModeOptions.bg.app,
paper: '#2e3238',
},
divider: primaryColors.divider,
Expand Down
3 changes: 3 additions & 0 deletions packages/manager/src/foundations/themes/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@ export const lightTheme: ThemeOptions = {
},
name: 'light', // @todo remove this because we leverage pallete.mode now
palette: {
background: {
default: bg.app,
},
divider: primaryColors.divider,
error: {
dark: '#cd2227',
Expand Down
2 changes: 2 additions & 0 deletions packages/manager/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import LinodeThemeWrapper from './LinodeThemeWrapper';
import { loadDevTools, shouldEnableDevTools } from './dev-tools/load';
import './index.css';
import { queryClientFactory } from './queries/base';
import CssBaseline from '@mui/material/CssBaseline';

const queryClient = queryClientFactory();
const store = storeFactory(queryClient);
Expand Down Expand Up @@ -58,6 +59,7 @@ const ContextWrapper = () => (
<ReduxStoreProvider store={store}>
<QueryClientProvider client={queryClient}>
<LinodeThemeWrapper>
<CssBaseline />
<React.Suspense fallback={<SplashScreen />}>
<Switch>
<Route component={OAuthCallbackPage} exact path="/oauth/callback" />
Expand Down