added assets; removed flaskfetfotos container from docker-compose

This commit is contained in:
root (fetsite21)
2021-01-19 19:59:35 +01:00
parent 3d05253c89
commit 24dc583fb1
8 changed files with 78 additions and 71 deletions

View File

@@ -1,8 +1,14 @@
/* CHANGELISTS */ /* CHANGELISTS */
#changelist { #changelist {
position: relative; display: flex;
width: 100%; align-items: flex-start;
justify-content: space-between;
}
#changelist .changelist-form-container {
flex: 1 1 auto;
min-width: 0;
} }
#changelist table { #changelist table {
@@ -21,7 +27,6 @@
.change-list .filtered .results, .change-list .filtered .paginator, .change-list .filtered .results, .change-list .filtered .paginator,
.filtered #toolbar, .filtered div.xfull { .filtered #toolbar, .filtered div.xfull {
margin-right: 280px;
width: auto; width: auto;
} }
@@ -30,7 +35,8 @@
} }
#changelist-form .results { #changelist-form .results {
overflow-x: auto; overflow-x: auto;
width: 100%;
} }
#changelist .toplinks { #changelist .toplinks {
@@ -67,7 +73,7 @@
/* TOOLBAR */ /* TOOLBAR */
#changelist #toolbar { #toolbar {
padding: 8px 10px; padding: 8px 10px;
margin-bottom: 15px; margin-bottom: 15px;
border-top: 1px solid #eee; border-top: 1px solid #eee;
@@ -76,28 +82,28 @@
color: #666; color: #666;
} }
#changelist #toolbar form input { #toolbar form input {
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
padding: 5px; padding: 5px;
color: #333; color: #333;
} }
#changelist #toolbar form #searchbar { #toolbar #searchbar {
height: 19px; height: 19px;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 2px 5px; padding: 2px 5px;
margin: 0; margin: 0;
vertical-align: top; vertical-align: top;
font-size: 13px; font-size: 13px;
max-width: 230px; max-width: 100%;
} }
#changelist #toolbar form #searchbar:focus { #toolbar #searchbar:focus {
border-color: #999; border-color: #999;
} }
#changelist #toolbar form input[type="submit"] { #toolbar form input[type="submit"] {
border: 1px solid #ccc; border: 1px solid #ccc;
font-size: 13px; font-size: 13px;
padding: 4px 8px; padding: 4px 8px;
@@ -109,12 +115,12 @@
color: #333; color: #333;
} }
#changelist #toolbar form input[type="submit"]:focus, #toolbar form input[type="submit"]:focus,
#changelist #toolbar form input[type="submit"]:hover { #toolbar form input[type="submit"]:hover {
border-color: #999; border-color: #999;
} }
#changelist #changelist-search img { #changelist-search img {
vertical-align: middle; vertical-align: middle;
margin-right: 4px; margin-right: 4px;
} }
@@ -122,14 +128,11 @@
/* FILTER COLUMN */ /* FILTER COLUMN */
#changelist-filter { #changelist-filter {
position: absolute; order: 1;
top: 0;
right: 0;
z-index: 1000;
width: 240px; width: 240px;
background: #f8f8f8; background: #f8f8f8;
border-left: none; border-left: none;
margin: 0; margin: 0 0 0 30px;
} }
#changelist-filter h2 { #changelist-filter h2 {
@@ -228,6 +231,7 @@
line-height: 22px; line-height: 22px;
margin: 0; margin: 0;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;
width: 100%;
} }
.paginator a:link, .paginator a:visited { .paginator a:link, .paginator a:visited {
@@ -267,7 +271,6 @@
/* ACTIONS */ /* ACTIONS */
.filtered .actions { .filtered .actions {
margin-right: 280px;
border-right: none; border-right: none;
} }
@@ -287,6 +290,7 @@
border-bottom: none; border-bottom: none;
line-height: 24px; line-height: 24px;
color: #999; color: #999;
width: 100%;
} }
#changelist .actions.selected { #changelist .actions.selected {

View File

@@ -430,6 +430,7 @@ body.popup .submit-row {
.inline-related.tabular fieldset.module table { .inline-related.tabular fieldset.module table {
width: 100%; width: 100%;
overflow-x: scroll;
} }
.last-related fieldset { .last-related fieldset {

View File

@@ -99,12 +99,21 @@
background: #ffc; background: #ffc;
} }
.main > #nav-sidebar + .content {
max-width: calc(100% - 23px);
}
.main.shifted > #nav-sidebar + .content {
max-width: calc(100% - 299px);
}
@media (max-width: 767px) { @media (max-width: 767px) {
#nav-sidebar, #toggle-nav-sidebar { #nav-sidebar, #toggle-nav-sidebar {
display: none; display: none;
} }
}
.change-list .main > #nav-sidebar+.content { .main > #nav-sidebar + .content,
overflow: hidden; .main.shifted > #nav-sidebar + .content {
max-width: 100%;
}
} }

View File

