Merge branch 'master' into Kerl/fix_32_do_tirage

This commit is contained in:
Martin Pépin 2016-07-29 19:03:36 +02:00
commit dd951287a9
58 changed files with 1566 additions and 487 deletions

View file

@ -1,4 +1,14 @@
html,body {
background-color : #A7D4CD;
/*
font-family: 'Hind', sans-serif;
*/
font-family: 'Roboto', sans-serif;
}
#principal {
background-color : white;
padding : 0;
}
@font-face {
@ -8,18 +18,35 @@ html,body {
src: local('Droid Serif Bold'), local('DroidSerif-Bold'), url('droidserif.woff') format('woff');
}
.no-padding {
padding : 0;
}
.espace {
clear: both;
min-height : 30px;
}
.no-bottom-margin {
margin-bottom: 0px !important;
}
.spacer {
clear: both;
}
a:link, a:active, a:visited {
a {
color: #111;
background: transparent;
}
a:hover {
color: #444;
background: transparent;
text-decoration: none;
}
form#profile table {
@ -56,6 +83,7 @@ table#bda_formset {
width: 32px;
}
/*
.tools {
width: 32px;
}
@ -66,19 +94,114 @@ table#bda_formset {
.tools a.icon.drag-handler {
margin-right: 5px;
}*/
.form-horizontal .form-group {
margin-right: 0px;
margin-left: 0px;
}
form .control-label {
color: #B56A59;
}
.remove-btn {
color: #E6516A !important;
font-size: large;
}
.drag-btn {
color :#4F504B !important;
font-size: large;
}
.btn-primary,
.btn-primary:active,
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #DE826B;
border-color: #AB6452;
}
.btn-primary:active:hover,
.btn-primary:hover {
color: #fff;
background-color: #D89C8D;
border-color: #AB6452;
}
label {
font-weight: normal;
}
form#bda_form {
margin-top:15px;
}
form#bda_form p {
font-size: 0.8em;
}
form#bda_form thead {
color : #B56A59
}
form#bda_form label.control-label {
display: none;
}
form#bda_form .form-group {
margin-top : 15px;
}
form#bda_form thead {
background-color: #F7F7F7;
}
form#bda_form {
margin-top: 0px;
margin-left: -20px;
margin-right: -20px;
}
table#bda_formset {
border-spacing: 0px 5px;
}
tbody.bda_formset_content {
table#bda_formset th:first-child {
padding-left: 20px;
}
form.petit-cours_form table#bda_formset td:first-child,
form.petit-cours_form table#bda_formset th:first-child {
padding-left: 20px;
}
form.petit-cours_form table#bda_formset td:last-child,
form.petit-cours_form table#bda_formset th:last-child {
padding-right: 20px;
}
form.petit-cours_form .remove-btn {
margin-top : 10px;
}
tr.dynamic-form td {
background: #F0F0F0;
}
tr.dynamic-form.predelete td {
background-color: #FFECEC;
}
tr.ui-sortable-placeholder td, .placeholder-cell {
background: transparent;
}
/*
tr.dynamic-form td {
border-width: 1px 1px 1px 0px;
border-style: solid;
@ -128,7 +251,7 @@ tr.ui-sortable-placeholder td:first-child {
tr.ui-sortable-placeholder td:last-child {
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
}
}*/
form {
padding: 0;
@ -146,6 +269,18 @@ form#profile table td, form#profile table th {
width: 400px;
}
/* centered columns styles */
.row-centered {
text-align:center;
}
.col-centered {
display:inline-block;
float:none;
/* reset the text-align */
text-align:left;
/* inline-block space fix */
}
form#profile table th {
text-align: right;
}
@ -164,25 +299,97 @@ fieldset legend {
}
#main-login-container {
width: 500px;
margin: 7em auto;
margin-top : 7em;
margin-bottom: 7em;
}
#main-login-container .banner {
padding-right: 15px;
padding-left: 15px;
}
#main-login {
width: 500px;
border: 15px solid #333;
-webkit-border-radius: 20px;
-moz-border-radius: 20px;
border-radius: 20px;
background-color: #DE826B;
}
#main-container {
#main-login .btn-primary {
background-color: #B56A59
}
.title-link {
float: none;
display: block;
}
@media (min-width: 480px) {
.title-link {
float: right !important;
}
}
#main-content {
background-color: white ;
padding: 20px;
}
#main-content a,
#main-content a:hover {
color : #D81138;
}
#main-content h3 {
font-weight: 700;
font-size: large;
color:#DE826B;
}
#main-content h4 {
color:#DE826B;
}
#main-content h2,
#main-content h3.horizontal-title {
display : block;
padding : 12px;
margin: -20px -20px 10px -20px ;
font-family: 'Dosis', sans-serif;
font-weight: 700;
color: white;
border-style: solid;
border-color: #4F504B;
}
#main-content h2 {
font-size: x-large;
background-color:#DE826B;
border-width: 0px 0px 5px 0px;
}
#main-content h2 a {
color : #C9E5E1;
}
#main-content h2 a:hover {
color : #ABB8B6;
}
#main-content h3.horizontal-title {
font-weight: 700;
font-size: large;
background-color:#EAA594;
border-width: 0px 0px 3px 0px;
}
/*
main-container {
max-width: 95%;
width: 1000px;
margin: 7em auto;
display: block;
}
}*/
/*
#main {
border: 15px solid #333;
-webkit-border-radius: 20px;
@ -190,8 +397,8 @@ fieldset legend {
border-radius: 20px;
padding: 2em;
box-shadow: 0 0 100px #AAA inset;
}
}*/
/*
#main #main-content {
font-size: 1.25em;
margin-top: 10px;
@ -228,15 +435,94 @@ fieldset legend {
#main p {
margin-top: 8px;
margin-bottom: 8px;
}*/
.home-link {
font-family: 'Dosis', sans-serif;
font-weight: 700;
font-size: large ;
}
#main form li {
.banner h1 {
display : inline;
}
.block-title {
display : block;
padding : 10px;
font-family: 'Dosis', sans-serif;
font-weight: 700;
}
h3.block-title {
color: white;
background-color:#DE826B;
border-style: solid;
border-width: 0px 0px 5px 0px;
border-color: #4F504B;
}
h4.block-title {
color: white;
background-color:#EAA594;
border-style: solid;
border-width: 0px 0px 2px 0px;
border-color: #4F504B;
}
.hm-block h4 {
color: #B56A59;
}
.hm-block {
background-color : white ;
padding : 15px;
}
.buro-user-hm,
.normal-user-hm,
.foot-banner{
padding-left : 0px;
padding-right : 0px;
}
@media (min-width: 768px) {
.buro-user-hm,
.normal-user-hm,
.foot-banner {
padding-left : 15px;
padding-right : 15px;
}
}
.container-fluid {
padding : 0;
}
.buro-user-hm h3.block-title {
background: repeating-linear-gradient(
45deg,
#DE826B,
#DE826B 4px,
#B56A59 4px,
#B56A59 8px
);
}
.home-menu h3.block-title {
font-size: large;
text-transform: uppercase;
}
#main-content form li {
list-style: none;
}
.success {
font-weight: bold;
color: #00B000;
color: #7AB85F;
background-color: transparent;
}
@ -246,7 +532,7 @@ fieldset legend {
.error {
font-weight: bold;
color: #B00000;
color: #F6BEBE;
background-color: transparent;
}
@ -257,6 +543,26 @@ fieldset legend {
list-style: disc;
}
.inscription-bottom {
display: block;
padding: 0px 20px 20px 20px ;
margin-top : 15px;
}
.bda-prix {
font-weight: bold;
color:#DE826B;
}
.table-top {
background-color: #F0F0F0;
margin: -20px;
margin-top: 0px;
padding:20px;
padding-bottom: 28px;
padding-top: 8px;
}
form#bda_form ul.errorlist li {
padding-left: 0px;
list-style: none;
@ -264,39 +570,32 @@ form#bda_form ul.errorlist li {
#main-login.login_block {
padding: 2em;
box-shadow: 0 0 100px #AAA inset;
}
a#login_clipper, a#login_outsider {
float: left;
display: block;
width: 250px;
#login_clipper, #login_outsider {
height: 200px;
text-align: center;
font-family: 'Droid Serif', serif;
font-size: 2em;
font-weight: bold;
line-height: 190px;
text-decoration: none;
color: #FFF;
padding: 70px 20px 40px 20px;
}
a#login_clipper {
background-color: #123E96;
box-shadow: 0 0 100px #040C78 inset;
#login_clipper {
background-color: #49A5E3;
}
a#login_clipper:hover {
background-color: #164BB6;
#login_clipper:hover {
background-color: #71B5E3;
}
a#login_outsider {
background-color: #961221;
box-shadow: 0 0 100px #780411 inset;
#login_outsider {
background-color: #E36748;
}
a#login_outsider:hover {
background-color: #B31729;
#login_outsider:hover {
background-color: #E38871;
}
#main-login label {
@ -349,10 +648,12 @@ html,body,div,span,h1,h2,h3,h4,p,a,img,ul,li,fieldset,form,label,legend {
padding: 0;
border: 0;
outline: 0;
/*
font-weight: inherit;
font-style: inherit;
font-size: 100%;
font-family: inherit;
*/
font-size: 100%;
vertical-align: baseline;
}
@ -365,56 +666,136 @@ ul {
padding: 6px 0 6px 12px;
}
.home-menu ul {
padding: 0px 0px 15px 0px;
list-style-type: none;
}
.home-menu ul:last-child {
padding: 0;
list-style-type: none;
}
/*
body {
font: normal 400 62.5%/1.0 Verdana, sans-serif;
background-color: #eee;
color: #333;
}
}*/
/* HEADER --------------------------------- */
header {
background-color :#4F504B;
font-size:large;
color: white;
padding: 0;
}
header .banner {
padding-top : 15px;
padding-bottom : 15px;
}
header a,
header a:hover,
header a:focus,
header a:active {
color : white ;
}
/*
#header h1 {
font-family: 'Droid Serif', serif;
font-weight: bold;
font-size: 18px;
margin-bottom: 5px;
float: left;
}*/
.user-is-cof {
color : #ADE297;
}
.user-is-not-cof {
color: #EE8585;
}
#main-login #header h1 {
float: none;
}
/*
#header #homelink {
float: right;
}
}*/
tt {
font-weight: bold;
}
.error {
color: #BB0000;
background-color: transparent;
header h1 {
font-family: 'Dosis', sans-serif;
font-size: x-large;
}
header h2 {
display : inline-block;
}
.member-status {
float: left;
display : block;
width:100%;
padding-top: 3px;
}
@media (min-width: 480px) {
.member-status {
float: right;
display: inline;
width: auto;
}
}
.hidden-xxs {
display: none;
}
@media (min-width: 480px) {
.hidden-xxs {
display: inline;
}
}
.secondary {
float:right;
}
header .btn-toolbar {
float : left ;
}
header .btn-default {
color: white;
background-color: #4F504B;
border-color: white;
}
header .btn-default:focus,
header .btn-default.focus {
color: white;
background-color: #686965;
border-color: white;
}
header .btn-default:hover {
color: white;
background-color: #686965;
border-color: white;
}
header .btn-default:active,
header .btn-default.active,
header .open > .dropdown-toggle.btn-default {
background-color: #686965;
border-color: white;
}
/* FORMS --------------------------------- */
#main-login input {
border-width: 1px;
font-family: Verdana,sans-serif;
font-size: 1.1em;
color: #000;
padding: 3px;
min-height: 1.5em;
}
#main-login input[type="text"], #main-login input[type=password] {
border: 2px solid #888;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
border-radius: 8px;
box-shadow: 0 0 12px #AAA inset;
min-height: 2em;
}
input[disabled], input[readonly] {
color: #BBB;
@ -430,34 +811,97 @@ input[type="text"], input[type=password] {
}
input#search_autocomplete {
width: 600px;
font-size: 14px;
height: 20px;
width: 90%;
font-size: 18px;
height: 40px;
padding: 10px 8px;
margin: 0 auto;
margin-top: 20px;
display: block;
color: #aaa;
}
input#search_autocomplete:focus {
font-size: 18px;
color: #343a4a;
}
.autocomplete {margin-bottom:5px;}
.yourlabs-autocomplete ul {list-style-type: none; padding: 0; margin: 0; font-size: 1.5em;}
.yourlabs-autocomplete li {padding: 6px 5px; display: block;}
.yourlabs-autocomplete li a {text-decoration: none;}
.yourlabs-autocomplete li a span.highlight {text-decoration: underline; font-weight: bold;}
.yourlabs-autocomplete li.autocomplete-header {background-color: #FFEF9E; padding: 3px 5px; color: #000;}
.yourlabs-autocomplete li.autocomplete-value {cursor: pointer;}
.yourlabs-autocomplete li.hilight {background-color: #EA4839; color: #FFF; }
.yourlabs-autocomplete li.hilight a {color: #FFF; }
.yourlabs-autocomplete { border: none; background: none; }
.yourlabs-autocomplete.outer-container { position: relative; }
.yourlabs-autocomplete.inner-container { position: absolute; left: -1px; top: 2px; border: 1px solid #B7B7B7; width: 618px; background: #fff; }
.yourlabs-autocomplete.inner-container { margin: 0; padding: 0; overflow-x: hidden; overflow-y: auto; position: relative; list-style-type: none; }
.autocomplete {
margin-bottom:5px;
}
.yourlabs-autocomplete ul {
list-style-type: none;
padding: 0;
margin: 0;
font-size: 1.5em;
}
.yourlabs-autocomplete li {
padding: 6px 5px;
display: block;
}
.yourlabs-autocomplete li a {
text-decoration: none;
}
.yourlabs-autocomplete li a span.highlight {
text-decoration: underline;
font-weight: bold;
}
.yourlabs-autocomplete li.autocomplete-header {
background-color: #FFEF9E;
padding: 3px 5px;
color: #000;
}
.yourlabs-autocomplete li.autocomplete-value {
cursor: pointer;
}
.yourlabs-autocomplete li.hilight {
background-color: #EA4839;
color: #FFF;
}
.yourlabs-autocomplete li.hilight a {color: #FFF; }
.yourlabs-autocomplete {
border: solid;
border-width: 0px 1px 1px 1px;
border-color: #B3B3B3;
background: #FAFAFA;
display: block;
}
.yourlabs-autocomplete.outer-container { position: relative; }
.yourlabs-autocomplete.inner-container {
position: absolute;
left: -1px;
top: 2px;
border: 1px solid #B7B7B7;
width: 618px;
background: #fff;
}
#main-content > .yourlabs-autocomplete {
display:none;
}
.yourlabs-autocomplete.inner-container {
margin: 0;
padding: 0;
overflow-x: hidden;
overflow-y: auto;
position: relative;
list-style-type: none;
}
hr {
border-color : #D4D6C8;
}
/*
hr {
border: 0;
height: 1px;
@ -468,7 +912,7 @@ hr {
background: -ms-linear-gradient(left, hsla(0,0%,70%,0) 0%, hsla(0,0%,70%,.75) 50%, hsla(0,0%,70%,0) 100%);
background: -o-linear-gradient(left, hsla(0,0%,70%,0) 0%, hsla(0,0%,70%,.75) 50%, hsla(0,0%,70%,0) 100%);
background: linear-gradient(left, hsla(0,0%,70%,0) 0%, hsla(0,0%,70%,.75) 50%, hsla(0,0%,70%,0) 100%);
}
}*/
.tristate:hover {
cursor: pointer;
@ -598,42 +1042,39 @@ pre code {
/* Louis pour etat places*/
.etat-bda td {
border:1px solid #666;
padding:4px;
}
.etat-bda tr:nth-child(even) {background: #CCC}
.greenratio {
background-color: #3F3;
border: 5px solid #ccc;
border: 5px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: #ADE297;
text-align: center;
}
.orangeratio {
background-color: #FF3;
border: 5px solid #ccc;
border: 5px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: #EEE285;
text-align: center;
}
.redratio {
background-color: #F33;
border: 5px solid #ccc;
border: 5px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: #EE8585;
text-align: center;
}
th[data-sort]{
cursor:pointer;
}
tbody tr.clickable-row {
cursor:pointer;
}
tr.awesome{
color: red;
}
.title-foot {
padding-right:0px;
padding-left:0px;
}
.foot-banner {
font-family: 'Dosis', sans-serif;
background-color :#4F504B;
color: white;
padding: 20px;
}