Skip to content

O
OpenQuizz
Commit b80e3391 authored by Jérémie Passerat's avatar Jérémie Passerat
Browse files
Options

Sauvegarde avant test dark mode

parent 43ff48b0
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 41 deletions
src/Menu.vue
View file @ b80e3391
......@@ -2,9 +2,10 @@
<div id="menuHaut">
<Choix_Mode_Variante class="menuVariante" v-show="variante"></Choix_Mode_Variante>
<p v-show="!variante"> Open Quizz - Bienvenue {{auteur}}</p>
<div class="notif" v-on:click="choixIconeNotification" v-show="isNotif === true" v-bind:style="[!variante ? {'margin-left': '90%'} : {'margin-left': '32%'}]"></div>
<div class="circle" id="menuAuteur" v-on:click="isAffiche = !isAffiche" v-bind:style="styleCircle">
{{auteur}}
</div>
<div class="menu" v-show="isAffiche">
<div class="sous_menu" v-on:click="choixMenuAnnexe">Profil</div>
......@@ -29,7 +30,8 @@ export default {
isNotif: false,
isRecu: false,
isPropose: false,
styleCircle: {}
styleCircle: {},
roblox: "https://www.google.com/url?sa=i&url=https%3A%2F%2Feducation.roblox.com%2F&psig=AOvVaw2WUZcaXl4Wpn3dLXhgO41R&ust=1626436473301000&source=images&cd=vfe&ved=0CAoQjRxqFwoTCIjmoJWC5fECFQAAAAAdAAAAABAD"
}
},
props: {
......@@ -133,7 +135,7 @@ export default {
this.styleCircle["margin-left"] = "3%"
}
else if (this.variante){
this.styleCircle["margin-left"] = "36.72%"
this.styleCircle["margin-left"] = "38.87%"
}
else {
this.styleCircle["margin-left"] = "94.75%"
......@@ -176,19 +178,22 @@ export default {
#menuHaut{
display: flex;
background-color: whitesmoke;
background-color: white;
}
.circle {
background: gold;
border: 1px solid yellow;
margin-top: 1%;
margin-bottom: 1%;
margin-top: 0.25%;
margin-bottom: 0.25%;
border-radius: 50%;
display: flex; /* or inline-flex */
align-items: center;
justify-content: center;
height: 75px;
width: 75px;
height: 37.5px;
width: 37.5px;
background: gold url(assets/img/person2.png);
background-size: cover;
}
.menuVariante{
......@@ -202,7 +207,7 @@ export default {
width: 100px;
background: white;
border: thin solid black;
margin-top: 100px;
margin-top: 46px;
margin-left: 93%;
position: absolute;
display: flex;
......@@ -232,4 +237,14 @@ export default {
line-height: 36px;
}
p {
text-align: center;
align-content: center;
display: flex;
position: absolute;
left: 47.5%;
margin-top: 0.5%;
margin-bottom: 0.1%;
}
</style>
\ No newline at end of file
src/assets/img/person.png 0 → 100644
View file @ b80e3391
src/assets/img/person.png

21.1 KB

src/assets/img/person2.png 0 → 100644
View file @ b80e3391
src/assets/img/person2.png

6.38 KB

src/components/Choix_Mode_Variante.vue
View file @ b80e3391
......@@ -41,14 +41,17 @@ export default {
<style scoped>
#choixDuMode {
border: 1px solid black;
width: 250px;
width: 200px;
display: flex;
margin-left: 864px;
margin-top: -5px;
margin-bottom: 0.1%;
height: 20px
}
#contenusPanier, #contenusBanque {
width: 125px;
width: 100px;
text-align: center;
}
......@@ -59,4 +62,11 @@ export default {
.clicked {
outline: 5px solid yellow;
}
p {
text-align: center;
line-height: 17px;
}
</style>
\ No newline at end of file
src/components/Volet_Base.vue
View file @ b80e3391
<template>
<div id="divPrincipale">
<button id="changerVariante" v-show="!modeConsultation && !modeModification" v-on:click="changerVariante">changer</button>
<div class="choixPanier" v-show="panierChoisi && !modeConsultation && !modeModification">
<label id="labelPerso" :style="isActif ? {'margin-left': '-5px'} : {'margin-left': '-8.5%'}">Perso </label>
<input type="checkbox" class="filtreTableau" id="filtrePerso" v-model="persoChecked"
v-on:click="persoChecked = !persoChecked" name="perso" value="tiers"/>
<label> Tiers </label>
<input type="checkbox" class="filtreTableau" id="filtreTiers" v-model="tiersChecked"
v-on:click="tiersChecked = !tiersChecked" name="tiers" value="tiers"/>
<label> En Cours</label>
<input type="checkbox" class="filtreTableau" id="filtreEnCours" v-model="enCoursChecked"
v-on:click="enCoursChecked = !enCoursChecked" name="en-cours" value="en-cours"/>
</div>
<div id="principal" v-show="!modeConsultation && !modeModification">
<!-- width: 330px;
-->
<div id="ensemble" :style="isActif ? {width: '330px'} : {width: '40px'}">
<button id="changerVariante" :style="isActif ? {width: 'auto'} : {width: '20px'}"
v-show="!modeConsultation && !modeModification" v-on:click="changerVariante">{{ texteBoutonvariante }}</button>
<br><br>
<div id="ensemble">
<button id="boutonVolet" v-on:click="desactiverVolet" v-bind:style="panierChoisi ? {'margin-top': '0%'} : {'margin-top': '24px'}"></button>
<div class="full" id="volet" v-show="isActif">
<Volet_Menu v-bind:panierChoisi = "panierChoisi" @filtre_choisi="passerFiltre" @basculeRechercheFiltre="basculeRechercheFiltre"/>
......@@ -24,7 +17,19 @@
</div>
</div>
<div id="tableau">
<div id="tableau" :style="isActif ? {width: '90%'} : {width: '98%'}" >
<div class="choixPanier" v-show="panierChoisi && !modeConsultation && !modeModification">
<label id="labelPerso" :style="isActif ? {'margin-left': '-5px'} : {'margin-left': '148px'}">Perso </label>
<input type="checkbox" class="filtreTableau" id="filtrePerso" v-model="persoChecked"
v-on:click="persoChecked = !persoChecked" name="perso" value="tiers"/>
<label> Tiers </label>
<input type="checkbox" class="filtreTableau" id="filtreTiers" v-model="tiersChecked"
v-on:click="tiersChecked = !tiersChecked" name="tiers" value="tiers"/>
<label> En Cours</label>
<input type="checkbox" class="filtreTableau" id="filtreEnCours" v-model="enCoursChecked"
v-on:click="enCoursChecked = !enCoursChecked" name="en-cours" value="en-cours"/>
</div>
<!-- <table v-bind:style="panierChoisi ? {'margin-top': '0%'} : {'margin-top': '24px'}">-->
<table :style="{
'margin-top': (panierChoisi ? '0%' : '24px' ),
......@@ -36,7 +41,7 @@
<th v-bind:colspan="!isActif ? 10 : 8">Contenus</th>
</tr>
</thead>
<tr>
<tr v-bind:style="{'background-color': 'orange'}">
<th>Titre</th>
<th>Auteur</th>
<th>Version actuelle</th>
......@@ -109,7 +114,13 @@
</table>
<tooltip />
<div id="ajouterContenu" v-show="panierChoisi && !modeConsultation" class="circle" v-bind:style="{'margin-left': (!isActif ? '94.8%' : '94%')}">
<b-popover target="ajouterContenu" triggers="click" placement="lefttop">
<template #title>Choix : </template>
<button v-on:click="ajouterContenu('1')" v-bind:style="'height: auto; width: auto'">1. Créer un markdown</button>
<button v-on:click="ajouterContenu('2')" v-bind:style="'height: auto; width: auto'">2. Importer un xml moodle</button>
</b-popover>
</div>
</div>
</div>
......@@ -117,14 +128,7 @@
<Modifier_Contenu v-bind:auteur="auteur" v-bind:texteDuContenu = "texteDuContenu" v-bind:contenuCliqueProvenance = "contenuCliqueProvenance"
v-show="!modeConsultation && modeModification" @choixModif="choixModif" v-bind:titreContenu="titreContenu"/>
<div id="ajouterContenu" v-show="panierChoisi && !modeConsultation" class="circle" v-bind:style="{'margin-left': '95%', 'margin-top': (!isActif ? '22.7%' : '1%')}">
<b-popover target="ajouterContenu" triggers="click" placement="lefttop">
<template #title>Choix : </template>
<button v-on:click="ajouterContenu('1')" v-bind:style="'height: auto; width: auto'">1. Créer un markdown</button>
<button v-on:click="ajouterContenu('2')" v-bind:style="'height: auto; width: auto'">2. Importer un xml moodle</button>
</b-popover>
</div>
<Test v-show="false"></Test>
</div>
</template>
......@@ -186,6 +190,7 @@ export default {
razModeVariante: false,
modeFiltre: false,
isMoodle: false,
texteBoutonvariante: "changer",
chocolat: '<h1 id="hellomarkdown">hello, markdown!</h1>',
imgEtoile: "https://previews.123rf.com/images/ylivdesign/ylivdesign1612/ylivdesign161208906/67933171-ic%C3%B4ne-%C3%A9toile-%C3%A0-cinq-branches-jaunes-illustration-de-dessin-anim%C3%A9-d-ic%C3%B4ne-de-vecteur-%C3%A9toile-jaune-%C3%A0-cinq-branches-.jpg",
imgPoubelle: "data:image/png;base64,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"
......@@ -274,6 +279,7 @@ export default {
*/
desactiverVolet: function () {
this.isActif = !this.isActif
this.texteBoutonvariante === "changer" ? this.texteBoutonvariante = "c" : this.texteBoutonvariante = "changer"
},
/**
* @vuese
......@@ -653,7 +659,7 @@ export default {
}
.choixPanier{
margin-left: 335px;
margin-left: 30px;
margin-top: 0px;
}
......@@ -692,7 +698,7 @@ tfoot {
}
#changerVariante {
width: auto;
/*width: auto;*/
text-align: center;
line-height: 1em;
margin-left: 10px;
......@@ -711,6 +717,14 @@ tfoot {
background-size: cover;
}
#ajouterContenu {
position:absolute;
top:90%;
right: 1%;
z-index: 1;
}
.filtreTableau{
margin: 0 5px 0 5px;
}
......@@ -752,10 +766,14 @@ th image
width: 1500px !important;
}
/*#ensemble {
#ensemble {
background-color: whitesmoke;
height: 700px;
}*/
height: 846px;
}
#tableau {
background-color: lightgrey;
}
/*#divPrincipale {
background-color: lightgray;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment