Skip to content

Commit

Permalink
Modal css fixes (#3429)
Browse files Browse the repository at this point in the history
  • Loading branch information
@allisonking
allisonking authored Jun 2, 2023
1 parent c3b9e61 commit 2323f1d
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 96 deletions.
1 change: 0 additions & 1 deletion clients/fides-js/src/components/ConsentBanner.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { h, FunctionComponent } from "preact";
import { useState, useEffect } from "preact/hooks";
import { ButtonType, ExperienceConfig } from "../lib/consent-types";
import Button from "./Button";
import "../lib/overlay.module.css";
import { useHasMounted } from "../lib/hooks";

interface BannerProps {
Expand Down
2 changes: 1 addition & 1 deletion clients/fides-js/src/components/ConsentModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const ConsentModal = ({
<h1 data-testid="modal-header" className="modal-header">
{experience.component_title}
</h1>
<p data-testid="modal-description">
<p data-testid="modal-description" className="modal-description">
{experience.component_description}
</p>
<div className="modal-notices">
Expand Down
2 changes: 2 additions & 0 deletions clients/fides-js/src/components/Overlay.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import { updateConsentPreferences } from "../lib/preferences";
import { transformConsentToFidesUserPreference } from "../lib/consent-utils";
import { FidesCookie } from "../lib/cookie";

import "../lib/overlay.module.css";

export interface OverlayProps {
options: FidesOptions;
experience: PrivacyExperience;
Expand Down
197 changes: 103 additions & 94 deletions clients/fides-js/src/lib/overlay.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,30 @@
);

/* Everything else */
--fides-consent-overlay-font-family: "inherit";
--fides-consent-overlay-font-size-body: 12px;
--fides-consent-overlay-font-size-title: 16px;
--fides-consent-overlay-font-size-buttons: 14px;
--fides-consent-overlay-padding: 0.75em 2em 1em;
--fides-consent-overlay-font-family: Inter, sans-serif;
--fides-consent-overlay-font-size-body: 1em;
--fides-consent-overlay-font-size-title: 1.1em;
--fides-consent-overlay-font-size-buttons: 0.9em;
--fides-consent-overlay-padding: 1.5em;
--fides-consent-overlay-button-border-radius: 4px;
--fides-consent-overlay-button-padding: 0.5em 1em;
--fides-consent-overlay-component-border-radius: 0px;
}

div#fides-overlay {
font-family: var(--fides-consent-overlay-font-family);
font-size: var(--fides-consent-overlay-font-size-body);

/* CSS reset values, adapted from https://www.joshwcomeau.com/css/custom-css-reset/ */
line-height: calc(1em + 0.5rem);
-webkit-font-smoothing: antialiased;
}

#fides-consent-modal-link {
display: none;
}

div#fides-consent-banner {
font-family: var(--fides-consent-overlay-font-family);
font-size: var(--fides-consent-overlay-font-size-body);
background: var(--fides-consent-overlay-background-color);
color: var(--fides-consent-overlay-body-font-color);
box-sizing: border-box;
Expand Down Expand Up @@ -151,7 +158,6 @@ button.fides-consent-banner-button {
border: 1px solid;

font-family: inherit;
font-size: 100%;
line-height: 1.15;
text-decoration: none;
}
Expand Down Expand Up @@ -215,16 +221,21 @@ div#fides-consent-modal {
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}

.modal-header {
text-align: center;
font-size: var(--fides-consent-overlay-font-size-title);
color: var(--fides-consent-overlay-title-font-color);
}
div#fides-consent-modal .modal-header {
text-align: center;
font-weight: 600;
font-size: var(--fides-consent-overlay-font-size-title);
color: var(--fides-consent-overlay-title-font-color);
}

.modal-button-group {
display: flex;
}
div#fides-consent-modal .modal-description {
margin: 1em 0 1em 0;
}

div#fides-consent-modal .modal-button-group {
display: flex;
}

.modal-overlay {
Expand Down Expand Up @@ -254,81 +265,81 @@ div#fides-consent-modal {
flex-wrap: wrap;
position: relative;
gap: 1ch;
}

.toggle-input {
position: absolute;
opacity: 0;
width: 100%;
height: 100%;
z-index: 4;
cursor: pointer;
}
.toggle .toggle-input {
position: absolute;
opacity: 0;
width: 100%;
height: 100%;
z-index: 4;
cursor: pointer;
}

