BenoitCier
/
Opendistrib
forked from Laclic/Souke
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Intégration nouvelle charte à l'app 'producer'

dev
Guillaume Bourgeois 5 years ago
parent
d4846bd026
commit
ee7fb258a0
12 changed files with 682 additions and 611 deletions
Split View Show Diff Stats
  1. +2
    -2
      common/models/Producer.php
  2. +143
    -136
      frontend/web/css/screen.css
  3. +32
    -26
      frontend/web/sass/screen.scss
  4. +93
    -72
      producer/views/layouts/main.php
  5. +0
    -4
      producer/views/site/index.php
  6. +279
    -265
      producer/web/css/screen.css
  7. BIN
      producer/web/img/favicon-distrib.png
  8. BIN
      producer/web/img/logo-distrib.png
  9. +12
    -5
      producer/web/js/vuejs/order-order.js
  10. +85
    -87
      producer/web/sass/_layout.scss
  11. +24
    -4
      producer/web/sass/_responsive.scss
  12. +12
    -10
      producer/web/sass/order/_order.scss

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

@@ -332,8 +332,8 @@ class Producer extends ActiveRecordCommon
public static function addUser($idUser, $idProducer)
{
$userProducer = UserProducer::searchOne([
'id_user' => $idUser,
'id_producer' => $idProducer
'user_producer.id_user' => $idUser,
'user_producer.id_producer' => $idProducer
]) ;

if (!$userProducer) {

+ 143
- 136
frontend/web/css/screen.css View File

@@ -182,14 +182,25 @@ ul li {
margin: 0px auto;
}

/* line 167, ../sass/screen.scss */
/* line 166, ../sass/screen.scss */
#content {
border-right: solid 1px #e0e0e0;
}
/* line 170, ../sass/screen.scss */
#content #the-content {
padding-top: 100px;
padding-left: 30px;
padding-right: 30px;
padding-bottom: 50px;
}
/* line 178, ../sass/screen.scss */
#content .content-text h1 {
font-family: "highvoltageregular";
font-size: 30px;
color: black;
text-transform: uppercase;
}
/* line 174, ../sass/screen.scss */
/* line 185, ../sass/screen.scss */
#content .content-text h2 {
font-family: "highvoltageregular";
font-size: 20px;
@@ -199,43 +210,35 @@ ul li {
margin-top: 5px;
}

/* line 186, ../sass/screen.scss */
#content #the-content {
padding-top: 100px;
padding-left: 30px;
padding-right: 30px;
padding-bottom: 50px;
}

/* line 194, ../sass/screen.scss */
/* line 196, ../sass/screen.scss */
#block-demo {
padding: 10px 0px;
background-color: #FF7F00;
color: white;
text-align: center;
}
/* line 200, ../sass/screen.scss */
/* line 202, ../sass/screen.scss */
#block-demo a {
color: white;
text-decoration: underline;
}

/* line 206, ../sass/screen.scss */
/* line 208, ../sass/screen.scss */
#header {
z-index: 100;
border-bottom: solid 1px #e0e0e0;
background-color: white;
}
/* line 211, ../sass/screen.scss */
/* line 213, ../sass/screen.scss */
#header .container {
position: relative;
}
/* line 215, ../sass/screen.scss */
/* line 217, ../sass/screen.scss */
#header #the-header {
height: 80px;
height: auto;
}
/* line 220, ../sass/screen.scss */
/* line 222, ../sass/screen.scss */
#header #env-dev {
font-family: "comfortaabold";
text-align: center;
@@ -248,7 +251,7 @@ ul li {
top: 18px;
left: 79px;
}
/* line 233, ../sass/screen.scss */
/* line 235, ../sass/screen.scss */
#header #link-home {
float: left;
padding-top: 10px;
@@ -258,34 +261,34 @@ ul li {
color: black;
display: block;
}
/* line 242, ../sass/screen.scss */
/* line 244, ../sass/screen.scss */
#header #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 248, ../sass/screen.scss */
/* line 250, ../sass/screen.scss */
#header #link-home .text {
float: left;
padding-left: 10px;
}
/* line 252, ../sass/screen.scss */
/* line 254, ../sass/screen.scss */
#header #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 257, ../sass/screen.scss */
/* line 259, ../sass/screen.scss */
#header #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #FF7F00;
}
/* line 265, ../sass/screen.scss */
/* line 267, ../sass/screen.scss */
#header #link-space-producer {
border-left: solid 1px #e0e0e0;
color: #FF7F00;
}
/* line 270, ../sass/screen.scss */
/* line 272, ../sass/screen.scss */
#header nav {
padding-top: 0px;
margin-bottom: 0px;
@@ -295,30 +298,32 @@ ul li {
-webkit-box-shadow: none;
box-shadow: none;
}
/* line 277, ../sass/screen.scss */
/* line 279, ../sass/screen.scss */
#header nav .navbar-toggle {
background-color: white;
}
/* line 281, ../sass/screen.scss */
/* line 283, ../sass/screen.scss */
#header nav ul {
float: right;
padding: 0px;
margin: 0px;
}
/* line 286, ../sass/screen.scss */
/* line 288, ../sass/screen.scss */
#header nav ul li {
padding: 0px;
display: block;
}
/* line 289, ../sass/screen.scss */
/* line 291, ../sass/screen.scss */
#header nav ul li a {
display: block;
text-decoration: none;
color: #323232;
background-color: transparent;
padding: 30px 20px;
margin: 0px;
border-right: solid 1px #e0e0e0;
font-family: "capsuularegular";
color: black;
font-size: 18px;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
@@ -326,25 +331,29 @@ ul li {
-webkit-box-shadow: none;
box-shadow: none;
}
/* line 300, ../sass/screen.scss */
/* line 304, ../sass/screen.scss */
#header nav ul li a span {
font-size: 15px;
}
/* line 308, ../sass/screen.scss */
#header nav ul li a:hover {
color: #FF7F00;
background-color: white;
}
/* line 306, ../sass/screen.scss */
/* line 314, ../sass/screen.scss */
#header nav ul li#li-home a {
border-left: solid 1px #e0e0e0;
}
/* line 311, ../sass/screen.scss */
/* line 319, ../sass/screen.scss */
#header nav ul li.active a {
background-color: #FF7F00;
color: white;
}
/* line 320, ../sass/screen.scss */
/* line 328, ../sass/screen.scss */
#header nav ul li ul li a {
padding: 10px 10px;
}
/* line 333, ../sass/screen.scss */
/* line 341, ../sass/screen.scss */
#header #link-logout .name {
color: gray;
font-size: 10px;
@@ -353,19 +362,19 @@ ul li {
top: -4px;
}

/* line 344, ../sass/screen.scss */
/* line 352, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
padding-top: 35px;
padding-bottom: 50px;
}
/* line 350, ../sass/screen.scss */
/* line 358, ../sass/screen.scss */
#content h1#title-site, #content h1 {
font-family: "highvoltageregular";
font-size: 35px;
}
/* line 355, ../sass/screen.scss */
/* line 363, ../sass/screen.scss */
#content h2 {
color: #323232;
padding-bottom: 15px;
@@ -376,17 +385,17 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 366, ../sass/screen.scss */
/* line 374, ../sass/screen.scss */
#content h3 {
font-family: "highvoltageregular";
font-size: 20px;
color: #323232;
}
/* line 373, ../sass/screen.scss */
/* line 381, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 378, ../sass/screen.scss */
/* line 386, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -395,126 +404,126 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 385, ../sass/screen.scss */
/* line 393, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
padding-top: 40px;
}
/* line 390, ../sass/screen.scss */
/* line 398, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 10px 20px;
font-size: 20px;
text-transform: uppercase;
}
/* line 396, ../sass/screen.scss */
/* line 404, ../sass/screen.scss */
#content #row-signup a.btn-primary {
margin-right: 15px;
}
/* line 401, ../sass/screen.scss */
/* line 409, ../sass/screen.scss */
#content #row-presentation-distrib {
border-bottom: solid 1px #e0e0e0;
}
/* line 404, ../sass/screen.scss */
/* line 412, ../sass/screen.scss */
#content #row-presentation-distrib h2 {
font-family: "capsuularegular";
text-align: center;
margin-top: 0px;
text-transform: none;
}
/* line 412, ../sass/screen.scss */
/* line 420, ../sass/screen.scss */
#content #row-users-producers {
margin-bottom: 50px;
padding-top: 30px;
}
/* line 416, ../sass/screen.scss */
/* line 424, ../sass/screen.scss */
#content #row-users-producers h2 {
text-align: left;
margin-bottom: 10px;
margin-top: 0px;
}
/* line 420, ../sass/screen.scss */
/* line 428, ../sass/screen.scss */
#content #row-users-producers h2 .img {
height: 35px;
}
/* line 423, ../sass/screen.scss */
/* line 431, ../sass/screen.scss */
#content #row-users-producers h2 span {
margin-left: 10px;
font-size: 25px;
position: relative;
top: 5px;
}
/* line 431, ../sass/screen.scss */
/* line 439, ../sass/screen.scss */
#content #row-users-producers h3 {
margin-top: 0px;
}
/* line 435, ../sass/screen.scss */
/* line 443, ../sass/screen.scss */
#content #row-users-producers p.presentation {
font-family: "capsuularegular";
color: black;
font-size: 20px;
line-height: 26px;
}
/* line 442, ../sass/screen.scss */
/* line 450, ../sass/screen.scss */
#content #row-users-producers ul {
text-align: left;
}
/* line 444, ../sass/screen.scss */
/* line 452, ../sass/screen.scss */
#content #row-users-producers ul li {
color: #FF7F00;
}
/* line 449, ../sass/screen.scss */
/* line 457, ../sass/screen.scss */
#content #row-users-producers p {
padding-bottom: 4px;
}
/* line 453, ../sass/screen.scss */
/* line 461, ../sass/screen.scss */
#content #row-users-producers .btn-primary {
margin-top: 20px;
}
/* line 460, ../sass/screen.scss */
/* line 468, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}

/* line 470, ../sass/screen.scss */
/* line 478, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 474, ../sass/screen.scss */
/* line 482, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 480, ../sass/screen.scss */
/* line 488, ../sass/screen.scss */
#content #contact .form-control:focus {
/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
border-color: $jaune ;*/
}
/* line 485, ../sass/screen.scss */
/* line 493, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 489, ../sass/screen.scss */
/* line 497, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 492, ../sass/screen.scss */
/* line 500, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 499, ../sass/screen.scss */
/* line 507, ../sass/screen.scss */
#bookmarked-producers {
background-color: #323232;
padding: 0px;
padding-top: 20px;
margin: 0px;
border-bottom: solid 1px #e0e0e0;
}
/* line 505, ../sass/screen.scss */
/* line 513, ../sass/screen.scss */
#bookmarked-producers h2 {
font-family: "highvoltageregular";
color: white;
color: #323232;
text-align: left;
font-size: 16px;
margin: 0px;
@@ -522,23 +531,23 @@ ul li {
margin-left: 15px;
margin-bottom: 15px;
}
/* line 516, ../sass/screen.scss */
/* line 524, ../sass/screen.scss */
#bookmarked-producers .col-md-12, #bookmarked-producers .col-md-6, #bookmarked-producers .col-md-3 {
float: left;
}
/* line 520, ../sass/screen.scss */
/* line 528, ../sass/screen.scss */
#bookmarked-producers .col-md-12 .producer {
background-size: 920px auto;
}
/* line 523, ../sass/screen.scss */
/* line 531, ../sass/screen.scss */
#bookmarked-producers .col-md-6 .producer {
background-size: 460px auto;
}
/* line 527, ../sass/screen.scss */
/* line 535, ../sass/screen.scss */
#bookmarked-producers .col-md-3 .producer {
background-size: 230px auto;
}
/* line 531, ../sass/screen.scss */
/* line 539, ../sass/screen.scss */
#bookmarked-producers .producer {
position: relative;
height: 100px;
@@ -548,10 +557,10 @@ ul li {
background-size: 300px auto;
background-position: center center;
background-repeat: no-repeat;
border: solid 1px white;
border: solid 1px #e0e0e0;
background-color: white;
}
/* line 543, ../sass/screen.scss */
/* line 551, ../sass/screen.scss */
#bookmarked-producers .producer a {
position: absolute;
bottom: 0px;
@@ -564,30 +573,28 @@ ul li {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 553, ../sass/screen.scss */
/* line 561, ../sass/screen.scss */
#bookmarked-producers .producer a:hover {
background-color: #fafafa;
border-color: white;
color: #FF7F00;
background-color: #f57a00;
}
/* line 561, ../sass/screen.scss */
/* line 567, ../sass/screen.scss */
#bookmarked-producers #discover {
padding-bottom: 20px;
text-align: center;
}
/* line 565, ../sass/screen.scss */
/* line 571, ../sass/screen.scss */
#bookmarked-producers #discover p {
padding-bottom: 0px;
color: white;
}
/* line 570, ../sass/screen.scss */
/* line 576, ../sass/screen.scss */
#bookmarked-producers #discover .btn {
background-color: white;
color: #FF7F00;
border: solid 1px white;
}

