Skip to content

Commit

Permalink
added tailwind; added prefix for tailwind so it will work well with …
Browse files Browse the repository at this point in the history
…bootstrap
  • Loading branch information
jeromehardaway committed Mar 27, 2023
1 parent f12329e commit 76989fd
Show file tree
Hide file tree
Showing 9 changed files with 561 additions and 46,299 deletions.
46,823 changes: 527 additions & 46,296 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
"@swc/jest": "0.2.17",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/react": "12.1.2",
"autoprefixer": "^10.4.14",
"babel-eslint": "10.1.0",
"babel-jest": "27.3.1",
"babel-loader": "^8.2.3",
Expand All @@ -91,10 +92,12 @@
"msw": "0.36.8",
"node-mocks-http": "1.11.0",
"npm-run-all": "4.1.5",
"postcss": "^8.4.21",
"prettier": "2.4.1",
"pretty-quick": "3.1.2",
"react-test-renderer": "17.0.2",
"regenerator-runtime": "0.13.9",
"storybook-dark-mode": "1.0.9"
"storybook-dark-mode": "1.0.9",
"tailwindcss": "^3.2.7"
}
}
6 changes: 6 additions & 0 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
3 changes: 3 additions & 0 deletions src/assets/css/globals.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import 'tailwindcss/base';
@import 'tailwindcss/components';
@import 'tailwindcss/utilities';
1 change: 1 addition & 0 deletions src/assets/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
@import 'css/pagination.css';
@import 'css/toggle.css';
@import 'css/video.css';
@import 'css/globals.css';
4 changes: 2 additions & 2 deletions src/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ function Header() {
<div className="valign-center">
<div className="container">
<div className="col-md-10 col-md-offset-1">
<div className="intro text-left" style={{ color: '#fff' }}>
<h1 className="subtitle">Vets Who Code</h1>
<div className="intro">
<h1 className="subtitle tw-text-left tw-text-6xl tw-font-bold">Vets Who Code</h1>
<h2>
<Typed
style={{ fontFamily: 'Gotham, sans-serif' }}
Expand Down
1 change: 1 addition & 0 deletions src/components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { ToastContainer } from 'react-toastify'
import ThemeProvider from '../store/ThemeProvider'
import Nav from './Nav'
import Footer from './Footer'
import './globals.css'

const TemplateWrapper = ({ children }) => (
<div>
Expand Down
1 change: 1 addition & 0 deletions src/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'react-toastify/dist/ReactToastify.css'
import '../assets/lib/bootstrap/dist/css/bootstrap.css'
import '../assets/lib/bootstrap/dist/css/bootstrap-theme.css'

import '../assets/css/globals.css'
import '../assets/css/main.css'
import '../assets/css/custom.css'
import '../assets/css/nav.css'
Expand Down
16 changes: 16 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
prefix: 'tw-', // Note the prefix change.
content: [
'./app/**/*.{js,ts,jsx,tsx}', // Note the addition of the `app` directory.
'./pages/**/*.{js,ts,jsx,tsx}',
'./components/**/*.{js,ts,jsx,tsx}',

// Or if using `src` directory:
'./src/**/*.{js,ts,jsx,tsx}',
],
theme: {
extend: {},
},
plugins: [],
}

0 comments on commit 76989fd

Please sign in to comment.