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 6 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
3 changes: 1 addition & 2 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,7 +11,7 @@ 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],
Expand Down
9 changes: 0 additions & 9 deletions components/Branding/FontSection/FontSection.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
.fontsList {
list-style: none;
width: 100%;
}

.fontsList > li {
margin: 1rem;
}

.primaryFontFamily div > h6,
.primaryFontFamily div > p {
Copy link
Contributor Author

@subhajit20 subhajit20 Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not find these two classes. @kylemh

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can apply them directly on L22 and L23

font-family: var(--primaryFontFamily), sans-serif;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job on the condition.

Do you see here how it's 2 values separated by a comma?

  1. var(--primaryFontFamily)
  2. sans-serif

That's what's missing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where to set that variable?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the tailwind config

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will it look like this ? ->
fontFamily:{
sans:{
primaryFontFamily:'"DIN Condensed Bold"'
}
}

Copy link
Member

@kylemh kylemh Dec 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

fontFamily: {
  primary: "DIN Condensed Bold"
},

and then you can use font-primary

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done certain changes

Expand Down
2 changes: 1 addition & 1 deletion 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,7 +6,7 @@ exports[`FontSection should render with required props 1`] = `
columns={
Array [
<ul
className="fontsList"
className="list-none w-full [&>li]:m-4"
>
<li>
<div>
Expand Down