/* line 579, ../sass/screen.scss */
/* line 585, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -598,7 +605,7 @@ ul li {
background-color: white;
border-top: solid 1px #e0e0e0;
}
/* line 589, ../sass/screen.scss */
/* line 595, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
@@ -610,33 +617,33 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 599, ../sass/screen.scss */
/* line 605, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 603, ../sass/screen.scss */
/* line 609, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}
/* line 609, ../sass/screen.scss */
/* line 615, ../sass/screen.scss */
#footer #code-source img {
height: 20px;
}

/* line 615, ../sass/screen.scss */
/* line 621, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 618, ../sass/screen.scss */
/* line 624, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 623, ../sass/screen.scss */
/* line 629, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 627, ../sass/screen.scss */
/* line 633, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -644,7 +651,7 @@ ul li {
line-height: 35px;
font-family: "highvoltageregular";
}
/* line 635, ../sass/screen.scss */
/* line 641, ../sass/screen.scss */
#content #mentions h3 {
font-family: "highvoltageregular";
font-size: 18px;
@@ -653,53 +660,53 @@ ul li {
color: black;
}

/* line 650, ../sass/screen.scss */
/* line 656, ../sass/screen.scss */
.vegas-loading {
display: none;
}

/* line 657, ../sass/screen.scss */
/* line 663, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 661, ../sass/screen.scss */
/* line 667, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 666, ../sass/screen.scss */
/* line 672, ../sass/screen.scss */
#profil-user #mails-days-distribution .form-group {
float: left;
margin-right: 15px;
}
/* line 669, ../sass/screen.scss */
/* line 675, ../sass/screen.scss */
#profil-user #mails-days-distribution .form-group label {
font-weight: normal;
}
/* line 675, ../sass/screen.scss */
/* line 681, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* login */
/* line 684, ../sass/screen.scss */
/* line 690, ../sass/screen.scss */
.site-login .col-lg-5 {
margin: 0px auto;
float: none;
}

/* signup */
/* line 692, ../sass/screen.scss */
/* line 698, ../sass/screen.scss */
.modal-backdrop {
z-index: 999;
}

/* line 697, ../sass/screen.scss */
/* line 703, ../sass/screen.scss */
.site-signup .col-lg-5 {
margin: 0px auto;
float: none;
}

/* line 707, ../sass/screen.scss */
/* line 713, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -707,37 +714,37 @@ ul li {
margin-top: 0px;
}

/* line 717, ../sass/screen.scss */
/* line 723, ../sass/screen.scss */
#form-signup #user-producer {
margin-bottom: 30px;
}
/* line 722, ../sass/screen.scss */
/* line 728, ../sass/screen.scss */
#form-signup #signupform-id_producer option:disabled {
font-weight: bold;
color: black;
}
/* line 728, ../sass/screen.scss */
/* line 734, ../sass/screen.scss */
#form-signup #champs-producer {
display: none;
}
/* line 732, ../sass/screen.scss */
/* line 738, ../sass/screen.scss */
#form-signup #buttons-signup {
margin-top: 30px;
}

/* line 737, ../sass/screen.scss */
/* line 743, ../sass/screen.scss */
#col-left {
padding: 0px;
z-index: 15;
}
/* line 741, ../sass/screen.scss */
/* line 747, ../sass/screen.scss */
#col-left .affix {
width: 25%;
border-right: solid 1px #e0e0e0;
background-color: #FAFAFA;
height: 100%;
}
/* line 748, ../sass/screen.scss */
/* line 754, ../sass/screen.scss */
#col-left #link-home {
text-decoration: none;
font-size: 22px;
@@ -746,28 +753,28 @@ ul li {
padding: 10px;
background-color: white;
}
/* line 756, ../sass/screen.scss */
/* line 762, ../sass/screen.scss */
#col-left #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 762, ../sass/screen.scss */
/* line 768, ../sass/screen.scss */
#col-left #link-home .text {
padding-left: 62px;
}
/* line 765, ../sass/screen.scss */
/* line 771, ../sass/screen.scss */
#col-left #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 770, ../sass/screen.scss */
/* line 776, ../sass/screen.scss */
#col-left #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #FF7F00;
}
/* line 778, ../sass/screen.scss */
/* line 784, ../sass/screen.scss */
#col-left h2 {
font-family: "myriadpro-regular";
color: black;
@@ -775,37 +782,37 @@ ul li {
margin-bottom: 10px;
padding: 15px 0px 5px 15px;
}
/* line 786, ../sass/screen.scss */
/* line 792, ../sass/screen.scss */
#col-left #links {
background-color: white;
margin-bottom: 20px;
}
/* line 792, ../sass/screen.scss */
/* line 798, ../sass/screen.scss */
#col-left #links ul li a {
text-align: center;
border-right: solid 1px #e0e0e0;
}
/* line 796, ../sass/screen.scss */
/* line 802, ../sass/screen.scss */
#col-left #links ul li a:hover {
background-color: #FF7F00;
color: white;
}
/* line 802, ../sass/screen.scss */
/* line 808, ../sass/screen.scss */
#col-left #links ul li:last-child a {
border-right: 0px none;
}
/* line 812, ../sass/screen.scss */
/* line 818, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li a {
padding-left: 50px;
height: 40px;
}
/* line 818, ../sass/screen.scss */
/* line 824, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li.active a {
background-color: #FF7F00;
position: relative;
color: white;
}
/* line 823, ../sass/screen.scss */
/* line 829, ../sass/screen.scss */
#col-left #producers nav.nav-producers ul li.active a:after {
right: -40px;
top: 50%;
@@ -820,18 +827,18 @@ ul li {
border-width: 20px;
margin-top: -20px;
}
/* line 842, ../sass/screen.scss */
/* line 848, ../sass/screen.scss */
#col-left ul {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 846, ../sass/screen.scss */
/* line 852, ../sass/screen.scss */
#col-left ul li {
margin: 0px;
padding: 0px;
}
/* line 849, ../sass/screen.scss */
/* line 855, ../sass/screen.scss */
#col-left ul li a {
text-decoration: none;
font-family: "comfortaaregular";
@@ -842,18 +849,18 @@ ul li {
display: block;
color: black;
}
/* line 859, ../sass/screen.scss */
/* line 865, ../sass/screen.scss */
#col-left ul li a span.name, #col-left ul li a span.wording {
display: none;
}
/* line 866, ../sass/screen.scss */
/* line 872, ../sass/screen.scss */
#col-left p {
padding: 20px;
padding-top: 0px;
color: gray;
}

/* line 874, ../sass/screen.scss */
/* line 880, ../sass/screen.scss */
#content .header-title {
height: 79px;
padding: 20px 20px;
@@ -868,7 +875,7 @@ ul li {
-webkit-box-shadow: 0px 0px 8px #e0e0e0;
box-shadow: 0px 0px 8px #e0e0e0;
}
/* line 886, ../sass/screen.scss */
/* line 892, ../sass/screen.scss */
#content .header-title h1 {
color: black;
font-family: "myriadpro-regular";
@@ -876,7 +883,7 @@ ul li {
font-size: 25px;
text-transform: uppercase;
}
/* line 894, ../sass/screen.scss */
/* line 900, ../sass/screen.scss */
#content .header-title h2 {
color: gray;
text-transform: none;
@@ -885,16 +892,16 @@ ul li {
line-height: 20px;
}

/* line 905, ../sass/screen.scss */
/* line 911, ../sass/screen.scss */
.header-producer {
z-index: 1;
}
/* line 907, ../sass/screen.scss */
/* line 913, ../sass/screen.scss */
.header-producer #block-main-img {
height: 144px;
overflow: hidden;
}
/* line 911, ../sass/screen.scss */
/* line 917, ../sass/screen.scss */
.header-producer #block-main-img #main-img {
width: 100%;
height: auto;
@@ -904,7 +911,7 @@ ul li {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 920, ../sass/screen.scss */
/* line 926, ../sass/screen.scss */
.header-producer h1 {
font-family: "comfortaaregular";
text-align: center;
@@ -912,23 +919,23 @@ ul li {
top: 30px;
left: 40px;
}
/* line 927, ../sass/screen.scss */
/* line 933, ../sass/screen.scss */
.header-producer h1 span {
background-color: rgba(255, 255, 255, 0.8);
padding: 10px 30px;
border: dotted 1px black;
}

/* line 938, ../sass/screen.scss */
/* line 944, ../sass/screen.scss */
nav#menu-producer {
border-bottom: solid 1px #e0e0e0;
}
/* line 942, ../sass/screen.scss */
/* line 948, ../sass/screen.scss */
nav#menu-producer ul li {
padding: 0px;
margin: 0px;
}
/* line 945, ../sass/screen.scss */
/* line 951, ../sass/screen.scss */
nav#menu-producer ul li a {
border-right: solid 1px #e0e0e0;
text-decoration: none;
@@ -936,13 +943,13 @@ nav#menu-producer ul li a {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 950, ../sass/screen.scss */
/* line 956, ../sass/screen.scss */
nav#menu-producer ul li a:hover {
background-color: #FF7F00;
color: white;
}

/* line 960, ../sass/screen.scss */
/* line 966, ../sass/screen.scss */
.site-contact .col-lg-5 {
margin: 0px auto;
float: none;

+ 32
- 26
frontend/web/sass/screen.scss View File

@@ -161,34 +161,36 @@ ul {
width: 960px ;
margin: 0px auto ;
}
}

#content .content-text {
h1 {
font-family: 'highvoltageregular' ;
font-size: 30px ;
color: black ;
text-transform: uppercase ;
}
h2 {
font-family: 'highvoltageregular' ;
font-size: 20px ;
text-transform: none ;
padding-bottom: 0px ;
margin-bottom: 5px ;
margin-top: 5px ;
}
}
}

#content {
border-right: solid 1px #e0e0e0 ;
#the-content {
padding-top: 100px ;
padding-left: 30px ;
padding-right: 30px ;
padding-bottom: 50px ;
}
.content-text {
h1 {
font-family: 'highvoltageregular' ;
font-size: 30px ;
color: black ;
text-transform: uppercase ;
}

h2 {
font-family: 'highvoltageregular' ;
font-size: 20px ;
text-transform: none ;
padding-bottom: 0px ;
margin-bottom: 5px ;
margin-top: 5px ;
}
}
}

