Commit 3a43f954 authored by okhin's avatar okhin 🚴

Merge branch 'preprod' into '32-nouveau-front'

# Conflicts:
#   app/view/user/perso.html
#   www/static/css/custom.css
parents 357997d5 3d6385d9
Pipeline #2122 passed with stages
in 10 seconds
......@@ -263,60 +263,57 @@
</div>
</div>
</div>
</div><!-- piplome -->
</check>
<check if="{{ @infos.cumul >= 50 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
</div>
<div class="col-md-3 text-center">
<p>
<img class="" src="/static/img/pibag.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi2">
<h3 class="text-left">{{ _("Pibag")}}</h3>
</label>
</div>
</div>
<div class="c-prixcontrepartie">
<p>50&nbsp;</p>
</div>
</div><!-- piplome -->
</check>
<check if="{{ @infos.cumul >= 50 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
</div>
<div class="col-md-3 text-center">
<p>
<img class="" src="/static/img/pibag2.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi2">
<h3 class="text-left">{{ _("Pibag")}}</h3>
</label>
</div>
</div>
</div>
</div><!-- / Pibag -->
</check>
<check if="{{ @infos.cumul >= 100 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pishirt -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi3" name="quoi"<check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
</div>
<div class="col-md-3 text-center">
<p>
<img class="" src="/static/img/pishirt.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi3">
<h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
</label>
<div class="text-left">
<div class="form-group text-left">
<label for="taille">{{ _("Taille") }}</label>
<select class="form-control" name="taille">
<repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
<option value="{{ @key }}">{{ @value }}</option>
</repeat>
</select>
</div>
</div>
</div><!-- / Pibag -->
</check>
<check if="{{ @infos.cumul >= 100 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pishirt -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi3" name="quoi"<check if="{{ @infos.cumul < 100 }}">disabled</check> value="pishirt">
</div>
<div class="col-md-3 text-center">
<p>
<img class="" src="/static/img/pishirt2.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi3">
<h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
</label>
<form class="text-left">
<div class="form-group text-left">
<label for="taille">{{ _("Taille") }}</label>
<select class="form-control" name="taille">
<repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
<option value="{{ @key }}">{{ @value }}</option>
</repeat>
</select>
</div>
</div>
</div>
......@@ -325,34 +322,34 @@
</div>
</div>
</div>
</div><!-- / Pishirt -->
</check>
<check if="{{ @infos.cumul >= 250 }}">
<div class="col-md-8 col-md-offset-2"><!-- Hoopi -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoopie">
</div>
<div class="col-md-3 text-center">
<p>
<img class="media-object" src="/static/img/hoopie.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi4">
<h3 class="text-left">{{ _("Hoodie")}}</h3>
</label>
<div class="text-left">
<div class="form-group text-left">
<label for="taille">{{ _("Taille") }}</label>
<select name="taille_h" class="form-control">
<repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
<option value="{{ @key }}">{{ @value }}</option>
</repeat>
</select>
</div>
</div>
</div><!-- / Pishirt -->
</check>
<check if="{{ @infos.cumul >= 250 }}">
<div class="col-md-8 col-md-offset-2"><!-- Hoopi -->
<div class="panel panel-default">
<div class="panel-body c-panelcontrepartie">
<div class="col-md-1">
<input type="checkbox" class="" id="quoi4" name="quoi"<check if="{{ @infos.cumul < 250 }}">disabled</check> value="hoopie">
</div>
<div class="col-md-3 text-center">
<p>
<img class="media-object" src="/static/img/hoopie2.svg" alt="">
</p>
</div>
<div class="col-md-8">
<div class="form-group text-left">
<label for="quoi4">
<h3 class="text-left">{{ _("Hoodie")}}</h3>
</label>
<form class="text-left">
<div class="form-group text-left">
<label for="taille">{{ _("Taille") }}</label>
<select name="taille_h" class="form-control">
<repeat group="{{ @atailles }}" key="{{ @key }}" value="{{ @value }}">
<option value="{{ @key }}">{{ @value }}</option>
</repeat>
</select>
</div>
</div>
</div>
......
......@@ -204,7 +204,9 @@ transform: rotate(-90deg);
}
#compte + label > div > div, #adresses + label > div > div, #histo + label > div > div {
margin-top: 25px;
margin-top: 23px;
margin-right:10px;
padding:0;
width: 0;
height: 0;
border-left: 6px solid transparent;
......
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