Browse Source

Adaptations backend/communicate

refactoring
Guillaume Bourgeois 5 years ago
parent
commit
959ae2e0d5
5 changed files with 63 additions and 61 deletions
  1. +1
    -1
      backend/views/communicate/instructions.php
  2. BIN
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc
  3. +58
    -57
      backend/web/css/screen.css
  4. +3
    -2
      backend/web/sass/screen.scss
  5. +1
    -1
      common/models/Producer.php

+ 1
- 1
backend/views/communicate/instructions.php View File

<div class="communicate-instructions<?php if(isset($pdf) && $pdf): ?> communicate-instructions-pdf<?php endif; ?><?php if(!isset($pdf)): ?> communicate-instructions-inset<?php endif; ?>"> <div class="communicate-instructions<?php if(isset($pdf) && $pdf): ?> communicate-instructions-pdf<?php endif; ?><?php if(!isset($pdf)): ?> communicate-instructions-inset<?php endif; ?>">
<div class="header"> <div class="header">
<div class="logo"> <div class="logo">
<img src="./img/laboulange4.png" alt="Logo" />
<img src="../img/laboulange4.png" alt="Logo" />
</div> </div>
<h1>La boîte à pain</h1> <h1>La boîte à pain</h1>
<h2>Plateforme de réservation de pain</h2> <h2>Plateforme de réservation de pain</h2>

BIN
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc View File


+ 58
- 57
backend/web/css/screen.css View File

margin-bottom: 30px; margin-bottom: 30px;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
} }
/* line 1028, ../sass/screen.scss */
/* line 1029, ../sass/screen.scss */
.communicate-instructions .header .logo { .communicate-instructions .header .logo {
display: none;
float: left; float: left;
width: 75px; width: 75px;
padding-right: 20px; padding-right: 20px;
padding-top: 10px; padding-top: 10px;
} }
/* line 1034, ../sass/screen.scss */
/* line 1036, ../sass/screen.scss */
.communicate-instructions .header .logo img { .communicate-instructions .header .logo img {
width: 75px; width: 75px;
} }
/* line 1040, ../sass/screen.scss */
/* line 1041, ../sass/screen.scss */
.communicate-instructions .header h1 { .communicate-instructions .header h1 {
font-family: "comfortaaregular"; font-family: "comfortaaregular";
font-size: 40px; font-size: 40px;
margin-bottom: 0px; margin-bottom: 0px;
font-weight: normal; font-weight: normal;
} }
/* line 1048, ../sass/screen.scss */
/* line 1049, ../sass/screen.scss */
.communicate-instructions .header h2 { .communicate-instructions .header h2 {
margin-top: 0px; margin-top: 0px;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
left: 2px; left: 2px;
font-weight: normal; font-weight: normal;
} }
/* line 1059, ../sass/screen.scss */
/* line 1060, ../sass/screen.scss */
.communicate-instructions h3 { .communicate-instructions h3 {
font-family: "comfortaalight"; font-family: "comfortaalight";
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
font-size: 25px;
font-size: 20px;
color: #BB8757; color: #BB8757;
margin-top: 0px; margin-top: 0px;
margin-bottom: 0px; margin-bottom: 0px;
} }


/* line 1069, ../sass/screen.scss */
/* line 1070, ../sass/screen.scss */
.communicate-instructions-inset { .communicate-instructions-inset {
width: 420px; width: 420px;
margin-top: 20px; margin-top: 20px;
} }
/* line 1073, ../sass/screen.scss */
/* line 1074, ../sass/screen.scss */
.communicate-instructions-inset .header .logo { .communicate-instructions-inset .header .logo {
width: 60px; width: 60px;
margin-right: 20px; margin-right: 20px;
padding-top: 5px; padding-top: 5px;
} }
/* line 1078, ../sass/screen.scss */
/* line 1079, ../sass/screen.scss */
.communicate-instructions-inset .header .logo img { .communicate-instructions-inset .header .logo img {
width: 60px; width: 60px;
} }
/* line 1084, ../sass/screen.scss */
/* line 1085, ../sass/screen.scss */
.communicate-instructions-inset .header h1 { .communicate-instructions-inset .header h1 {
margin-bottom: 3px; margin-bottom: 3px;
} }
/* line 1093, ../sass/screen.scss */
/* line 1094, ../sass/screen.scss */
.communicate-instructions-inset h3 { .communicate-instructions-inset h3 {
margin-top: 15px; margin-top: 15px;
margin-bottom: 15px; margin-bottom: 15px;
} }


