Commit 0248074f authored by Guinness's avatar Guinness

Merge branch '32-nouveau-front' of git.laquadrature.net:lqdn-interne/don into preprod

parents 25ccdd2e 32ceed2a
Pipeline #2079 passed with stages
in 1 minute and 21 seconds
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" href="{{ 'home' | alias }}"> <a class="navbar-brand" href="{{ 'home' | alias }}">
<img src="/static/img/logo.png" alt=""> <img src="/static/img/logo.svg" alt="">
</a> </a>
</div> </div>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
......
<section class="container-fluid light-blue">
<div class="row">
<div class="page-header col-md-offset-1 col-md-10 merci">
<h1 class="text-center">{{ _("Merci de soutenir La Quadrature du Net et ses actions&nbsp;!")}}</h1>
<em class="text-center"> {{ _("Cette page vous permet de modifier votre pi-xel et vos informations personnelles, <br> de choisir vos contreparties, et liste vos précédents dons.")}}</em>
</div>
</div>
</section>
<section id="wrapper" class="container-fluid">
<div id="subtitle" class="row"> <div id="subtitle" class="row">
<div class="page-header"> <div class="page-header">
<h1 class="text-left">{{ _("Merci &lt;3&nbsp;!")}}</h1> <h1 class="text-left">{{ _("Merci de soutenir La Quadrature du Net &lt;3&nbsp;!")}}</h1>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-4"><!-- Form infos du compte --> <div class="col-md-4"><!-- Form infos du compte -->
<div class="panel panel-default" style="margin-right:2em;"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingInfos"> <div class="panel-heading" role="tab" id="headingInfos">
<div class="panel-title col-xs text-left"> <div class="panel-title col-xs text-left">
<a role="button" data-toggle="collapse" href="#collapseInfos" aria-expanded="flase" aria-controls="collapseInfos"> <a role="button" data-toggle="collapse" href="#collapseInfos" aria-expanded="flase" aria-controls="collapseInfos">
...@@ -54,7 +45,7 @@ ...@@ -54,7 +45,7 @@
</div> </div>
</div><!-- /Form infos du compte --> </div><!-- /Form infos du compte -->
<div class="col-md-4"><!-- Form addresses --> <div class="col-md-4"><!-- Form addresses -->
<div class="panel panel-default" style="margin-right: 1em; margin-left: 1em;"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingAdresses"> <div class="panel-heading" role="tab" id="headingAdresses">
<div class="row"> <div class="row">
<div class="panel-title col-xs-10 text-left"> <div class="panel-title col-xs-10 text-left">
...@@ -132,7 +123,7 @@ ...@@ -132,7 +123,7 @@
</div> </div>
</div><!-- / Form Adresses --> </div><!-- / Form Adresses -->
<div class="col-md-4"><!-- Form historique --> <div class="col-md-4"><!-- Form historique -->
<div class="panel panel-default" style="margin-left: 2em;"> <div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingHistorique"> <div class="panel-heading" role="tab" id="headingHistorique">
<div class="row"> <div class="row">
<div class="panel-title col-xs-10 text-left"> <div class="panel-title col-xs-10 text-left">
...@@ -198,18 +189,6 @@ ...@@ -198,18 +189,6 @@
</div> </div>
</div> </div>
</div><!-- / disponible --> </div><!-- / disponible -->
<div class="col-md-4"><!-- prochain -->
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<div class="panel-title">
<p>{{ _("Prochain bonus disponible dans")}}</p>
</div>
</div>
<div class="panel-body c-pannelfondblanc">
<p class="c-groschiffre"><!-- FIXME calculer le prochain palier -->XX</p>
</div>
</div>
</div><!-- / prochain -->
</div> </div>
<div class="row"><!-- nouveau don --> <div class="row"><!-- nouveau don -->
<div class="row"> <div class="row">
...@@ -219,7 +198,7 @@ ...@@ -219,7 +198,7 @@
</section> </section>
<section id="wrapper" class="text-center container-fluid"> <section id="wrapper" class="text-center container-fluid">
<div id=subtitle" class="row"> <div id="subtitle" class="row">
<div class="page-header"> <div class="page-header">
<h2 class="text-left">{{ _("Demander des contreparties")}}</h2> <h2 class="text-left">{{ _("Demander des contreparties")}}</h2>
</div> </div>
...@@ -265,7 +244,7 @@ ...@@ -265,7 +244,7 @@
<check if="{{ @infos.cumul >= 50 }}"> <check if="{{ @infos.cumul >= 50 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pibag --> <div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-nody c-panelcontrepartie"> <div class="panel-body c-panelcontrepartie">
<div class="col-md-1"> <div class="col-md-1">
<input type="checkbox" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag"> <input type="checkbox" class="" id="quoi2" name="quoi" <check if="{{ @infos.cumul < 50 }}">disabled</check> value="pibag">
</div> </div>
......
...@@ -29,7 +29,7 @@ form .form-group input, select.form-control , textarea.form-control{ ...@@ -29,7 +29,7 @@ form .form-group input, select.form-control , textarea.form-control{
} }
.panel-default .panel-body { .panel-default .panel-body {
color: #2f5188; color: white;
} }
button.c-boutonslongs, input.c-boutonslongs { button.c-boutonslongs, input.c-boutonslongs {
...@@ -94,3 +94,28 @@ border: solid 1px #ccd3dd; ...@@ -94,3 +94,28 @@ border: solid 1px #ccd3dd;
color: #2f5188; color: #2f5188;
background-color: #ffffff; background-color: #ffffff;
} }
#contreparties, #contreparties .well {
background-color:white;
color:#2f5188;
}
section.container-fluid > * {
width: 80%;
margin: auto;
max-width: 1250px;
}
#wrapper .col-md-4 {
width: 50%;
}
h1 .text-left {
margin-left: 1em;
}
/* Problèmes de css à répercuter plus tard */
.col-md- { /* marge gauche arbitraire qui semblait destinée à centrer : .col-md-offset-1 { margin-left: 8.33333333%;} dans bootstrap.css ligne 2086 */
margin:0;
}
p { /* bootstrap.css ligne 1289 marge de 10px sous les p qui n'est utile nullepart */
margin:0;
}
\ No newline at end of file
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