Merge remote-tracking branch 'origin/master' into features/activity-form

This commit is contained in:
2021-06-08 17:24:47 +02:00
130 changed files with 4288 additions and 1221 deletions

View File

@@ -56,7 +56,7 @@ div#header-accompanying_course-name {
background: none repeat scroll 0 0 #718596;
color: #FFF;
h1 {
margin: 0.4em 0;
margin: 0.4em 0;
}
span {
a {
@@ -77,7 +77,7 @@ div#header-accompanying_course-details {
/*
* FLEX RESPONSIVE TABLE/BLOCK PRESENTATION
*/
div.flex-bloc,
div.flex-bloc,
div.flex-table {
h2, h3, h4, dl, p {
margin: 0;
@@ -103,25 +103,35 @@ div.flex-table {
* Bloc appearance
*/
div.flex-bloc {
box-sizing: border-box;
box-sizing: border-box;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: stretch;
align-content: stretch;
div.item-bloc {
flex-grow: 0; flex-shrink: 1; flex-basis: 50%;
margin: 0;
padding: 1em;
border-top: 0;
&:nth-child(1), &:nth-child(2) {
border-top: 1px solid #000;
}
border-left: 0;
&:nth-child(odd) {
border-left: 1px solid #000;
}
//background-color: #e6e6e6;
display: flex;
flex-direction: column;
div.item-row {
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex;
flex-direction: column;
div.item-col {
&:first-child {
flex-grow: 0; flex-shrink: 0; flex-basis: auto;
@@ -129,7 +139,7 @@ div.flex-bloc {
&:last-child {
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex;
.list-content { // ul, dl, or div
}
ul.record_actions {
@@ -139,7 +149,7 @@ div.flex-bloc {
li {
margin-right: 5px;
}
}
}
}
}
}
@@ -150,24 +160,30 @@ div.flex-bloc {
@media only screen and (max-width: 900px) {
flex-direction: column;
margin: auto 0;
div.item-bloc {
border-left: 1px solid #000;
&:nth-child(2) {
border-top: 0;
}
}
}
}
/*
* Table appearance
*/
*/
div.flex-table {
display: flex;
flex-direction: column;
align-items: stretch;
align-content: stretch;
div.item-bloc {
display: flex;
flex-direction: column;
padding: 1em;
&:nth-child(even) {
background-color: #e6e6e6;
background-color: #e6e6e6;
}
div.item-row {
@@ -179,7 +195,7 @@ div.flex-table {
padding-top: 0.5em;
flex-direction: column;
}
div.item-col {
&:first-child {
flex-grow: 0; flex-shrink: 0; flex-basis: 33%;
@@ -188,7 +204,7 @@ div.flex-table {
flex-grow: 1; flex-shrink: 1; flex-basis: auto;
display: flex;
justify-content: flex-end;
.list-content { // ul, dl, or div
}
ul.record_actions {
@@ -198,7 +214,7 @@ div.flex-table {
li {
margin-right: 5px;
}
}
}
}
}
@media only screen and (max-width: 900px) {
@@ -211,9 +227,47 @@ div.flex-table {
}
}
}
// neutralize
// neutralize
div.chill_address div.chill_address_address p { text-indent: 0; }
}
}
}
}
/*
* Address form
*/
div.address_form {
display: flex;
flex-direction: column;
div.address_form__header {
}
div.address_form__select {
display: flex;
flex-direction: row;
justify-content: space-between;
div.address_form__select__body {
display: flex;
flex-direction: column;
flex-grow: 1;
}
div.address_form__select__map {
margin: 0px 20px;
div#address_map {
height:400px;
width:400px;
}
}
}
div.address_form__more {
}
}