@@ -93,14 +93,14 @@ input[type="submit"], button {
/* Changelist */ /* Changelist */
#changelist #toolbar { #toolbar {
border: none; border: none;
padding: 15px; padding: 15px;
} }
#changelist-search > div { #changelist-search > div {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: nowrap;
max-width: 480px; max-width: 480px;
} }
@@ -108,15 +108,20 @@ input[type="submit"], button {
line-height: 22px; line-height: 22px;
} }
#changelist #toolbar form #searchbar { #toolbar form #searchbar {
flex: 1 0 auto; flex: 1 0 auto;
width: 0; width: 0;
height: 22px; height: 22px;
margin: 0 10px 0 6px; margin: 0 10px 0 6px;
} }
#toolbar form input[type=submit] {
flex: 0 1 auto;
}
#changelist-search .quiet { #changelist-search .quiet {
width: 100%; width: 0;
flex: 1 0 auto;
margin: 5px 0 0 25px; margin: 5px 0 0 25px;
} }
@@ -159,9 +164,6 @@ input[type="submit"], button {
.change-list .filtered .paginator, .change-list .filtered .paginator,
.filtered #toolbar, .filtered #toolbar,
.filtered .actions, .filtered .actions,
.filtered div.xfull {
margin-right: 230px;
}
#changelist .paginator { #changelist .paginator {
border-top-color: #eee; border-top-color: #eee;
@@ -215,7 +217,7 @@ input[type="submit"], button {
} }
textarea { textarea {
max-width: 518px; max-width: 100%;
max-height: 120px; max-height: 120px;
} }
@@ -500,25 +502,16 @@ input[type="submit"], button {
/* Changelist */ /* Changelist */
#changelist { #changelist {
display: flex; align-items: stretch;
flex-direction: column; flex-direction: column;
} }
#changelist #toolbar { #toolbar {
order: 1;
padding: 10px; padding: 10px;
} }
#changelist .xfull {
order: 2;
}
#changelist-form {
order: 3;
}
#changelist-filter { #changelist-filter {
order: 4; margin-left: 0;
} }
#changelist .actions label { #changelist .actions label {
@@ -534,11 +527,6 @@ input[type="submit"], button {
flex: 1 0 100%; flex: 1 0 100%;
} }
.change-list .filtered .results, .change-list .filtered .paginator,
.filtered #toolbar, .filtered .actions, .filtered div.xfull {
margin-right: 0;
}
#changelist-filter { #changelist-filter {
position: static; position: static;
width: auto; width: auto;

View File

@@ -23,9 +23,9 @@
[dir="rtl"] .change-list .filtered .paginator, [dir="rtl"] .change-list .filtered .paginator,
[dir="rtl"] .filtered #toolbar, [dir="rtl"] .filtered #toolbar,
[dir="rtl"] .filtered div.xfull, [dir="rtl"] .filtered div.xfull,
[dir="rtl"] .filtered .actions { [dir="rtl"] .filtered .actions,
margin-right: 0; [dir="rtl"] #changelist-filter {
margin-left: 230px; margin-left: 0;
} }
[dir="rtl"] .inline-group ul.tools a.add, [dir="rtl"] .inline-group ul.tools a.add,
@@ -63,14 +63,6 @@
/* MOBILE */ /* MOBILE */
@media (max-width: 767px) { @media (max-width: 767px) {
[dir="rtl"] .change-list .filtered .results,
[dir="rtl"] .change-list .filtered .paginator,
[dir="rtl"] .filtered #toolbar,
[dir="rtl"] .filtered div.xfull,
[dir="rtl"] .filtered .actions {
margin-left: 0;
}
[dir="rtl"] .aligned .related-lookup, [dir="rtl"] .aligned .related-lookup,
[dir="rtl"] .aligned .datetimeshortcuts { [dir="rtl"] .aligned .datetimeshortcuts {
margin-left: 0; margin-left: 0;
@@ -80,4 +72,9 @@
[dir="rtl"] .aligned ul { [dir="rtl"] .aligned ul {
margin-right: 0; margin-right: 0;
} }
[dir="rtl"] #changelist-filter {
margin-left: 0;
margin-right: 0;
}
} }

View File

@@ -109,15 +109,10 @@ thead th.sorted .text {
} }
#changelist-filter { #changelist-filter {
right: auto;
left: 0;
border-left: none; border-left: none;
border-right: none; border-right: none;
} margin-left: 0;
margin-right: 30px;
.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
margin-right: 0;
margin-left: 280px;
} }
#changelist-filter li.selected { #changelist-filter li.selected {
@@ -129,11 +124,6 @@ thead th.sorted .text {
margin-right: -15px; margin-right: -15px;
} }
.filtered .actions {
margin-left: 280px;
margin-right: 0;
}
#changelist table tbody td:first-child, #changelist table tbody th:first-child { #changelist table tbody td:first-child, #changelist table tbody th:first-child {
border-right: none; border-right: none;
border-left: none; border-left: none;

18
assets/fet.css Normal file
View File

@@ -0,0 +1,18 @@
body {
min-height:100%;
position:relative;
}
img.logo {
height:40px;
width:40px;
}
div.footer {
height: 100%;
}
.footer a {
color: white;
}
.footer a i {
font-size:30px;
}

View File

@@ -1,7 +1,7 @@
version: "3" version: "3"
services: services:
flaskfetfotos: flaskfetfotos:
image: docker.triton2.fet.at/flask-fet-fotos image: flask-fet-fotos
environment: environment:
FLASK_DEBUG: 1 FLASK_DEBUG: 1
FLASK_APP: main.py FLASK_APP: main.py