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

feat: extend font family w/ desired font: inter #62

Merged
merged 3 commits into from
Oct 25, 2023
Merged

feat: extend font family w/ desired font: inter #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29da291
feat: extend font family w/ desired font: inter
Ademsk1 Oct 25, 2023
675dc10
fix: newline
Ademsk1 Oct 25, 2023
3e03e6e
Merge branch 'main' into feat/#60_fonts
Ademsk1 Oct 25, 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
1 change: 1 addition & 0 deletions src/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Inter&display=swap');
@tailwind base;
@tailwind components;
@tailwind utilities;
1 change: 1 addition & 0 deletions stories/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@import url('https://fonts.googleapis.com/css2?family=Inter&display=swap');
@config "./tailwind.config.js";

@tailwind base;
Expand Down
4 changes: 4 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Copy link
Member

@ergusto ergusto Oct 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This is definitely a personal opinion thing and a very, VERY nitpicky/minor point, but in general I think it looks neater and is more readable to leave an empty newline between imports and the rest of the file.

Like:

/** @type {import('tailwindcss').Config} */
import colors from './src/colors'
import defaultTheme from 'tailwindcss/defaultTheme'

module.exports = {
  content: ['./src/**/*.tsx'],

Approving anyway though so up to you if you want to leave it as is or update it.

Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
/** @type {import('tailwindcss').Config} */
import colors from './src/colors'
import defaultTheme from 'tailwindcss/defaultTheme'

module.exports = {
content: ['./src/**/*.tsx'],
theme: {
colors: colors,
extend: {
fontFamily: {
sans: ['"Inter"', ...defaultTheme.fontFamily.sans]
},
strokeWidth: {
3: '4px',
4: '6px'
Expand Down
Loading