#block-demo {
@@ -289,14 +291,20 @@ ul {
a {
display: block ;
text-decoration: none ;
color: $courant ;
background-color: transparent ;
padding: 30px 20px ;
margin: 0px ;
border-right: solid 1px #e0e0e0 ;
font-family: 'capsuularegular' ;
color: black ;
font-size: 18px ;
@include border-radius(0px) ;
@include box-shadow(none) ;
span {
font-size: 15px ;
}
&:hover {
color: $color1 ;
background-color: white ;
@@ -497,14 +505,14 @@ ul {
}

#bookmarked-producers {
background-color: #323232 ;
padding: 0px ;
padding-top: 20px ;
margin: 0px ;
border-bottom: solid 1px #e0e0e0 ;
h2 {
font-family: 'highvoltageregular' ;
color: $color2;
color: $courant ;
text-align: left ;
font-size: 16px ;
margin: 0px ;
@@ -537,7 +545,7 @@ ul {
background-size: 300px auto ;
background-position: center center ;
background-repeat: no-repeat ;
border: solid 1px $color2 ;
border: solid 1px #e0e0e0 ;
background-color: white ;

a {
@@ -551,9 +559,7 @@ ul {
@include border-radius(0px) ;
&:hover {
background-color: #fafafa ;
border-color: $color2 ;
color: $color1 ;
background-color: darken($color1, 2);
}
}
}

+ 93
- 72
producer/views/layouts/main.php View File

@@ -42,109 +42,130 @@ use yii\widgets\Breadcrumbs;
use common\widgets\Alert;
use common\helpers\Url;
use common\models\Producer;
use common\models\User;

\common\assets\CommonAsset::register($this);
\producer\assets\AppAsset::register($this);

$producer = $this->context->getProducer() ;
if(!Yii::$app->user->isGuest) {
$userProducer = UserProducer::findOne(['id_user' => User::getCurrentId(), 'id_producer' => $producer->id ]) ;
}

?>
<?php $this->beginPage() ?>
<!DOCTYPE html>
<head>
<title><?= Html::encode($producer->name); ?> &bull; <?= $this->getPageTitle(); ?></title>
<title><?= Html::encode($producer->name); ?> | <?= $this->getPageTitle(); ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="base-url" content="<?= Yii::$app->urlManager->baseUrl ; ?>">
<meta name="slug-producer" content="<?= $producer->slug ; ?>">
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon-distrib.png" />
<?php $this->head() ?>
</head>
<body class="<?= Yii::$app->controller->id.'-'.Yii::$app->controller->action->id ?>">
<?php $this->beginBody() ?>
<div id="header-bap">
<div class="container">
<a id="logo" href="<?= Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']); ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<span class="text">La boîte à pain</span>
</a>
<?php
echo Nav::widget([
'encodeLabels' => false,
'items' => [
[
'label' => '<span class="glyphicon glyphicon-user"></span> Inscription',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/signup']),
'visible' => Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/login','return_url' => Yii::$app->urlManager->createAbsoluteUrl(['site/index'])]),
'visible' => Yii::$app->user->isGuest
<a id="logo" href="<?= Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']); ?>">
<img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-distrib.png" alt="" />
</a>
<?php
echo Nav::widget([
'encodeLabels' => false,
'items' => [
[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-user"></span> Inscription',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/signup']),
'visible' => Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/login','return_url' => Yii::$app->urlManager->createAbsoluteUrl(['site/index'])]),
'visible' => Yii::$app->user->isGuest
],
],
[
'label' => '<span class="glyphicon glyphicon-user"></span> '.((!Yii::$app->user->isGuest) ? Html::encode(Yii::$app->user->identity->name .' '.strtoupper(substr(Yii::$app->user->identity->lastname, 0, 1))) : '').'. ',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => 'Profil',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['user/update']),
],
[
'label' => '<span class="glyphicon glyphicon-off"></span> Déconnexion',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/logout']),
]
'visible' => Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-user"></span> Profil',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['user/update']),
],
'visible' => !Yii::$app->user->isGuest
[
'label' => '<span class="glyphicon glyphicon-off"></span> Déconnexion<br /><small>'.(!Yii::$app->user->isGuest ? Html::encode(Yii::$app->user->identity->name .' '.strtoupper(substr(Yii::$app->user->identity->lastname, 0, 1))) : '').'.</small>',
'url' => Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/logout']),
]
],
'visible' => !Yii::$app->user->isGuest
],
'options' => ['id' =>'nav-bap'],
]);
?>
</div>
],
'options' => ['id' =>'nav-bap'],
]);
?>
</div>
<header id="header">
<div class="container">
<h1><?= Html::encode($producer->name); ?> <span>/ <?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?> (<?= Html::encode($producer->postcode); ?>)</span></h1>
<?php if(!Yii::$app->user->isGuest): ?>
<?php
$userProducer = UserProducer::findOne(['id_user' => User::getCurrentId(), 'id_producer' => $producer->id ]) ;
if($userProducer):
?>
<div id="credit">
<span class="info"><a href="<?= Yii::$app->urlManagerFrontend->createAbsoluteUrl('site/credit'); ?>"><span class="text">Crédit </span><span class="glyphicon glyphicon-info-sign"></span></a></span>
<a href="<?= Yii::$app->urlManagerProducer->createUrl(['credit/history']); ?>"><span id="the-credit"><?= number_format($userProducer->credit, 2); ?> €</span></a>
</div>
<div class="container">
<h1><?= Html::encode($producer->name); ?></h1>
<h2><?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?> (<?= Html::encode($producer->postcode); ?>)</h2>
<div id="infos">
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<span class="glyphicon glyphicon-time"></span> Commande avant
<strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,
<span data-toggle="tooltip" data-placement="bottom" title="Exemple : commande le lundi pour le <?php if($producer->order_delay == 1): ?>mardi<?php elseif($producer->order_delay == 2): ?>mercredi<?php elseif($producer->order_delay == 3): ?>jeudi<?php elseif($producer->order_delay == 4): ?>vendredi<?php elseif($producer->order_delay == 5): ?>samedi<?php elseif($producer->order_delay == 6): ?>dimanche<?php elseif($producer->order_delay == 7): ?>lundi d'après<?php endif; ?>"><strong><?= Html::encode($producer->order_delay) ?> jour<?php if($producer->order_delay > 1): ?>s<?php endif; ?></strong> à l'avance</span>
<?php if(!Yii::$app->user->isGuest): ?>
<span class="favorite">
<?php if($userProducer && $userProducer->bookmark): ?>
<span class="glyphicon glyphicon-star"></span> <a href="<?= Yii::$app->urlManagerProducer->createUrl(['site/bookmarks','action' => 'delete']); ?>" data-toggle="tooltip" data-placement="bottom" title="Supprimer de mes favoris">Favoris</a>
<?php else: ?>
<span class="glyphicon glyphicon glyphicon-star-empty"></span> <a href="<?= Yii::$app->urlManagerProducer->createUrl(['site/bookmarks','action' => 'add']); ?>" data-toggle="tooltip" data-placement="bottom" title="Ajouter à mes favoris">Favoris</a>
<?php endif; ?>
</span>
<?php endif; ?>
<div id="infos">
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<span class="glyphicon glyphicon-time"></span> Commande avant
<strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,
<span data-toggle="tooltip" data-placement="bottom" title="Exemple : commande le lundi pour le <?php if($producer->order_delay == 1): ?>mardi<?php elseif($producer->order_delay == 2): ?>mercredi<?php elseif($producer->order_delay == 3): ?>jeudi<?php elseif($producer->order_delay == 4): ?>vendredi<?php elseif($producer->order_delay == 5): ?>samedi<?php elseif($producer->order_delay == 6): ?>dimanche<?php elseif($producer->order_delay == 7): ?>lundi d'après<?php endif; ?>"><strong><?= Html::encode($producer->order_delay) ?> jour<?php if($producer->order_delay > 1): ?>s<?php endif; ?></strong> à l'avance</span>
<?php if(!Yii::$app->user->isGuest): ?>
<span class="favorite">
<?php if($userProducer && $userProducer->bookmark): ?>
<span class="glyphicon glyphicon-star"></span> <a href="<?= Yii::$app->urlManagerProducer->createUrl(['site/bookmarks','action' => 'delete']); ?>" data-toggle="tooltip" data-placement="bottom" title="Supprimer de mes favoris">Favoris</a>
<?php else: ?>
<span class="glyphicon glyphicon glyphicon-star-empty"></span> <a href="<?= Yii::$app->urlManagerProducer->createUrl(['site/bookmarks','action' => 'add']); ?>" data-toggle="tooltip" data-placement="bottom" title="Ajouter à mes favoris">Favoris</a>
<?php endif; ?>
</span>
<?php endif; ?>
<div class="clr"></div>
</div>
<div class="clr"></div>
</div>
</div>
</header>
<div id="main">
<div class="container">
<nav id="main-nav">
<?php
$credit = '' ;
if(isset($userProducer) && $userProducer) {
$labelType = $userProducer->credit > 0 ? 'success' : 'danger' ;
$credit = ' <span class="label label-'.$labelType.'">'.number_format($userProducer->credit, 2).' €</span>' ;
}
$countSubcriptions = Subscription::searchCount(['subscription.id_user' => User::getCurrentId()]) ;
$labelSubscription = $countSubcriptions > 0 ? 'success' : 'default' ;
$countOrders = Order::find()
->joinWith(['distribution'])
->where([
'id_user' => User::getCurrentId(),
'distribution.id_producer' => Producer::getId()
])
->params([':date_today' => date('Y-m-d')])
->andWhere('distribution.date >= :date_today')
->count();
$labelOrders = $countOrders > 0 ? 'success' : 'default' ;
echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' =>'nav nav-pills'],
@@ -167,19 +188,19 @@ $producer = $this->context->getProducer() ;
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes',
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes <span class="label label-'.$labelOrders.'">'.$countOrders.'</span>',
'url' => Yii::$app->urlManager->createUrl(['order/history']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/history',
],
[
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnement',
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnements <span class="label label-'.$labelSubscription.'">'.$countSubcriptions.'</span>',
'url' => Yii::$app->urlManager->createUrl(['subscription/index']),
'visible' => !Yii::$app->user->isGuest && $producer->user_manage_subscription,
'active' => $this->getControllerAction() == 'subscription/index',
],
[
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit',
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit'.$credit,
'url' => Yii::$app->urlManager->createUrl(['credit/history']),
'visible' => !Yii::$app->user->isGuest && $producer->credit,
'active' => $this->getControllerAction() == 'credit/history',
@@ -207,8 +228,8 @@ $producer = $this->context->getProducer() ;
if(count($this->buttons)): ?>
<span id="buttons">
<?php foreach($this->buttons as $button) {
echo '<a href="'.Yii::$app->urlManagerProducer->createUrl($button['url']).'" class="'.$button['class'].'">'.$button['label'].'</a>' ;
}
echo '<a href="'.Yii::$app->urlManagerProducer->createUrl($button['url']).'" class="'.$button['class'].'">'.$button['label'].'</a>' ;
}
?>
</span>
<?php endif; ?>
@@ -236,7 +257,7 @@ $producer = $this->context->getProducer() ;
<div class="container">
<div class="overflow"></div>
<div class="content">
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']) ; ?>">La boîte à pain</a>
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']) ; ?>">distrib</a>
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/mentions']) ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/cgv']) ; ?>">CGS</a>
<a id="code-source" href="https://framagit.org/guillaume-bourgeois/laboiteapain">Code source <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-framagit.png" alt="Hébergé par Framasoft" /> <img src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/logo-gitlab.png" alt="Propulsé par Gitlab" /></a>

