Skip to content

Commit

Permalink
attempt to fix tialwind issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Jwyman328 committed Mar 3, 2024
1 parent e1f97ce commit 36872d1
Show file tree
Hide file tree
Showing 7 changed files with 151 additions and 70 deletions.
6 changes: 3 additions & 3 deletions .erb/configs/webpack.config.renderer.dev.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ const configuration: webpack.Configuration = {
include: /\.module\.s?(c|a)ss$/,
},
{
test: /\.s?css$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
exclude: /\.module\.s?(c|a)ss$/,
test: /\.css$/,
include: [webpackPaths.srcRendererPath],
use: ['style-loader', 'css-loader', 'postcss-loader'],
},
// Fonts
{
Expand Down
156 changes: 137 additions & 19 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"@types/webpack-bundle-analyzer": "^4.6.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"autoprefixer": "^10.4.18",
"browserslist-config-erb": "^0.0.3",
"chalk": "^4.1.2",
"concurrently": "^8.2.1",
Expand Down Expand Up @@ -151,6 +152,7 @@
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"mini-css-extract-plugin": "^2.7.6",
"postcss-loader": "^8.1.1",
"prettier": "^3.0.3",
"react-refresh": "^0.14.0",
"react-test-renderer": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ module.exports = {
require('autoprefixer'),

Check failure on line 4 in postcss.config.js

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

Unexpected require()
]

Check failure on line 5 in postcss.config.js

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest)

Replace `····]⏎··}⏎` with `};`
}

41 changes: 3 additions & 38 deletions src/app/App.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,3 @@
.App {
text-align: center;
}

.App-logo {
height: 40vmin;
pointer-events: none;
}

@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}

.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
@tailwind base;
@tailwind components;
@tailwind utilities;
2 changes: 1 addition & 1 deletion src/app/pages/WalletSignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const WalletSignIn = () => {
return (
<div>
sign in bitch
<button type="button" onClick={signIn}>
<button className="ml-4 text-red-500" type="button" onClick={signIn}>
Sign in here
</button>
</div>
Expand Down
12 changes: 4 additions & 8 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
/** @type {import('tailwindcss').Config} */
module.exports = {
content: [
"./src/**/*.{js,jsx,ts,tsx}",
],
theme: {
extend: {},
},
content: ['./src/renderer/**/*.{js,jsx,ts,tsx}'],
theme: {},
variants: {},
plugins: [],
}

};

0 comments on commit 36872d1

Please sign in to comment.