.toggle-display {
--offset: 0.1em;
--diameter: 1em;
.toggle .toggle-display {
--offset: 0.1em;
--diameter: 1em;

display: inline-flex;
align-items: center;
justify-content: space-around;
display: inline-flex;
align-items: center;
justify-content: space-around;

width: calc(var(--diameter) * 2 + var(--offset) * 2);
height: calc(var(--diameter) + var(--offset) * 2);
box-sizing: content-box;
width: calc(var(--diameter) * 2 + var(--offset) * 2);
height: calc(var(--diameter) + var(--offset) * 2);
box-sizing: content-box;

position: relative;
border-radius: 100vw;
background-color: var(--fides-consent-overlay-inactive-color);
transition: 250ms;
}
position: relative;
border-radius: 100vw;
background-color: var(--fides-consent-overlay-inactive-color);
transition: 250ms;
}

.toggle-display::before {
content: "";
.toggle .toggle-display::before {
content: "";

width: var(--diameter);
height: var(--diameter);
border-radius: 50%;
width: var(--diameter);
height: var(--diameter);
border-radius: 50%;

box-sizing: border-box;
box-sizing: border-box;

position: absolute;
z-index: 3;
top: 50%;
left: var(--offset);
transform: translate(0, -50%);
position: absolute;
z-index: 3;
top: 50%;
left: var(--offset);
transform: translate(0, -50%);

background-color: #fff;
transition: inherit;
}
background-color: #fff;
transition: inherit;
}

/* Checked/unchecked states */
.toggle-input:checked + .toggle-display {
background-color: var(--fides-consent-overlay-primary-active-color);
}
.toggle-input:checked + .toggle-display::before {
transform: translate(100%, -50%);
}
/* Checked/unchecked states */
.toggle .toggle-input:checked + .toggle-display {
background-color: var(--fides-consent-overlay-primary-active-color);
}
.toggle .toggle-input:checked + .toggle-display::before {
transform: translate(100%, -50%);
}

/* Disabled state */
.toggle-input:disabled {
cursor: not-allowed;
}
.toggle-input:disabled + .toggle-display {
background-color: var(--fides-consent-overlay-disabled-color);
}
.toggle-input:disabled:checked + .toggle-display {
background-color: var(
--fides-consent-overlay-primary-active-disabled-color
);
}
/* Disabled state */
.toggle .toggle-input:disabled {
cursor: not-allowed;
}
.toggle .toggle-input:disabled + .toggle-display {
background-color: var(--fides-consent-overlay-disabled-color);
}
.toggle .toggle-input:disabled:checked + .toggle-display {
background-color: var(--fides-consent-overlay-primary-active-disabled-color);
}

/* Focus ring when using keyboard */
.toggle-input:focus + .toggle-display {
outline: 1px auto -webkit-focus-ring-color;
}
.toggle-input:focus:not(:focus-visible) + .toggle-display {
outline: 0;
}
/* Focus ring when using keyboard */
.toggle .toggle-input:focus + .toggle-display {
/* Firefox only has Highlight, not -webkit-focus-ring-color */
outline: 1px auto Highlight;
outline: 1px auto -webkit-focus-ring-color;
}
.toggle .toggle-input:focus:not(:focus-visible) + .toggle-display {
outline: 0;
}

/* Divider */
Expand All @@ -348,25 +359,23 @@ div#fides-consent-modal {
margin-bottom: 0px;
}

.notice-toggle {
.notice-toggle-title {
padding: 0.5em;
display: flex;
justify-content: space-between;
}
.notice-toggle .notice-toggle-title {
padding: 0.5em;
display: flex;
justify-content: space-between;
}

.notice-toggle-trigger {
width: 100%;
}
.notice-toggle .notice-toggle-trigger {
width: 100%;
}

.notice-toggle-title:hover {
cursor: pointer;
background-color: var(--fides-consent-overlay-row-hover-color);
}
.notice-toggle .notice-toggle-title:hover {
cursor: pointer;
background-color: var(--fides-consent-overlay-row-hover-color);
}

.disclosure-visible {
padding-left: 0.5em;
}
.notice-toggle .disclosure-visible {
padding-left: 0.5em;
}

.notice-toggle-expanded {
Expand Down

0 comments on commit 2323f1d

Please sign in to comment.