Skip to content

Add djlint for HTML / CSS / JS formatting #84

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

Merged
BryceStevenWilley merged 1 commit into from
Feb 24, 2026
Merged

Add djlint for HTML / CSS / JS formatting #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,21 @@ jobs:
# No per-check installs needed; everything is managed by uv

# ruff
- name: Ruff format (check only)
- name: Formatting (check only)
if: matrix.check == 'ruff'
working-directory: efile_app
run: uv run ruff format --check .
run: |
uv run ruff format --check .
uv run djlint --check .
git ls-files '*.css' | xargs -n 1 --verbose bash -c 'diff -ru "$0" <(uv run css-beautify "$0")'
git ls-files '*.js' | xargs -n 1 --verbose bash -c 'diff -ru "$0" <(uv run js-beautify "$0")'

- name: Ruff lint
if: matrix.check == 'ruff'
working-directory: efile_app
run: uv run ruff check .
run: |
uv run ruff check .
uv run djlint .

# type checking
- name: Type check (ty)
Expand Down
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,18 @@ Ruff is configured in `pyproject.toml` under `[tool.ruff]`.
- Lint the codebase:
```bash
uv run ruff check .
uv run djlint .
```
- Auto-format (optional):
- Auto-format:
```bash
uv run ruff format .
```
- Auto-format HTML, JS, and CSS
```bash
uv run djlint --reformat .
uv run css-beautify -r efile/static/css/*.css
uv run js-beautify -r efile/static/js/*.js
```

Notes: Ruff targets Python 3.10, line length 120, and excludes Django migrations (`**/migrations/*`).

Expand Down
221 changes: 111 additions & 110 deletions efile_app/efile/static/css/components/search-dropdown.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,174 +1,175 @@
/* Search Dropdown Component Styles */

.search-dropdown-container {
position: relative;
position: relative;
}

.search-dropdown-input {
width: 100%;
border-radius: 0.375rem;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
width: 100%;
border-radius: 0.375rem;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
}

.search-dropdown-input:focus {
border-color: #86b7fe;
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
border-color: #86b7fe;
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}

.search-dropdown-input:disabled {
background-color: #e9ecef;
opacity: 0.65;
cursor: not-allowed;
background-color: #e9ecef;
opacity: 0.65;
cursor: not-allowed;
}

.search-dropdown-results {
position: absolute;
top: 100%;
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #ced4da;
border-top: none;
border-radius: 0 0 0.375rem 0.375rem;
max-height: 200px;
overflow-y: auto;
z-index: 999;
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
margin-top: 0;
position: absolute;
top: 100%;
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #ced4da;
border-top: none;
border-radius: 0 0 0.375rem 0.375rem;
max-height: 200px;
overflow-y: auto;
z-index: 999;
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
margin-top: 0;
}

.search-dropdown-item {
padding: 0.75rem;
cursor: pointer;
border-bottom: 1px solid #f8f9fa;
transition: background-color 0.15s ease-in-out;
background-color: #ffffff;
color: #212529;
padding: 0.75rem;
cursor: pointer;
border-bottom: 1px solid #f8f9fa;
transition: background-color 0.15s ease-in-out;
background-color: #ffffff;
color: #212529;
}

.search-dropdown-item:hover,
.search-dropdown-item.highlighted {
background-color: #e9ecef;
color: #212529;
background-color: #e9ecef;
color: #212529;
}

.search-dropdown-item:last-child {
border-bottom: none;
border-radius: 0 0 0.375rem 0.375rem;
border-bottom: none;
border-radius: 0 0 0.375rem 0.375rem;
}

.search-dropdown-item strong {
background-color: #fff3cd;
padding: 0.125rem 0.25rem;
border-radius: 0.25rem;
font-weight: 600;
color: #212529;
background-color: #fff3cd;
padding: 0.125rem 0.25rem;
border-radius: 0.25rem;
font-weight: 600;
color: #212529;
}

.search-no-results {
padding: 0.75rem;
color: #6c757d;
font-style: italic;
text-align: center;
background-color: #ffffff;
padding: 0.75rem;
color: #6c757d;
font-style: italic;
text-align: center;
background-color: #ffffff;
}

