Skip to content

Switch to tailwind #162

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.

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

Merged
merged 16 commits into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ COPY . /code/

# Build JS/static assets
RUN --mount=type=cache,target=/root/.npm npm install
RUN npm run build
RUN npm run dist

RUN python manage.py collectstatic --noinput --clear

Expand Down
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ This is the repository for the San Diego Python website at [sandiegopython.org](

```shell
pip install -r requirements/local.txt # Install local Python requirements
npm install # Install node dependencies for CSS/JS compiling
npm run build # Build CSS/JS
npm install # Install JS dependencies for frontend CSS/JS
npm run build # Build CSS (continuously with `npm run watch`)
pre-commit install # Setup code standard pre-commit hook
./manage.py migrate # Create a local development database
./manage.py createsuperuser # Create a local development administrator user
Expand Down
19 changes: 0 additions & 19 deletions assets/src/index.js

This file was deleted.

42 changes: 42 additions & 0 deletions assets/src/input.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
@tailwind base;

/* https://tailwindcss.com/docs/preflight#extending-preflight */
/* https://tailwindcss.com/docs/adding-custom-styles#adding-base-styles */
@layer base {
h1 {
@apply text-4xl;
}
h2 {
@apply text-2xl;
}
h3 {
@apply text-xl;
}

a {
@apply text-sky-600;
}
a:hover, a:active {
@apply underline;
}

blockquote,
dl,
dd,
h1,
h2,
h3,
h4,
h5,
h6,
hr,
figure,
p,
ul,
pre {
@apply mb-4;
}
}

@tailwind components;
@tailwind utilities;
35 changes: 0 additions & 35 deletions assets/src/sass/_theme.scss

This file was deleted.

1 change: 0 additions & 1 deletion assets/src/sass/_variables.scss

This file was deleted.

4 changes: 0 additions & 4 deletions assets/src/sass/index.scss

This file was deleted.

3 changes: 3 additions & 0 deletions config/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
STATICFILES_DIRS = [
os.path.join(BASE_DIR, "assets", "dist"),
os.path.join(BASE_DIR, "pythonsd", "static"),
# Only available after running `npm install`
os.path.join(BASE_DIR, "node_modules/htmx.org/dist"),
os.path.join(BASE_DIR, "node_modules/hyperscript.org/dist"),
]

STORAGES = {
Expand Down
Loading
Loading