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

Replaced all the css into tailwind css on FontSection component #1784

Merged
merged 10 commits into from
Dec 14, 2023
Merged

Replaced all the css into tailwind css on FontSection component #1784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5fe4e4e
Replaced all the css into tailwind css onColorSection component
subhajit20 Dec 4, 2023
5b737f3
Replaced all the css into tailwind css on Swatch component
subhajit20 Dec 5, 2023
3f2a153
Merge branch 'main' into 1725/Branding
subhajit20 Dec 5, 2023
dcb6ea9
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 6, 2023
b9353ac
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 6, 2023
98df731
Merge branch 'main' into 1725/Branding
subhajit20 Dec 6, 2023
2f7a247
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 7, 2023
6185f3a
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 8, 2023
8ea8de1
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 12, 2023
4143dce
Replaced all the css into tailwind css on FontSection component
subhajit20 Dec 12, 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
11 changes: 8 additions & 3 deletions components/Branding/FontSection/FontSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Content from 'components/Content/Content';
import { fontsObject } from 'common/styles/styleExports';
import styles from './FontSection.module.css';

function FontSection() {
// Every letter of the alphabet in one string
Expand All @@ -12,14 +11,20 @@ function FontSection() {
theme="gray"
hasTitleUnderline
columns={[
<ul className={styles.fontsList}>
<ul className="list-none w-full [&>li]:m-4">
{Object.keys(fontsObject).map(item => {
const fontStyle = {
fontFamily: fontsObject[item],
};
return (
<li key={item}>
<div>
<div
className={
fontsObject[item] === 'DIN Condensed Bold'
? '[&>p]:font-serif [&>h6]:font-serif [&>p]:font-primaryFontFamily [&>h6]:font-primaryFontFamily'
: '[&>p]:font-sans [&>p]:font-secondaryFontFamily [&>h6]:font-sans [&>h6]:font-secondaryFontFamily'
}
>
<h6 style={fontStyle}>{fontsObject[item]}</h6>
<p style={fontStyle}>{demoText}</p>
</div>
Expand Down
18 changes: 0 additions & 18 deletions components/Branding/FontSection/FontSection.module.css
View file
Open in desktop

This file was deleted.

10 changes: 7 additions & 3 deletions components/Branding/FontSection/__tests__/__snapshots__/FontSection.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ exports[`FontSection should render with required props 1`] = `
columns={
Array [
<ul
className="fontsList"
className="list-none w-full [&>li]:m-4"
>
<li>
<div>
<div
className="[&>p]:font-serif [&>h6]:font-serif [&>p]:font-primaryFontFamily [&>h6]:font-primaryFontFamily"
>
<h6
style={
Object {
Expand All @@ -31,7 +33,9 @@ exports[`FontSection should render with required props 1`] = `
</div>
</li>
<li>
<div>
<div
className="[&>p]:font-sans [&>p]:font-secondaryFontFamily [&>h6]:font-sans [&>h6]:font-secondaryFontFamily"
>
<h6
style={
Object {
Expand Down
4 changes: 4 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ module.exports = {
maxWidth: {
girderWidth: '700px',
},
fontFamily: {
primaryFontFamily: '"DIN Condensed Bold"',
secondaryFontFamily: '"Encode Sans"',
},
},
plugins: [
plugin(({ matchUtilities, theme }) => {
Expand Down