Skip to content

Commit

Permalink
Merge pull request #369 from GeekZoneHQ/tailwind-2.0-adjustments
Browse files Browse the repository at this point in the history
Manual changes for django-tailwind 2.0.0
  • Loading branch information
tbentham authored Sep 19, 2021
2 parents d662453 + 698b292 commit a00d665
Show file tree
Hide file tree
Showing 13 changed files with 341,104 additions and 3,278 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,6 @@ dmypy.json
.idea/
.idea/workspace.xml
.idea/workspace.xml

# Exception for Tailwind CSS
!theme/static/css/dist/
2 changes: 1 addition & 1 deletion memberships/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>Geek.Zone Membership Management</title>
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<link rel="stylesheet" href="{% static 'css/dist/styles.css' %}">
</head>
<body class="flex flex-col items-stretch min-h-screen font-sans text-gray-600 dark:text-gray-400 bg-white dark:bg-gray-800" onload="checkDarkMode()">
<script type="text/javascript" src="{% static 'js/main.js' %}"></script>
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The above instructions should be enough to get the Django server running, and th

> All commands in this section need to be run in the virtual environment.
The website currently uses Tailwind CSS to style the front end. Tailwind works by generating a stylesheet at `theme/static/css/styles.css`, using settings located in `theme/static_src` (with base styles at `theme/static_src/src/styles.scss`).
The website currently uses Tailwind CSS to style the front end. Tailwind works by generating a stylesheet at `theme/static/css/dist/styles.css`, using settings located in `theme/static_src` (with base styles at `theme/static_src/src/styles.scss`).

A development build of `styles.css` already exists in the repository, containing all possible Tailwind base styles. Therefore, only install and run Tailwind if you plan on making changes to settings or base styles at `theme/static_src` (or you want to generate a production build of `styles.css`). You do not need to install and run Tailwind to make simple styling changes.

Expand Down
Loading

0 comments on commit a00d665

Please sign in to comment.