+ 0
- 4
producer/views/site/index.php View File

@@ -48,10 +48,6 @@ else
$colSize = 'col-md-12' ;
?>

<section id="order">
<a class="btn btn-primary btn-lg" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/producer','id' => $this->context->getProducer()->id,'return_url' => Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order','slug_producer' => $this->context->getProducer()->slug])]); else: echo Yii::$app->urlManager->createUrl(['order/order']); endif; ?>"><span class="glyphicon glyphicon-plus"></span> Passer une commande</a>
</section>

<section id="presentation">
<?php if(strlen($producer->photo)): ?>
<div class="photo <?= $colSize ?>">

+ 279
- 265
producer/web/css/screen.css
File diff suppressed because it is too large
View File


BIN
producer/web/img/favicon-distrib.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1.2KB

BIN
producer/web/img/logo-distrib.png View File

Before After
Width: 300  |  Height: 246  |  Size: 13KB

+ 12
- 5
producer/web/js/vuejs/order-order.js View File

@@ -23,8 +23,9 @@ var app = new Vue({
availableDates: [],
themeStyles: {
wrapper: {
background: '#BB8757',
color: '#fafafa',
background: '#F7F7F7',
color: '#333',
border: 'solid 1px #e0e0e0'
},
header: {
padding: '10px 10px',
@@ -34,7 +35,7 @@ var app = new Vue({
width: '80%',
},
weekdays: {
color: 'white',
color: 'gray',
fontWeight: '600',
padding: '10px 10px',
fontSize: '2rem'
@@ -108,7 +109,10 @@ var app = new Vue({
for(var i= 0; i < distributions.length; i++) {
this.calendar.attrs.push({
highlight: {
backgroundColor: '#00A65A'
backgroundColor: '#5cb85c',
},
contentStyle: {
color: 'white',
},
dates: distributions[i].date,
}) ;
@@ -129,7 +133,10 @@ var app = new Vue({
for(var i= 0; i < orders.length; i++) {
this.calendar.attrs.push({
highlight: {
backgroundColor: '#018548',
backgroundColor: '#FF7F00'
},
contentStyle: {
color: 'white'
},
popover: {
label: orders[i].pointSale.name + ' / '+this.formatPrice(orders[i].amount_total),

+ 85
- 87
producer/web/sass/_layout.scss View File

@@ -35,12 +35,14 @@ pris connaissance de la licence CeCILL, et que vous en avez accepté les
termes.
*/

$color1: #BB8757 ;
$color2: #F8F1DD ;
$color1: #FF7F00 ;
$color2: white ;
$courant: #323232 ;
$color-back: #F7F7F7 ;

body {
font-family: 'Arial' ;
background-color: $color1 ;
background-color: white ;
color: #333 ;
line-height: 20px ;
font-size: 14px ;
@@ -114,38 +116,36 @@ ul.pagination {
}

#header-bap {
background-color: $color2 ;
position: absolute ;
right: 0px ;
top: 0px ;
width: 200px ;
background-color: white ;
padding-top: 7px ;
padding-bottom: 7px ;
text-align: center ;
z-index: 1000 ;
.container {
padding-left: 0px ;
padding-right: 0px ;
}
#logo {
a#logo {
color: black ;
text-decoration: none ;
position: relative ;
top: 3px ;
img {
width: 25px ;
}
.text {
font-size: 17px ;
font-family: 'comfortaalight' ;
position: relative ;
bottom: 6px ;
left: 3px ;
width: 45px ;
}
}
ul#nav-bap {
float: right ;
li {
float: right ;
a {
color: black ;
font-size: 15px ;
@@ -161,10 +161,24 @@ ul.pagination {
ul {
background-color: $color2 ;
border-top: solid 2px $color1 ;
left: -141px ;
top: 50px ;
width: 200px ;
li {
a {
text-transform: uppercase ;
font-size: 13px ;
&:hover {
color: lighten($color1, 10) ;
}
small {
font-size: 10px ;
line-height: 13px ;
margin-left: 18px ;
}
}
}
}
@@ -173,11 +187,10 @@ ul.pagination {
}

#header {
background-color: $color1 ;
background-color: $color-back ;
text-align: center ;
padding-top: 25px ;
padding-bottom: 50px ;
border-bottom: solid 1px #e0e0e0 ;
padding-bottom: 10px ;
.container {
position: relative ;
@@ -186,32 +199,35 @@ ul.pagination {
}
h1, h2 {
color: white ;
color: $courant ;
}
h1 {
text-transform: uppercase ;
font-family: 'myriadpro-regular' ;
font-family: 'highvoltageregular' ;
font-size: 35px ;
line-height: 35px ;
font-weight: bold ;
padding-bottom: 5px ;
text-align: left ;
span {
font-family: 'myriadpro-light' ;
font-size: 27px ;
font-weight: normal ;
}
text-align: center ;
font-weight: normal ;
}
h2 {
font-family: 'capsuularegular' ;
font-size: 27px ;
font-weight: normal ;
text-align: center ;
}
#infos {
text-align: left ;
text-align: center ;
padding-bottom: 10px ;
padding-top: 8px;
margin-bottom: 0px ;
color: $color2 ;
color: $courant ;
font-size: 14px ;
color: gray ;
.favorite {
border-left: solid 1px $color2 ;
@@ -219,7 +235,7 @@ ul.pagination {
}
a {
color: white ;
color: gray ;
text-decoration: underline ;
}
@@ -227,72 +243,58 @@ ul.pagination {
font-weight: bold ;
}
}
#credit {
position: relative ;
top: 10px ;
float: right ;
color: white ;
font-family: 'myriadpro-semibold' ;
font-size: 16px ;
.info {
padding-bottom: 5px ;
border-bottom: solid 1px $color1 ;
text-align: right ;
a {
color: white ;
}
}
span.text {
font-family: 'myriadpro-regular' ;
}
span.glyphicon {
font-size: 16px ;
}
#the-credit {
margin-top: 7px ;
padding: 6px 15px ;
padding-bottom: 4px ;
background-color: $color2 ;
color: $color1 ;
@include border-radius(7px) ;
}
}
}

#main {
background-color: $color2 ;
background-color: $color-back ;
#main-nav {
nav#main-nav {
width: 100% ;
position: relative ;
top: -40px ;
background-color: white ;
border-top: solid 1px #e0e0e0 ;
border-bottom: solid 1px #e0e0e0 ;
margin-bottom: 30px ;
ul {
li {
a {
color: $color1 ;
text-transform: uppercase ;
font-family: 'myriadpro-regular' ;
color: $courant ;
color: black;
border-right: solid 1px #e0e0e0 ;
font-family: 'capsuularegular' ;
text-transform: uppercase ;
span.label {
padding-bottom: 3px ;
font-family: 'Arial' ;
}
}
&.active, a:hover {
span.label {
background-color: darken($color1, 5) ;
color: white ;
}
}
a:hover,
&.active a {
background: none ;
border-bottom: solid 1px $color1 ;
background: $color1 ;
color: white ;
@include border-radius(0px) ;
}
&#btn-administration {
background-color: $color2 ;
float: right ;
border-left: solid 1px #e0e0e0 ;
a {
color: $color1 ;
&:hover {
color: white ;
}
}
}
}
}
@@ -310,11 +312,12 @@ ul.pagination {
padding-bottom: 15px ;
border-bottom: solid 1px #e0e0e0 ;
margin-bottom: 10px ;
font-family: 'myriadpro-light' ;
font-family: 'highvoltageregular' ;
font-size: 30px ;
line-height: 40px;
position: relative ;
top: -10px ;
text-align: center ;
text-align: left ;
#buttons {
//float: right ;
@@ -336,7 +339,7 @@ ul.pagination {
padding: 0px 20px 20px 20px ;
h1, h2, h3, h4, h5, h6 {
font-family: 'myriadpro-regular' ;
font-family: 'highvoltageregular' ;
margin-top: 30px ;
margin-bottom: 20px ;
@@ -355,7 +358,7 @@ ul.pagination {
}
h3 {
font-family: 'myriadpro-light' ;
font-family: 'highvoltageregular' ;
text-transform: uppercase ;
font-size: 23px ;
text-align: left ;
@@ -363,13 +366,8 @@ ul.pagination {
margin-top: 45px ;
span {
background-color: $color1 ;
padding: 10px 20px ;
padding-top: 14px ;
background-color: $color2 ;
color: $color1 ;
border: dotted 1px $color1 ;
color: $courant ;
}
}
@@ -396,7 +394,7 @@ ul.pagination {
}

#footer {
background-color: $color1 ;
background-color: $color-back ;
height: 100px ;
.container {
@@ -414,7 +412,7 @@ ul.pagination {
color: white ;
a {
color: white ;
color: $courant ;
text-decoration: underline ;
margin-right: 10px ;
}

+ 24
- 4
producer/web/sass/_responsive.scss View File

@@ -37,6 +37,12 @@ termes.
@media screen and (max-width: 768px) {
#header-bap {
display: block ;
position: relative ;
top: 0px ;
left: 0px ;
text-align: center ;
width: 100% ;
#logo {
margin-left: 10px ;
}
@@ -64,26 +70,40 @@ termes.
&.active a {
border-bottom: solid 1px $color2 ;
background-color: $color2 ;
background-color: $color1 ;
color: white ;
&:hover {
background-color: $color1 ;
color: white ;
}
}
a {
display: block ;
border-bottom: solid 1px $color2 ;
border-bottom: solid 1px #e0e0e0 ;
&:hover {
border-bottom: solid 1px $color2 ;
background-color: $color2 ;
background-color: white ;
color: $color1 ;
}
}
}
li#btn-administration {
float: none ;
a:hover {
background-color: white ;
color: $color1 ;
}
}
}
}
h2#page-title {
text-align: center ;
}
#products {
td {

+ 12
- 10
producer/web/sass/order/_order.scss View File

@@ -17,7 +17,6 @@
}
.slide-leave-active {
//transition: all .2s cubic-bezier(1.0, 0.5, 0.8, 1.0);
transition: all 0s ease;
}
.slide-enter, .slide-leave-to {
@@ -134,10 +133,10 @@
}
#order-date-color {
background-color: #018548 ;
background-color: #FF7F00 ;
}
#distribution-date-color {
background-color: #00A65A ;
background-color: #5cb85c ;
}
}
@@ -152,7 +151,8 @@
.c-day:hover {
.c-day-background {
background-color: #F39C12 !important ;
background-color: #FF7F00 !important ;
color: white !important ;
}
}
@@ -170,9 +170,10 @@
td.name {
.the-name {
text-transform: uppercase ;
font-family: 'myriadpro-regular' ;
font-family: 'capsuularegular' ;
color: black ;
font-size: 16px ;
font-size: 20px ;
line-height: 25px ;
}
}
@@ -194,9 +195,10 @@
td.name {
.name {
text-transform: uppercase ;
font-family: 'myriadpro-regular' ;
font-family: 'capsuularegular' ;
color: black ;
font-size: 16px ;
font-size: 20px ;
line-height: 25px ;
}
.other {
font-size: 14px ;
@@ -272,8 +274,7 @@
margin-left: 151px ;
h3 {
font-family: 'myriadpro-light' ;
text-transform: uppercase ;
font-family: 'capsuularegular' ;
font-size: 30px ;
color: #333 ;
margin-bottom: 20px ;
@@ -282,6 +283,7 @@
text-align: left ;
padding-left: 0px ;
line-height: 35px ;
text-transform: none ;
}
.locality {

Write Preview
Loading…
Cancel
Save