.search-dropdown-selected {
position: relative;
top: 0;
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #ced4da;
border-radius: 0.375rem;
padding: 0.375rem 2.5rem 0.375rem 0.75rem;
display: none;
align-items: center;
justify-content: space-between;
min-height: calc(1.5em + 0.75rem + 2px);
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
margin-bottom: 0;
position: relative;
top: 0;
left: 0;
right: 0;
background: #ffffff;
border: 1px solid #ced4da;
border-radius: 0.375rem;
padding: 0.375rem 2.5rem 0.375rem 0.75rem;
display: none;
align-items: center;
justify-content: space-between;
min-height: calc(1.5em + 0.75rem + 2px);
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
margin-bottom: 0;
}

.search-dropdown-selected:focus-within {
border-color: #86b7fe;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
border-color: #86b7fe;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}

.search-dropdown-selected .selected-text {
flex: 1;
color: #495057;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex: 1;
color: #495057;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.search-dropdown-selected .btn-clear {
position: absolute;
right: 0.75rem;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
color: #6c757d;
font-size: 1.25rem;
cursor: pointer;
padding: 0;
line-height: 1;
width: 1.5rem;
height: 1.5rem;
display: flex;
align-items: center;
justify-content: center;
transition: color 0.15s ease-in-out;
position: absolute;
right: 0.75rem;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
color: #6c757d;
font-size: 1.25rem;
cursor: pointer;
padding: 0;
line-height: 1;
width: 1.5rem;
height: 1.5rem;
display: flex;
align-items: center;
justify-content: center;
transition: color 0.15s ease-in-out;
}

.search-dropdown-selected .btn-clear:hover {
color: #495057;
color: #495057;
}

.search-dropdown-selected .btn-clear:focus {
outline: 2px solid #86b7fe;
outline-offset: 2px;
border-radius: 0.25rem;
outline: 2px solid #86b7fe;
outline-offset: 2px;
border-radius: 0.25rem;
}

/* Responsive adjustments */
@media (max-width: 768px) {
.search-dropdown-results {
max-height: 200px;
}
.search-dropdown-item {
padding: 0.5rem;
}
.search-no-results {
padding: 0.5rem;
}
.search-dropdown-results {
max-height: 200px;
}

.search-dropdown-item {
padding: 0.5rem;
}

.search-no-results {
padding: 0.5rem;
}
}

/* Accessibility improvements */
.search-dropdown-input[aria-expanded="true"] {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}

/* Loading state */
.search-dropdown-container.loading .search-dropdown-input {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23007bff' viewBox='0 0 16 16'%3E%3Cpath d='M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z'/%3E%3Cpath d='M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm0-1A7 7 0 1 1 8 1a7 7 0 0 1 0 14z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-position: right 0.75rem center;
background-size: 1rem;
animation: spin 1s linear infinite;
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='%23007bff' viewBox='0 0 16 16'%3E%3Cpath d='M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z'/%3E%3Cpath d='M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm0-1A7 7 0 1 1 8 1a7 7 0 0 1 0 14z'/%3E%3C/svg%3E");
background-repeat: no-repeat;
background-position: right 0.75rem center;
background-size: 1rem;
animation: spin 1s linear infinite;
}

@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}
}
15 changes: 12 additions & 3 deletions efile_app/efile/static/css/confirmation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,35 @@
padding: 2rem;
text-align: center;
}

.success-icon {
color: #28a745;
font-size: 4rem;
margin-bottom: 1rem;
}

.success-message {
color: #155724;
font-size: 1.25rem;
margin-bottom: 2rem;
}

.btn-primary.custom-confirm {
background: #2c5aa0;
border-color: #2c5aa0;
}

.btn-primary.custom-confirm:hover {
background: #1e3d6f;
border-color: #1e3d6f;
}

@media (max-width: 576px) {
.confirmation-container { padding: 1rem; }
.success-icon { font-size: 3rem; }
}
.confirmation-container {
padding: 1rem;
}

.success-icon {
font-size: 3rem;
}
}
Loading