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

Reduce global css #2468

Merged
merged 6 commits into from
Oct 29, 2024
Merged

Reduce global css #2468

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ffe599f
Replace remaining global css with css modules
leonardodino Mar 23, 2024
11ab481
SidePanel: remove classes that are passed in via context
leonardodino Mar 27, 2024
877d73b
fix: migrate contents of `SidePanelContext.css` to module file
leonardodino Mar 27, 2024
a595501
Fix CSS selectors for Body component
connor-baer Oct 29, 2024
945b96a
Simplify Modal and SidePanel class names
connor-baer Oct 29, 2024
9e62e12
Also style nested elements
connor-baer Oct 29, 2024
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
4 changes: 2 additions & 2 deletions packages/circuit-ui/components/Body/Body.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@
/* Variants */

.highlight,
strong {
strong.base {
font-weight: var(--cui-font-weight-bold);
}

.quote,
blockquote {
blockquote.base {
padding-left: var(--cui-spacings-kilo);
font-style: italic;
border-left: var(--cui-border-width-mega) solid var(--cui-border-accent);
Expand Down
4 changes: 2 additions & 2 deletions ...cuit-ui/components/ModalContext/Modal.css → ...ents/ModalContext/ModalContext.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* Remove scroll on the body when react-modal is open */
.cui-modal-open {
.open {
height: 100%;
overflow-y: hidden;
-webkit-overflow-scrolling: auto;
}

/* Enable keyboard navigation inside the modal, see https://github.com/reactjs/react-modal/issues/782 */
.cui-modal-portal {
.portal {
position: absolute;
width: 100%;
height: 100%;
Expand Down
7 changes: 3 additions & 4 deletions packages/circuit-ui/components/ModalContext/ModalContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ import { last } from '../../util/helpers.js';
import { warn } from '../../util/logger.js';

import type { BaseModalProps, ModalComponent } from './types.js';
import classes from './ModalContext.module.css';

import './Modal.css';

const PORTAL_CLASS_NAME = 'cui-modal-portal';
const HTML_OPEN_CLASS_NAME = 'cui-modal-open';
const PORTAL_CLASS_NAME = classes.portal;
const HTML_OPEN_CLASS_NAME = classes.open;
// These are the default app element ids in Next.js, Docusaurus, CRA and Storybook.
const APP_ELEMENT_IDS = ['root', '__next', '__docusaurus', 'storybook-root'];

Expand Down
2 changes: 0 additions & 2 deletions packages/circuit-ui/components/SidePanel/SidePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ export const SidePanel = ({
labelledby: headerAriaId,
},
onRequestClose: onBack || onClose,
portalClassName: 'cui-side-panel-portal',
htmlOpenClassName: 'cui-side-panel-open',
bodyOpenClassName: '',
/**
* react-modal relies on document.activeElement to return focus after the modal is closed.
Expand Down
35 changes: 0 additions & 35 deletions packages/circuit-ui/components/SidePanel/SidePanelContext.css
View file
Open in desktop

This file was deleted.

36 changes: 36 additions & 0 deletions packages/circuit-ui/components/SidePanel/SidePanelContext.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
:root {
--side-panel-width: 400px;
}

/* Enable keyboard navigation inside the modal, see https://github.com/reactjs/react-modal/issues/782 */
.portal {
position: fixed;
right: 0;
bottom: 0;
}

@media (max-width: 767px) {
/* Remove scroll on the body when react-modal is open */
.open {
height: 100%;
overflow-y: hidden;
-webkit-overflow-scrolling: auto;
}

/* Enable keyboard navigation inside the modal, see https://github.com/reactjs/react-modal/issues/782 */
.portal {
top: 0;
left: 0;
z-index: var(--cui-z-index-modal);
}
}

/* Enable keyboard navigation inside the modal, see https://github.com/reactjs/react-modal/issues/782 */
@media (min-width: 768px) {
.portal {
top: var(--top-navigation-height, 0);
z-index: var(--cui-z-index-absolute);
width: var(--side-panel-width);
}
}

.base {
width: 100%;
min-height: calc(100vh - var(--top-navigation-height));
Expand Down
4 changes: 2 additions & 2 deletions packages/circuit-ui/components/SidePanel/SidePanelContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import { TRANSITION_DURATION } from './constants.js';
import type { SidePanelHookProps } from './useSidePanel.js';
import classes from './SidePanelContext.module.css';

import './SidePanelContext.css';

// It is important for users of screen readers that other page content be hidden
// (via the `aria-hidden` attribute) while the side panel is open on mobile.
// To allow react-modal to do this, Circuit UI calls `ReactModal.setAppElement`
Expand Down Expand Up @@ -287,6 +285,8 @@ export function SidePanelProvider({
isStacked={isStacked}
onBack={handleBack}
onClose={handleClose}
portalClassName={classes.portal}
htmlOpenClassName={classes.open}
/>
);
})}
Expand Down