Skip to content
Snippets Groups Projects
Commit 32b06238 authored by Emmanuel Viennet's avatar Emmanuel Viennet
Browse files

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc

parents 41507ca2 0f094cc3
Branches
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
app/static/css/partition_editor.css
+ 161
− 34
View file @ 32b06238
html {
overflow-x: hidden;
}
.wait {
position: fixed;
width: 50px;
......@@ -44,19 +48,43 @@
margin-bottom: 16px;
display: inline-block;
cursor: pointer;
pointer-events: none;
}
.loaded .edition {
pointer-events: initial;
}
.filtres>label {
display: none;
}
.editionActivated .valider {
display: block;
width: fit-content;
margin-left: auto;
padding: 8px 32px;
background: #90c;
color: #fff;
box-shadow: 0 2px 2px rgb(0, 0, 0, 0.25);
border-radius: 4px;
cursor: pointer;
}
main {
font-family: Verdana, Geneva, Tahoma, sans-serif;
display: flex;
flex-wrap: wrap;
gap: 32px;
row-gap: 4px;
gap: 8px;
margin-right: 16px;
padding: 8px;
border-radius: 12px;
background: #424242;
}
main h2 {
border-bottom: 4px solid #09c;
font-size: 150% !important;
}
main h2,
......@@ -64,11 +92,22 @@ main h3 {
font-weight: 400;
}
section {
background: #fff;
padding: 8px;
border-radius: 8px;
}
body:not(.editionActivated) .editing {
display: none !important;
display: none;
}
.nonEditable .editing {
display: none;
}
.editionActivated #zoneChoix .etudiants>div {
.editionActivated #zoneChoix,
.editionActivated #zoneGroupes {
pointer-events: none;
opacity: 0.2;
}
......@@ -80,7 +119,9 @@ body:not(.editionActivated) .editing {
}
@keyframes boing {
100% {transform: translateY(-20px)}
100% {
transform: translateY(-20px)
}
}
/****************/
......@@ -89,13 +130,19 @@ body:not(.editionActivated) .editing {
background: #0c9 !important;
padding: 8px 16px !important;
cursor: pointer;
color: #fff;
box-shadow: 0 2px 2px rgb(0, 0, 0, 0.25);
border-radius: 4px;
text-align: center;
margin-bottom: 4px;
width: fit-content;
}
.move,
.modif,
.suppr {
color: #000;
padding: 4px;
padding: 0 4px;
cursor: pointer;
}
......@@ -172,10 +219,31 @@ body.editionActivated .filtres>div>div>div>div {
.moving {
opacity: 0.8;
pointer-events: none;
;
}
.grabbing>div:not([data-idgroupe="aucun"]):hover:before {
.grabbing>div[data-idpartition]:not([data-idgroupe]):hover:before {
content: "";
position: absolute;
left: -4px;
right: -4px;
bottom: calc(100% + 1px);
height: 2px;
width: auto;
background: #c44;
animation: insertPartion 0.2s infinite alternate ease-in-out;
}
@keyframes insertPartion {
0% {
transform: translateX(-4px)
}
100% {
transform: translateX(4px)
}
}
.grabbing>*:not([data-idgroupe="aucun"]):hover:before {
content: "";
position: absolute;
bottom: -4px;
......@@ -183,10 +251,10 @@ body.editionActivated .filtres>div>div>div>div {
right: calc(100% + 1px);
width: 2px;
background: #c44;
animation: insert 0.2s infinite alternate ease-in-out;
animation: insertGroupe 0.2s infinite alternate ease-in-out;
}
@keyframes insert {
@keyframes insertGroupe {
0% {
transform: translateY(-4px)
}
......@@ -197,51 +265,77 @@ body.editionActivated .filtres>div>div>div>div {
}
/*****************************/
/* Zone Partitions */
/* Zone Filtres */
/*****************************/
#zonePartitions {
width: 100%;
}
.filtres {
display: table;
#zonePartitions>div {
width: fit-content;
}
.filtres>div {
background: #ddd;
#zonePartitions h3{
display: flex;
}
#zonePartitions h3 .onoff{
margin-left: auto;
cursor: pointer;
display: flex;
align-items: center;
gap: 4px;
font-size: 16px;
}
#zonePartitions .filtres {
width: fit-content;
}
#zonePartitions .filtres>div {
background: #eee;
padding: 8px;
border-radius: 8px;
margin-bottom: 8px;
position: relative;
}
.filtres>div>div>div {
#zonePartitions .filtres .groupes {
display: flex;
flex-wrap: wrap;
gap: 4px;
row-gap: 2px;
margin: 8px 0;
margin: 4px 0 0 0;
}
.filtres>div>div>div>div {
#zonePartitions .filtres .groupes>div {
position: relative;
background: #09c;
color: #FFF;
border-radius: 4px;
padding: 8px 32px;
margin: 0;
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.25);
}
body:not(.editionActivated) .filtres>div>div>div>div {
body:not(.editionActivated) .filtres .groupes>div {
cursor: pointer;
}
body:not(.editionActivated) .filtres>div>div>div>div:hover {
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
body:not(.editionActivated) .filtres .groupes>div:hover {
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6) !important;
}
body:not(.editionActivated) .filtres>div>div>div>div:active {
box-shadow: 0 0 0 #000;
body:not(.editionActivated) .filtres .groupes>div:active {
box-shadow: 0 0 0 #000 !important;
transform: translateY(2px);
}
body.editionActivated .filtres [data-idgroupe=aucun]{
display: none;
}
body.editionActivated .filtres .nonEditable .move{
display: initial;
}
.filtres .unselect {
background: rgba(0, 153, 204, 0.5);
......@@ -250,12 +344,37 @@ body:not(.editionActivated) .filtres>div>div>div>div:active {
/*****************************/
/* Zone Etudiants */
/*****************************/
#zoneChoix>.autoAffectation{
background: #3c3c3c;
color: #fff;
padding: 4px 8px;
margin-bottom: 16px;
border-radius: 4px;
}
#zoneChoix>.autoAffectation>select{
border: none;
padding: 4px 16px;
border-radius: 4px;
}
#zoneChoix>.autoAffectation>.affectationGo{
display: inline-block;
background: #0c9;
padding: 8px 16px;
cursor: pointer;
color: #fff;
box-shadow: 0 2px 2px rgb(0 0 0 / 25%);
border-radius: 4px;
text-align: center;
margin-top: 4px;
margin-bottom: 4px;
width: fit-content;
}
#zoneChoix .etudiants>div {
background: #FFF;
border: 1px solid #aaa;
border-radius: 4px;
padding: 4px 8px;
margin: 4px 0;
margin: -1px 0;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
......@@ -266,16 +385,22 @@ body:not(.editionActivated) .filtres>div>div>div>div:active {
flex: 1;
}
#zoneChoix small {
#zoneChoix .small {
color: #444;
font-size: 8px;
font-style: italic;
}
#zoneChoix .etudiants .grpPartitions {
display: flex;
flex-direction: column;
gap: 2px;
}
#zoneChoix .etudiants .partition {
display: flex;
flex-wrap: wrap;
gap: 4px;
margin-bottom: 4px;
}
#zoneChoix label {
......@@ -313,9 +438,12 @@ body:not(.editionActivated) .filtres>div>div>div>div:active {
color: #fff;
}
.hide {
section:not(#zonePartitions) .hide {
display: none !important;
}
#zonePartitions .hide{
opacity: 0.4;
}
.saved+span {
position: relative;
......@@ -346,11 +474,8 @@ body:not(.editionActivated) .filtres>div>div>div>div:active {
flex: 1;
}
#zoneGroupes .groupes {
display: flex;
flex-wrap: wrap;
align-items: flex-start;
gap: 16px;
#zoneGroupes h3 {
width: 100%;
}
#zoneGroupes .partition {
......@@ -358,8 +483,9 @@ body:not(.editionActivated) .filtres>div>div>div>div:active {
padding: 8px;
border-radius: 8px;
display: flex;
flex-direction: column;
flex-wrap: wrap;
gap: 8px;
margin-bottom: 8px;
}
h3 {
......@@ -390,5 +516,6 @@ h3 {
}
#zoneGroupes [data-idgroupe=aucun] {
background: #b5c2c3 !important;
background: #3c3c3c !important;
color: #fff;
}
\ No newline at end of file
app/templates/scolar/partition_editor.html
+ 283
− 183
View file @ 32b06238
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment