Skip to content

fix(BBBModal, BBButton): follow the BBB client dark theme and border color when colors are overridden #94

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
Arthurk12 merged 2 commits into from
Oct 1, 2026
Merged

fix(BBBModal, BBButton): follow the BBB client dark theme and border color when colors are overridden #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc5019
fix(BBBModal): follow the BBB client dark theme for the modal background
Arthurk12 Sep 30, 2026
2344ef7
fix(BBButton): follow --color-primary in the secondary variant border
Arthurk12 Sep 30, 2026
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
5 changes: 2 additions & 3 deletions src/components/Modal/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useCallback } from 'react';
import ReactModal from 'react-modal';
import * as Styled from './styles';
import { BBBTypography } from '../Typography';
import { MdClose } from 'react-icons/md';
Expand Down Expand Up @@ -49,7 +48,7 @@ const Modal: React.FC<ModalProps> = ({
), [footerContent, showDividers]);

return (
<ReactModal
<Styled.Modal
{...rest}
isOpen={isOpen}
onRequestClose={onRequestClose}
Expand Down Expand Up @@ -87,7 +86,7 @@ const Modal: React.FC<ModalProps> = ({
{!noFooter && !stickyFooter && renderFooter(stickyFooter)}
</Styled.ModalScrollArea>
{!noFooter && stickyFooter && renderFooter(stickyFooter)}
</ReactModal>
</Styled.Modal>
)
}

Expand Down
8 changes: 6 additions & 2 deletions src/components/Modal/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import { Styles } from 'react-modal';
import ReactModal, { Styles } from 'react-modal';
import * as React from 'react';
import { spacingLarge, spacingMedium, spacingSmallMedium, borderRadiusDefault } from '../../stylesheets/sizing';
import { colorWhite, colorOverlay } from '../../stylesheets/palette';
Expand All @@ -25,7 +25,6 @@ export const modalStyles: Styles = {
right: 'auto',
bottom: 'auto',
borderRadius: borderRadiusDefault,
background: colorWhite,
overflow: 'hidden',
WebkitOverflowScrolling: 'touch',
outline: 'none',
Expand Down Expand Up @@ -73,3 +72,8 @@ export const ModalFooter = styled.div<StyledModalFooterProps>`
background-color: ${colorWhite};
`}
`;

// Background lives in a class instead of the inline `style` so the BBB dark theme and consumers can override it.
export const Modal = styled(ReactModal)`
background: ${colorWhite};
`;
6 changes: 4 additions & 2 deletions src/stylesheets/palette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
export const colorNeutral2 = 'var(--color-neutral-2, #717C91)';
export const colorNeutral3 = 'var(--color-neutral-3, #B0BDC9)';
export const colorNeutral4 = 'var(--color-neutral-4, #DCE4EC)';
export const colorWhite = 'var(--color-neutral-white, #FFFFFF)';
export const colorLightGray = 'var(--color-light-gray, #F4F6FA)';
export const colorGray = 'var(--color-gray, #4E5A66)';
export const colorDarkGray = 'var(--color-dark-gray, #393C48)';
const colorWhite_base = 'var(--color-neutral-white, #FFFFFF)';
// Mapped to core css vars
export const colorWhite = `var(--color-white, ${colorWhite_base})`;

// Brand colors
// Last-resort fallbacks mirror bigbluebutton-html5's palette so that a client
Expand Down Expand Up @@ -39,7 +41,7 @@ export const colorBackgroundBlue = `var(--color-background-blue, ${colorBrandLig

// Border colors
const colorBorderDefault_base = `var(--color-border-default, ${colorNeutral3})`;
export const colorBorderSelected = `var(--color-border-selected, ${colorBrand1_base})`;
export const colorBorderSelected = `var(--color-border-selected, ${colorBrand1})`;
export const colorBorderError = `var(--color-border-error, ${colorError_base})`;
// Mapped to core css vars
export const colorBorderDefault = `var(--default-border, ${colorBorderDefault_base})`;
Expand Down
Loading