diff --git a/.storybook/preview.js b/.storybook/preview.js
index fe6ecba18..d3e5f9115 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -4,7 +4,7 @@ import * as viewports from '@storybook/addon-viewport';
export const decorators = [
Story => (
-
+
),
diff --git a/components/Badge/Badge.js b/components/Badge/Badge.js
index 5558d5d71..95bb7b59a 100644
--- a/components/Badge/Badge.js
+++ b/components/Badge/Badge.js
@@ -1,6 +1,5 @@
import { bool, element, oneOfType, string } from 'prop-types';
import classNames from 'classnames';
-import styles from './Badge.module.css';
Badge.propTypes = {
className: string,
@@ -16,15 +15,30 @@ Badge.defaultProps = {
function Badge({ className, icon, isImageFirst, label }) {
return (
-
+ svg]:fill-current',
+ '[&>svg]:my-4',
+ '[&>img]:mx-0',
+ '[&>img]:h-24',
+ '[&>svg]:mx-0',
+ '[&>svg]:h-24',
+ className,
+ )}
+ >
{isImageFirst ? (
<>
{icon}
- {label}
+ {label}
>
) : (
<>
- {label}
+ {label}
{icon}
>
)}
diff --git a/components/Badge/Badge.module.css b/components/Badge/Badge.module.css
deleted file mode 100644
index 60bc15962..000000000
--- a/components/Badge/Badge.module.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.Badge {
- display: flex;
- flex-direction: column;
- justify-content: flex-start;
- align-items: center;
- margin: 1rem;
-}
-
-.Badge > img,
-.Badge > svg {
- fill: currentcolor;
- height: 100px;
- margin: 1rem 0;
-}
-
-.label {
- text-align: center;
- white-space: nowrap;
-}
diff --git a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap
index 0943d6712..a0b07efb1 100644
--- a/components/Badge/__tests__/__snapshots__/Badge.test.js.snap
+++ b/components/Badge/__tests__/__snapshots__/Badge.test.js.snap
@@ -2,11 +2,11 @@
exports[`Badge should render with many props assigned 1`] = `
Badge Icon
@@ -15,11 +15,11 @@ exports[`Badge should render with many props assigned 1`] = `
exports[`Badge should render with required props 1`] = `
Testing
diff --git a/components/Cards/SchoolCard/SchoolCard.module.css b/components/Cards/SchoolCard/SchoolCard.module.css
index 0fc0e77aa..c048010bd 100644
--- a/components/Cards/SchoolCard/SchoolCard.module.css
+++ b/components/Cards/SchoolCard/SchoolCard.module.css
@@ -1,4 +1,4 @@
-.SchoolCard {
+:global(#__next) .SchoolCard {
width: 330px;
font-family: var(--primaryFontFamily), sans-serif;
border: 1px solid var(--primary);
@@ -12,18 +12,18 @@
}
@media screen and (--large-viewport) {
- .SchoolCard {
+ :global(#__next) .SchoolCard {
width: 300px;
}
}
@media screen and (--small-viewport) {
- .SchoolCard {
+ :global(#__next) .SchoolCard {
width: 75vw;
}
}
-.ribbon {
+:global(#__next) .ribbon {
display: flex;
align-items: center;
justify-content: center;
@@ -41,24 +41,24 @@
z-index: 1;
}
-.ribbon::before {
+:global(#__next) .ribbon::before {
right: 100%;
}
-.ribbon::after {
+:global(#__next) .ribbon::after {
left: 100%;
}
-.gi {
+:global(#__next) .gi {
width: 85px;
background: var(--secondary);
color: var(--primary);
}
-.gi::before,
-.gi::after,
-.dual::before,
-.dual::after {
+:global(#__next) .gi::before,
+:global(#__next) .gi::after,
+:global(#__next) .dual::before,
+:global(#__next) .dual::after {
content: "";
position: absolute;
top: 0;
@@ -68,15 +68,15 @@
background: var(--secondary);
}
-.vettec {
+:global(#__next) .vettec {
width: 85px;
background: var(--primary);
color: var(--secondary);
padding: 1rem 0 0.1rem;
}
-.vettec::before,
-.vettec::after {
+:global(#__next) .vettec::before,
+:global(#__next) .vettec::after {
content: "";
position: absolute;
top: 0;
@@ -86,34 +86,34 @@
background: var(--primary);
}
-.dual {
+:global(#__next) .dual {
width: 40px;
background: var(--secondary);
color: var(--primary);
}
-.cardBrand {
+:global(#__next) .cardBrand {
padding: 0.25rem 0;
margin: 1.5rem 0;
}
-.cardBrand > * {
+:global(#__next) .cardBrand > * {
vertical-align: middle;
}
-.SchoolCard,
-.cardBlock {
+:global(#__next) .SchoolCard,
+:global(#__next) .cardBlock {
box-sizing: border-box;
}
-.cardBlock {
+:global(#__next) .cardBlock {
border-top: 1px solid var(--gray);
display: flex;
padding: 1rem 0.75rem;
width: 100%;
}
-.cardBlockTitle {
+:global(#__next) .cardBlockTitle {
font-weight: bold;
display: block;
margin-right: auto;
@@ -121,11 +121,11 @@
color: var(--secondary);
}
-.cardBlockValue {
+:global(#__next) .cardBlockValue {
font-weight: normal;
}
-.SchoolCard .modalToggler {
+:global(#__next) .modalToggler {
min-width: auto;
text-transform: none;
padding: 2px 6px 0;
@@ -136,19 +136,19 @@
border: 2px solid var(--gray);
}
-.SchoolCard .modalToggler:hover {
+:global(#__next) .modalToggler:hover {
background-color: transparent;
color: var(--secondary);
border-color: var(--gray);
}
@media screen and (--large-viewport) {
- .SchoolCard .modalToggler {
+ :global(#__next) .modalToggler {
margin-top: -5px;
}
}
-.badgeGroup {
+:global(#__next) .badgeGroup {
display: grid;
padding: 0.75rem 0;
width: 100%;
@@ -157,44 +157,44 @@
align-items: center;
}
-.active figcaption::after,
-.inactive figcaption::after {
+:global(#__next) .active figcaption::after,
+:global(#__next) .inactive figcaption::after {
position: absolute;
top: -0.75rem;
right: 1rem;
width: 1.25rem;
}
-.active figcaption::after {
+:global(#__next) .active figcaption::after {
stroke: var(--successDeep);
content: url("/static/images/icons/Custom/check-circle.svg");
}
-.inactive figcaption::after {
+:global(#__next) .inactive figcaption::after {
stroke: var(--errorDeep);
content: url("/static/images/icons/Custom/x-circle.svg");
}
-.badgeGroupItem.inactive {
+:global(#__next) .badgeGroupItem.inactive {
opacity: 0.75;
}
-.badgeGroupItem.inactive figcaption::after {
+:global(#__next) .badgeGroupItem.inactive figcaption::after {
opacity: 1;
}
-.badgeGroupItem {
+:global(#__next) .badgeGroupItem {
margin: 0.75rem 0;
position: relative;
width: 95px;
font-size: 15px;
}
-.badgeGroupItem svg {
+:global(#__next) .badgeGroupItem svg {
height: 32px;
margin: 0;
}
-.badgeGroupItem figcaption {
+:global(#__next) .badgeGroupItem figcaption {
margin-top: 10px;
}
diff --git a/styles/get_involved.module.css b/styles/get_involved.module.css
index 93acba8b4..d9f3524e8 100644
--- a/styles/get_involved.module.css
+++ b/styles/get_involved.module.css
@@ -1,4 +1,4 @@
-.GetInvolved .ctaContainer {
+:global(#__next) .GetInvolved .ctaContainer {
display: flex;
width: 100%;
max-width: var(--typicalMaxWidth);
@@ -6,55 +6,55 @@
flex-wrap: wrap;
}
-.GetInvolved .ctaContainer > * {
+:global(#__next) .GetInvolved .ctaContainer > * {
margin-top: 1rem;
}
-.GetInvolved .topMargin {
+:global(#__next) .GetInvolved .topMargin {
margin-top: 1rem;
}
-.GetInvolved .extraTopMargin {
+:global(#__next) .GetInvolved .extraTopMargin {
margin-top: 2rem;
}
-.GetInvolved .image {
+:global(#__next) .GetInvolved .image {
margin: 2rem;
max-width: 500px;
}
-.GetInvolved .cta {
+:global(#__next) .GetInvolved .cta {
display: flex;
flex-direction: column;
}
-.GetInvolved .centeredText {
+:global(#__next) .GetInvolved .centeredText {
text-align: center;
}
-.GetInvolved .image img {
+:global(#__next) .GetInvolved .image img {
max-width: 100%;
opacity: 0;
transition: opacity 1s;
}
-.GetInvolved .showImage img {
+:global(#__next) .GetInvolved .showImage img {
opacity: 1;
}
-.GetInvolved .badgeGroupings {
+:global(#__next) .GetInvolved .badgeGroupings {
display: flex;
flex-wrap: wrap;
justify-content: center;
margin-top: -1rem;
}
-.GetInvolved .badge {
+:global(#__next) .GetInvolved .badge {
margin: 1rem 4rem;
}
@media screen and (--medium-viewport) {
- .GetInvolved .heroBannerMobilePositioning {
+ :global(#__next) .GetInvolved .heroBannerMobilePositioning {
background-position: 60% center;
}
}