/* line 1099, ../sass/screen.scss */
/* line 1100, ../sass/screen.scss */
.block-instructions-pdf { .block-instructions-pdf {
width: 49.9%; width: 49.9%;
float: left; float: left;
border-bottom: dotted 1px gray; border-bottom: dotted 1px gray;
} }


/* line 1105, ../sass/screen.scss */
/* line 1106, ../sass/screen.scss */
.block-instructions-border { .block-instructions-border {
border-right: dotted 1px gray; border-right: dotted 1px gray;
border-bottom: dotted 1px gray; border-bottom: dotted 1px gray;
} }


/* line 1110, ../sass/screen.scss */
/* line 1111, ../sass/screen.scss */
.communicate-instructions-pdf { .communicate-instructions-pdf {
border: 0px none; border: 0px none;
-moz-border-radius: 0px; -moz-border-radius: 0px;
margin-bottom: 0px; margin-bottom: 0px;
padding: 20px 0px 20px 30px; padding: 20px 0px 20px 30px;
} }
/* line 1118, ../sass/screen.scss */
/* line 1119, ../sass/screen.scss */
.communicate-instructions-pdf .header .logo { .communicate-instructions-pdf .header .logo {
float: left; float: left;
width: 55px; width: 55px;
padding-right: 15px; padding-right: 15px;
padding-top: 10px; padding-top: 10px;
} }
/* line 1124, ../sass/screen.scss */
/* line 1125, ../sass/screen.scss */
.communicate-instructions-pdf .header .logo img { .communicate-instructions-pdf .header .logo img {
width: 55px; width: 55px;
} }
/* line 1128, ../sass/screen.scss */
/* line 1129, ../sass/screen.scss */
.communicate-instructions-pdf .header h1 { .communicate-instructions-pdf .header h1 {
font-size: 32px; font-size: 32px;
} }
/* line 1131, ../sass/screen.scss */
/* line 1132, ../sass/screen.scss */
.communicate-instructions-pdf .header h2 { .communicate-instructions-pdf .header h2 {
font-size: 16px; font-size: 16px;
} }
/* line 1136, ../sass/screen.scss */
/* line 1137, ../sass/screen.scss */
.communicate-instructions-pdf h3 { .communicate-instructions-pdf h3 {
font-weight: normal; font-weight: normal;
} }


/* line 1141, ../sass/screen.scss */
/* line 1142, ../sass/screen.scss */
.block-instructions-bottom { .block-instructions-bottom {
border-bottom: 0px none; border-bottom: 0px none;
border-bottom: solid 1px white; border-bottom: solid 1px white;
} }


/* abonnements */ /* abonnements */
/* line 1151, ../sass/screen.scss */
/* line 1152, ../sass/screen.scss */
.subscription-form #block-select-user { .subscription-form #block-select-user {
padding-left: 0px; padding-left: 0px;
} }
/* line 1155, ../sass/screen.scss */
/* line 1156, ../sass/screen.scss */
.subscription-form #or-user { .subscription-form #or-user {
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
} }
/* line 1158, ../sass/screen.scss */
/* line 1159, ../sass/screen.scss */
.subscription-form #or-user span { .subscription-form #or-user span {
position: relative; position: relative;
top: 24px; top: 24px;
} }
/* line 1164, ../sass/screen.scss */
/* line 1165, ../sass/screen.scss */
.subscription-form .field-subscriptionform-id_producer { .subscription-form .field-subscriptionform-id_producer {
display: none; display: none;
} }
/* line 1168, ../sass/screen.scss */
/* line 1169, ../sass/screen.scss */
.subscription-form .days .form-group { .subscription-form .days .form-group {
float: left; float: left;
margin-right: 20px; margin-right: 20px;
} }
/* line 1175, ../sass/screen.scss */
/* line 1176, ../sass/screen.scss */
.subscription-form .products .table { .subscription-form .products .table {
width: 500px; width: 500px;
} }
/* line 1178, ../sass/screen.scss */
/* line 1179, ../sass/screen.scss */
.subscription-form .products .quantity { .subscription-form .products .quantity {
text-align: center; text-align: center;
} }


