Skip to content
Open
Show file tree
Hide file tree
Changes from all 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 @@ -15,7 +15,7 @@ COPY poetry.lock pyproject.toml /app/

# Встановлюємо залежності, не створюючи віртуального середовища
RUN poetry config virtualenvs.create false \
&& poetry install --no-interaction --no-ansi
&& poetry install --no-interaction --no-ansi --no-root

# Копіюємо інші файли проекту
COPY . /app
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# docker-compose, celery
16 changes: 16 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ services:
retries: 5
start_period: 5s

pgadmin:
image: dpage/pgadmin4:latest
environment:
PGADMIN_DEFAULT_EMAIL: admin@mail.com
PGADMIN_DEFAULT_PASSWORD: 1234567
ports:
- "5050:80"
depends_on:
db:
condition: service_healthy
volumes:
- pgadmin_data:/var/lib/pgadmin

redis:
image: redis:latest
platform: linux/amd64
Expand Down Expand Up @@ -76,3 +89,6 @@ services:
redis:
condition: service_healthy

volumes:
postgres_data:
pgadmin_data:
7 changes: 7 additions & 0 deletions staticfiles/admin/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,9 @@ a.deletelink:focus, a.deletelink:hover {
/* PAGINATOR */

.paginator {
display: flex;
align-items: center;
gap: 4px;
font-size: 0.8125rem;
padding-top: 10px;
padding-bottom: 10px;
Expand Down Expand Up @@ -1133,6 +1136,10 @@ a.deletelink:focus, a.deletelink:hover {
background: var(--link-hover-color);
}

.paginator input {
margin-left: auto;
}

.base-svgs {
display: none;
}
4 changes: 4 additions & 0 deletions staticfiles/admin/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ form .form-row p {

.flex-container {
display: flex;
}

.form-multiline {
flex-wrap: wrap;
}

Expand Down Expand Up @@ -78,6 +81,7 @@ form ul.inline li {
.aligned label {
display: block;
padding: 4px 10px 0 0;
min-width: 160px;
width: 160px;
word-wrap: break-word;
line-height: 1;
Expand Down
9 changes: 5 additions & 4 deletions staticfiles/admin/css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,10 @@ input[type="submit"], button {
flex-flow: column;
}

.flex-container.checkbox-row {
flex-flow: row;
}

textarea {
max-width: none;
}
Expand All @@ -584,6 +588,7 @@ input[type="submit"], button {

.aligned label {
width: 100%;
min-width: auto;
padding: 0 0 10px;
}

Expand All @@ -598,10 +603,6 @@ input[type="submit"], button {
max-width: 100%;
}

.aligned .checkbox-row {
align-items: center;
}

.aligned .checkbox-row input {
flex: 0 1 auto;
margin: 0;
Expand Down
3 changes: 3 additions & 0 deletions staticfiles/admin/css/responsive_rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,7 @@
margin-left: 0;
margin-right: 0;
}
[dir="rtl"] .aligned .vCheckboxLabel {
padding: 1px 5px 0 0;
}
}
10 changes: 10 additions & 0 deletions staticfiles/admin/css/rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ thead th.sorted .text {
border-left: none;
}

.paginator .end {
margin-left: 6px;
margin-right: 0;
}

.paginator input {
margin-left: 0;
margin-right: auto;
}

/* FORMS */

.aligned label {
Expand Down
1 change: 1 addition & 0 deletions staticfiles/admin/css/widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
padding: 0;
overflow: hidden;
line-height: 1;
min-width: auto;
}

.selector .selector-available input,
Expand Down
2 changes: 0 additions & 2 deletions staticfiles/modeltranslation/js/tabbed_translation_fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,7 @@ var google, django, gettext;
);

$(document).ready(function () {
$(window).on("load", function () {
handleTabularAddAnotherInline(tabularInlineGroup);
});
});
});
}
Expand Down