Merge css

This commit is contained in:
Tom Hubrecht 2021-02-23 23:20:31 +01:00
commit 2b9b53bc19
7 changed files with 51 additions and 14 deletions

2
.gitignore vendored
View file

@ -9,7 +9,7 @@
/venv/ /venv/
.vagrant/ .vagrant/
static/ /static/
*.sqlite3 *.sqlite3
fiches/templates/fiches/base_old.html fiches/templates/fiches/base_old.html

View file

@ -246,10 +246,10 @@ a:focus,
} }
#content-home form { #content-home form {
display: grid; display: grid;
width: 400px; width: min(400px, 100%);
margin: 0 auto; margin: 0 auto;
grid-template-columns: 150px 250px; grid-template-columns: 30% 65%;
gap: 20px; gap: 5%;
} }
#content-home form label { #content-home form label {
grid-column: 1; grid-column: 1;
@ -275,7 +275,7 @@ a:focus,
#content-view-profile { #content-view-profile {
display: grid; display: grid;
grid-template-rows: 150px auto auto; grid-template-rows: min(150px, 45%) auto auto;
grid-template-columns: 3fr 1fr; grid-template-columns: 3fr 1fr;
grid-template-areas: "header header" "infos infos" "free-text free-text"; grid-template-areas: "header header" "infos infos" "free-text free-text";
gap: 20px; gap: 20px;
@ -365,7 +365,7 @@ a:focus,
} }
#content-edit-profile form { #content-edit-profile form {
width: 400px; width: min(400px, 100%);
margin: 0 auto; margin: 0 auto;
} }
#content-edit-profile form .form-entry { #content-edit-profile form .form-entry {
@ -471,7 +471,6 @@ a:focus,
} }
#content-edit-profile #free-text-edit-form textarea { #content-edit-profile #free-text-edit-form textarea {
width: 100%; width: 100%;
height: 100px;
padding: 5px; padding: 5px;
resize: none; resize: none;
} }
@ -528,6 +527,7 @@ body {
color: #FFFFFF; color: #FFFFFF;
font-family: "Fira Sans", "Roboto", sans-serif; font-family: "Fira Sans", "Roboto", sans-serif;
overflow-y: scroll; overflow-y: scroll;
border: none;
} }
#aside { #aside {
@ -554,9 +554,15 @@ body {
grid-template-areas: "aside" "main"; grid-template-areas: "aside" "main";
} }
h1 {
font-size: 1.5em;
}
#aside, #aside,
#main { #main {
padding: 0; padding: 0;
box-shadow: unset;
width: 100vw;
} }
#content-home, #content-home,
@ -570,6 +576,14 @@ body {
grid-column: 1/3; grid-column: 1/3;
} }
#title {
font-size: 1.75rem;
}
.content h2 {
font-size: 1.5rem;
}
#footer, #footer,
.content { .content {
max-width: 100%; max-width: 100%;
@ -590,7 +604,9 @@ body {
} }
#search-area { #search-area {
width: auto; justify-content: center;
margin: auto;
width: 80%;
} }
} }

View file

@ -0,0 +1 @@
{"version":3,"sourceRoot":"","sources":["../scss/_fonts.scss","../scss/_links.scss","../scss/_colors.scss","../scss/_header.scss","../scss/_buttons.scss","../scss/_errors.scss","../scss/_content.scss","../scss/_footer.scss","../scss/_common.scss"],"names":[],"mappings":";AASA;AACA;EACI;EACA;EACA;EACA;;AAKJ;AACA;EACI;EACA;EACA;EACA;;AAKJ;AACA;EACI;EACA;EACA;EACA;;AAUJ;AAUA;AACA;EACI;EACA;EACA;EACA;;ACzDJ;EACI;EACA,OCOQ;;;ADJZ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGI,OCEc;;;ACJlB;EACI;EACA;EACA;EAEA;EACA;EACA,qBACI;;AAMJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAIN;EACI;EAGA;EACA;EACA;EACA;;AAIA;EACI;;;AAIR;EACI;EACA;EACA;EACA,QAhDgB;EAiDhB;EACA;;AAGA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI,kBDxEI;;;AC4EZ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EAEA,OD3Fc;;AC8FlB;EACI,OD5FI;EC6FJ;;AAGJ;AAAA;EAEI;EACA;EACA;EACA,ODxGc;;AC2GlB;EACI;;AAGJ;EACI;;;AAKJ;EAEI;EACA;EACA;EACA;EAEA,ODzHI;EC0HJ;;AAGJ;EAEI,OD9HU;;;ACkIlB;EAEI;EAEA;EACA,ODhIa;ECiIb;;AAEA;EAEI;EACA;EACA;EACA;EAEA,ODlJI;ECmJJ;;AAGJ;EAEI,ODvJU;;;AC2JlB;EACI;EACA;EACA;EACA;;AAIA;EACI,aH5GU;;;AIlElB;AAAA;AAAA;EACI;EACA,kBFUqB;EETrB;EACA;EACA,OFSe;EERf;EACA;;;AAGJ;AAAA;AAAA;EACI,kBFE2B;;;AGf/B;EACI;EACA;;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;;ACrBR;EACI,OJqBW;;;AIlBf;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAWJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAMJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;;AAIA;EACI;;;AAYhB;EACI;EACA;EACA;EACA,qBACI;EAGJ;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA,OJnGU;EIoGV;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAGJ;EACI;EAEA;EACA,OJpHS;EIqHT;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,kBJtHe;EIuHf;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA,OJvJF;EIwJE;EACA;;AAGJ;EACI;EACA;EACA;;AAGJ;EACE;;AASlB;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;;;AAMR;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA,kBJpLe;EIqLf;;AAEA;EACI;;AAGJ;EACI;EACA,OJ7MC;EI8MD;EACA;EACA;;AAGJ;EACI;;AAGJ;EAGI;EACA;;AAIR;EACI;EACA;EACA;EACA,qBACI;EAEJ;EACA;EACA;;AAEA;EACI;;AAMJ;EACI;EACA;;AAEJ;EAAqB;;AACrB;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAUA;EAAqB;;AACrB;EAAqB;;AAGrB;AAAA;EAEI;;AAIR;EAEI;;AAIR;EACI;;AAGJ;EACI;;AAIA;EACI;EACA;;AAIR;EACI;EACA;;AAIA;EACI;;AAGJ;EACI;EACA;EACA;;AAMR;EACI;EACA;EACA;;AAKJ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAKJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA,OJ1WC;EI2WD;;AASJ;EACI;;;AC5XhB;EACI;EACA;EACA,OLGkB;EKFlB;;AAEA;EACI;EACA;;;ACNR;EACI;;;AAMJ;EACI;;;AAGJ;EACI;EACA,qBACI;EAEJ,kBNnBc;EMoBd,ONdQ;EMeR,aR6CY;EQ5CZ;;;AAGJ;EACI;EACA;EACA,kBN3Be;EM4Bf;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA,kBNvCc;EMwCd;;;AAIJ;EACE;IACE;IACA,qBACI;;;EAIN;IACE;;;EAGF;AAAA;IAEE;IACA;IACA;;;EAGF;AAAA;AAAA;AAAA;IAIE;;;EAKE;IACE;;;EAKN;IACE;;;EAIA;IACE;;;EAIJ;AAAA;IAEE;;;EAGF;IACE;IACA;IACA;IACA,qBACE;;EAMF;IACE;;EAGF;AAAA;IAEE;;;EAIJ;IACE;IACA;IACA","file":"annuaire.css"}

View file

@ -0,0 +1 @@
{"version":3,"sourceRoot":"","sources":["../scss/datepicker.scss"],"names":[],"mappings":"AAAA;AAAA;;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AA0FA;EACE;;AAEA;EACE;;;AAIJ;EACE;EACA;EACA;EACA,SAvDc;EAwDd,aA1DmB;;AA4DnB;EACE;EACA,gBA9DiB;;;AAkErB;EACE;EACA,eA3EiB;EA4EjB,kBA9EoB;;AAgFpB;EACE,YAvEiB;;AA0EnB;EACE;EACA;EACA;EACA,eAtFe;EAuFf;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGF;EACE;EACA,kBA/GM;;;AAkHR;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE,QA3GkB;EA4GlB,aA5GkB;;;AA+GpB;EACE;EACA,kBAnH0B;EAoH1B;EACA;EACA,aA3HoB;;;AAiIpB;EACE;;AAMA;EAqBE;EACA;EACA;EACA;EACA;EACA;EACA,eAzKa;EA0Kb;EACA,kBAvLE;EAwLF;EACA;EACA;EACA;EACA;EACA,aA/KgB;EAgLhB;EACA,OA7LC;EA8LD,WAjLgB;;AAmLhB;EAEE;;AAGF;EACE,cAlMK;EAmML,OAvMD;;AA0MD;EACE,cA1MD;EA2MC,OA5MD;;AA8MC;EACE;;AAIJ;EACE,cAjNI;EAkNJ,OArND;;AAwND;EACE;;AAGF;EA1KJ;EACA;;AA4KM;EACE;;AAIA;EACE;;AAIJ;EACE;;AAGF;EACE;;AAIJ;EA3LJ;EACA,eA7CuB;EA8CvB;EACA,WA5CmB;;AA0OnB;EACE;;AAGF;AAAA;EAEE;EACA;EACA,OAzOgB;;AA2OhB;AAAA;EACE;;;AAYJ;EAEE;EACA;EACA;EACA,aApQkB;;AAuQpB;EAEE,OAlQgB;EAmQhB,OAtRS;EAuRT,WA7QiB;;AA+QjB;EANF;IAOI,OAhPmB;;;;AAqPzB;EAIE;;AAEA;EACE;IACE;;;;AAQJ;EACE;EACA;;AAGF;EACE,kBAjS6B;;AAqS7B;EAEE,kBApS8B;EAqS9B,OApSmB;EAqSnB,aApSyB;;AAwS7B;EACE,OAjUW;;AAsUX;EACE,OAnTmB;;AAsTrB;EACE;;AAIJ;EACE;EACA,kBAtTmC;;AAwTnC;EACE;;AAGF;EACE,kBArU2B;;AA0U7B;EACE,kBArU2B;;AAuU3B;EACE,OAvUc;;AA2UlB;EACE;;AAQJ;EAEE;EACA;;;AAIJ;EACE,cAlV8B;;AAoV9B;EAEE","file":"datepicker.css"}

View file

@ -22,6 +22,7 @@ body {
color: colors.$page-text; color: colors.$page-text;
font-family: fonts.$regular-fonts; font-family: fonts.$regular-fonts;
overflow-y: scroll; overflow-y: scroll;
border:none;
} }
#aside { #aside {
@ -51,9 +52,15 @@ body {
"main"; "main";
} }
h1 {
font-size: 1.5em;
}
#aside, #aside,
#main { #main {
padding: 0; padding: 0;
box-shadow: unset;
width: 100vw;
} }
#content-home, #content-home,
@ -71,6 +78,16 @@ body {
} }
} }
#title {
font-size: 1.75rem;
}
.content {
h2 {
font-size: 1.5rem;
}
}
#footer, #footer,
.content { .content {
max-width: 100%; max-width: 100%;
@ -98,7 +115,9 @@ body {
} }
#search-area { #search-area {
width: auto; justify-content: center;
margin: auto;
width: 80%;
} }
} }

View file

@ -35,10 +35,10 @@
#content-home { #content-home {
form { form {
display: grid; display: grid;
width: 400px; width: min(400px, 100%);
margin: 0 auto; margin: 0 auto;
grid-template-columns: 150px 250px; grid-template-columns: 30% 65%;
gap: 20px; gap: 5%;
label { label {
grid-column: 1; grid-column: 1;
@ -82,7 +82,7 @@
#content-view-profile { #content-view-profile {
display: grid; display: grid;
grid-template-rows: 150px auto auto; grid-template-rows: min(150px, 45%) auto auto;
grid-template-columns: 3fr 1fr; grid-template-columns: 3fr 1fr;
grid-template-areas: grid-template-areas:
"header header" "header header"
@ -195,7 +195,7 @@
#content-edit-profile { #content-edit-profile {
form { form {
width: 400px; width: min(400px, 100%);
margin: 0 auto; margin: 0 auto;
.form-entry { .form-entry {