/* points de vente */ /* points de vente */
/* line 1187, ../sass/screen.scss */
/* line 1188, ../sass/screen.scss */
.point-sale-form #pointsale-users { .point-sale-form #pointsale-users {
display: none; display: none;
height: 500px; height: 500px;
overflow-y: scroll; overflow-y: scroll;
} }
/* line 1191, ../sass/screen.scss */
/* line 1192, ../sass/screen.scss */
.point-sale-form #pointsale-users label { .point-sale-form #pointsale-users label {
font-weight: normal; font-weight: normal;
display: block; display: block;
} }
/* line 1195, ../sass/screen.scss */
/* line 1196, ../sass/screen.scss */
.point-sale-form #pointsale-users .comment { .point-sale-form #pointsale-users .comment {
display: none; display: none;
margin-left: 17px; margin-left: 17px;
width: 200px; width: 200px;
} }
/* line 1203, ../sass/screen.scss */
/* line 1204, ../sass/screen.scss */
.point-sale-form #delivery-days .form-group { .point-sale-form #delivery-days .form-group {
float: left; float: left;
margin-right: 15px; margin-right: 15px;
} }
/* line 1207, ../sass/screen.scss */
/* line 1208, ../sass/screen.scss */
.point-sale-form #delivery-days .form-group label { .point-sale-form #delivery-days .form-group label {
font-weight: normal; font-weight: normal;
} }


/* utilisateurs */ /* utilisateurs */
/* line 1217, ../sass/screen.scss */
/* line 1218, ../sass/screen.scss */
.user-index .input-group { .user-index .input-group {
width: 180px; width: 180px;
} }
/* line 1220, ../sass/screen.scss */
/* line 1221, ../sass/screen.scss */
.user-index .input-group .input-credit { .user-index .input-group .input-credit {
text-align: center; text-align: center;
} }
/* line 1225, ../sass/screen.scss */
/* line 1226, ../sass/screen.scss */
.user-index #tabs-points-sale { .user-index #tabs-points-sale {
margin-bottom: 20px; margin-bottom: 20px;
} }
/* line 1229, ../sass/screen.scss */
/* line 1230, ../sass/screen.scss */
.user-index .btn-liste-emails { .user-index .btn-liste-emails {
float: right; float: right;
position: relative; position: relative;
top: -8px; top: -8px;
} }


/* line 1237, ../sass/screen.scss */
/* line 1238, ../sass/screen.scss */
.user-credit .the-credit { .user-credit .the-credit {
float: right; float: right;
font-weight: bold; font-weight: bold;
} }


/* facturation */ /* facturation */
/* line 1252, ../sass/screen.scss */
/* line 1253, ../sass/screen.scss */
#free-price { #free-price {
padding: 20px; padding: 20px;
background-color: #F9F9F9; background-color: #F9F9F9;
} }
/* line 1256, ../sass/screen.scss */
/* line 1257, ../sass/screen.scss */
#free-price h2 { #free-price h2 {
font-family: "myriadpro-it"; font-family: "myriadpro-it";
} }
/* line 1260, ../sass/screen.scss */
/* line 1261, ../sass/screen.scss */
#free-price .amount span { #free-price .amount span {
font-size: 25px; font-size: 25px;
color: white; color: white;
padding-top: 7px; padding-top: 7px;
font-family: "myriadpro-regular"; font-family: "myriadpro-regular";
} }
/* line 1271, ../sass/screen.scss */
/* line 1272, ../sass/screen.scss */
#free-price label { #free-price label {
text-transform: uppercase; text-transform: uppercase;
font-family: "myriadpro-light"; font-family: "myriadpro-light";
font-size: 20px; font-size: 20px;
} }
/* line 1276, ../sass/screen.scss */
/* line 1277, ../sass/screen.scss */
#free-price label span { #free-price label span {
font-size: 16px; font-size: 16px;
} }
/* line 1282, ../sass/screen.scss */
/* line 1283, ../sass/screen.scss */
#free-price .field-producer-free_price .input-group { #free-price .field-producer-free_price .input-group {
width: 200px; width: 200px;
} }
/* line 1288, ../sass/screen.scss */
/* line 1289, ../sass/screen.scss */
#free-price .field-user-free_price label { #free-price .field-user-free_price label {
display: none; display: none;
} }
/* line 1293, ../sass/screen.scss */
/* line 1294, ../sass/screen.scss */
#free-price #producer-free_price { #free-price #producer-free_price {
width: 100px; width: 100px;
height: 60px; height: 60px;
text-align: center; text-align: center;
} }


/* line 1303, ../sass/screen.scss */
/* line 1304, ../sass/screen.scss */
.development-index ul#tabs-status-developments { .development-index ul#tabs-status-developments {
margin-bottom: 30px; margin-bottom: 30px;
border-bottom: solid 3px #BB8757; border-bottom: solid 3px #BB8757;
} }
/* line 1307, ../sass/screen.scss */
/* line 1308, ../sass/screen.scss */
.development-index ul#tabs-status-developments a { .development-index ul#tabs-status-developments a {
text-transform: uppercase; text-transform: uppercase;
} }
/* line 1310, ../sass/screen.scss */
/* line 1311, ../sass/screen.scss */
.development-index ul#tabs-status-developments .active { .development-index ul#tabs-status-developments .active {
border: 0px none; border: 0px none;
background: none; background: none;
} }
/* line 1313, ../sass/screen.scss */
/* line 1314, ../sass/screen.scss */
.development-index ul#tabs-status-developments .active a { .development-index ul#tabs-status-developments .active a {
background-color: #BB8757; background-color: #BB8757;
color: white; color: white;
} }
/* line 1321, ../sass/screen.scss */
/* line 1322, ../sass/screen.scss */
.development-index #tab-developments .btn-group-priority { .development-index #tab-developments .btn-group-priority {
width: 100%; width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
/* line 1325, ../sass/screen.scss */
/* line 1326, ../sass/screen.scss */
.development-index #tab-developments .btn-group-priority .btn-priority { .development-index #tab-developments .btn-group-priority .btn-priority {
display: block; display: block;
float: none; float: none;
width: 100%; width: 100%;
} }
/* line 1332, ../sass/screen.scss */
/* line 1333, ../sass/screen.scss */
.development-index #tab-developments .label-priority { .development-index #tab-developments .label-priority {
display: block; display: block;
width: 100%; width: 100%;
} }


/* stats */ /* stats */
/* line 1345, ../sass/screen.scss */
/* line 1346, ../sass/screen.scss */
.stats-products #nav-year { .stats-products #nav-year {
float: right; float: right;
} }
/* line 1350, ../sass/screen.scss */
/* line 1351, ../sass/screen.scss */
.stats-products tr.month th { .stats-products tr.month th {
text-align: center; text-align: center;
} }
/* line 1355, ../sass/screen.scss */
/* line 1356, ../sass/screen.scss */
.stats-products tr.sub-head th { .stats-products tr.sub-head th {
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
} }
/* line 1361, ../sass/screen.scss */
/* line 1362, ../sass/screen.scss */
.stats-products td.name { .stats-products td.name {
text-transform: uppercase; text-transform: uppercase;
} }
/* line 1365, ../sass/screen.scss */
/* line 1366, ../sass/screen.scss */
.stats-products td.align-center { .stats-products td.align-center {
text-align: center; text-align: center;
} }

+ 3
- 2
backend/web/sass/screen.scss View File

/* communiquer */ /* communiquer */


.communicate-instructions { .communicate-instructions {
border: solid 1px #e0e0e0 ; border: solid 1px #e0e0e0 ;
padding: 10px ; padding: 10px ;
@include border-radius(10px) ; @include border-radius(10px) ;
.header { .header {
.logo { .logo {
display: none ;
float: left ; float: left ;
width: 75px ; width: 75px ;
padding-right: 20px ; padding-right: 20px ;
img { img {
width: 75px ; width: 75px ;
} }
} }
h3 { h3 {
font-family: 'comfortaalight' ; font-family: 'comfortaalight' ;
font-family: 'myriadpro-regular' ; font-family: 'myriadpro-regular' ;
font-size: 25px ;
font-size: 20px ;
color: $color1 ; color: $color1 ;
margin-top: 0px ; margin-top: 0px ;
margin-bottom: 0px ; margin-bottom: 0px ;

+ 1
- 1
common/models/Producer.php View File

'with' => [], 'with' => [],
'join_with' => [], 'join_with' => [],
'orderby' => 'name ASC', 'orderby' => 'name ASC',
'attribute_id_producer' => ''
'attribute_id_producer' => 'id'
] ; ] ;
} }



Loading…
Cancel
Save