瀏覽代碼

Merge branch 'dev'

master
Guillaume 3 年之前
父節點
當前提交
20a1fa338c
共有 2 個檔案被更改,包括 69 行新增64 行删除
  1. +3
    -0
      producer/controllers/OrderController.php
  2. +66
    -64
      producer/web/css/screen.css

+ 3
- 0
producer/controllers/OrderController.php 查看文件

@@ -235,6 +235,9 @@ class OrderController extends ProducerBaseController
// liaison producer / user
$producer->addUser($user->id, $idProducer) ;
}
else {
$producer->addUser($user->id, $idProducer) ;
}
}

$order = new Order;

+ 66
- 64
producer/web/css/screen.css 查看文件

@@ -185,35 +185,37 @@ body {
/* line 89, ../sass/_layout.scss */
.alert.alert-warning a {
color: #8a6d3b;
text-decoration: underline;
}
/* line 95, ../sass/_layout.scss */
/* line 96, ../sass/_layout.scss */
.alert.alert-danger a {
color: #a94442;
text-decoration: underline;
}

/* line 104, ../sass/_layout.scss */
/* line 106, ../sass/_layout.scss */
ul.pagination li.active a {
background-color: #FF7F00;
border: solid 1px #FF7F00;
}
/* line 108, ../sass/_layout.scss */
/* line 110, ../sass/_layout.scss */
ul.pagination li.active a:hover {
background-color: white;
border: solid 1px white;
color: #FF7F00;
}
/* line 115, ../sass/_layout.scss */
/* line 117, ../sass/_layout.scss */
ul.pagination li a {
color: #FF7F00;
}
/* line 118, ../sass/_layout.scss */
/* line 120, ../sass/_layout.scss */
ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
background-color: white;
border: solid 1px white;
color: #FF7F00;
}

/* line 127, ../sass/_layout.scss */
/* line 129, ../sass/_layout.scss */
#header-bap {
position: absolute;
right: 0px;
@@ -225,39 +227,39 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
z-index: 1000;
}
/* line 138, ../sass/_layout.scss */
/* line 140, ../sass/_layout.scss */
#header-bap .container {
padding-left: 0px;
padding-right: 0px;
}
/* line 143, ../sass/_layout.scss */
/* line 145, ../sass/_layout.scss */
#header-bap a#logo {
color: black;
text-decoration: none;
position: relative;
top: 3px;
}
/* line 149, ../sass/_layout.scss */
/* line 151, ../sass/_layout.scss */
#header-bap a#logo img {
width: 45px;
}
/* line 154, ../sass/_layout.scss */
/* line 156, ../sass/_layout.scss */
#header-bap ul#nav-bap {
float: right;
}
/* line 158, ../sass/_layout.scss */
/* line 160, ../sass/_layout.scss */
#header-bap ul#nav-bap li a {
color: black;
font-size: 15px;
color: #FF7F00;
}
/* line 163, ../sass/_layout.scss */
/* line 165, ../sass/_layout.scss */
#header-bap ul#nav-bap li a:hover, #header-bap ul#nav-bap li a:focus {
color: #333;
color: #FF7F00;
background: none;
}
/* line 170, ../sass/_layout.scss */
/* line 172, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul {
background-color: white;
border-top: solid 2px #FF7F00;
@@ -265,23 +267,23 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: 50px;
width: 200px;
}
/* line 178, ../sass/_layout.scss */
/* line 180, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a {
text-transform: uppercase;
font-size: 13px;
}
/* line 182, ../sass/_layout.scss */
/* line 184, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a:hover {
color: #ff9933;
}
/* line 186, ../sass/_layout.scss */
/* line 188, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a small {
font-size: 10px;
line-height: 13px;
margin-left: 18px;
}

/* line 198, ../sass/_layout.scss */
/* line 200, ../sass/_layout.scss */
#left {
background-color: #FFF8DC;
text-align: center;
@@ -289,12 +291,12 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding: 0px;
position: relative;
}
/* line 205, ../sass/_layout.scss */
/* line 207, ../sass/_layout.scss */
#left .fixed {
position: fixed;
display: none;
}
/* line 211, ../sass/_layout.scss */
/* line 213, ../sass/_layout.scss */
#left #logo {
position: relative;
background-color: white;
@@ -309,7 +311,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
overflow: hidden;
}
/* line 223, ../sass/_layout.scss */
/* line 225, ../sass/_layout.scss */
#left #logo img {
position: absolute;
top: 50%;
@@ -318,11 +320,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
max-width: 90px;
max-height: 90px;
}
/* line 233, ../sass/_layout.scss */
/* line 235, ../sass/_layout.scss */
#left h1, #left h2, #left #infos, #left #infos a {
color: #323232;
}
/* line 237, ../sass/_layout.scss */
/* line 239, ../sass/_layout.scss */
#left h1 {
text-transform: uppercase;
font-family: "highvoltageregular";
@@ -333,37 +335,37 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
font-weight: normal;
}
/* line 248, ../sass/_layout.scss */
/* line 250, ../sass/_layout.scss */
#left h2 {
font-family: "capsuularegular";
font-size: 15px;
font-weight: normal;
text-align: center;
}
/* line 254, ../sass/_layout.scss */
/* line 256, ../sass/_layout.scss */
#left h2 .favorite {
padding-left: 0px;
}
/* line 257, ../sass/_layout.scss */
/* line 259, ../sass/_layout.scss */
#left h2 .favorite .glyphicon {
font-size: 14px;
}
/* line 262, ../sass/_layout.scss */
/* line 264, ../sass/_layout.scss */
#left h2 a {
color: #323232;
}
/* line 268, ../sass/_layout.scss */
/* line 270, ../sass/_layout.scss */
#left nav#main-nav {
background-color: white;
border: solid 1px #e0e0e0;
border-bottom: 0px none;
margin-top: 20px;
}
/* line 275, ../sass/_layout.scss */
/* line 277, ../sass/_layout.scss */
#left nav#main-nav ul li {
display: block;
}
/* line 278, ../sass/_layout.scss */
/* line 280, ../sass/_layout.scss */
#left nav#main-nav ul li a {
color: #323232;
color: black;
@@ -373,23 +375,23 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
display: block;
text-align: left;
}
/* line 287, ../sass/_layout.scss */
/* line 289, ../sass/_layout.scss */
#left nav#main-nav ul li a .glyphicon {
font-size: 15px;
margin-right: 3px;
}
/* line 292, ../sass/_layout.scss */
/* line 294, ../sass/_layout.scss */
#left nav#main-nav ul li a span.label {
padding-bottom: 3px;
font-family: "Arial";
float: right;
}
/* line 300, ../sass/_layout.scss */
/* line 302, ../sass/_layout.scss */
#left nav#main-nav ul li.active span.label, #left nav#main-nav ul li a:hover span.label {
background-color: #e67200;
color: white;
}
/* line 306, ../sass/_layout.scss */
/* line 308, ../sass/_layout.scss */
#left nav#main-nav ul li a:hover, #left nav#main-nav ul li.active a {
background: #FF7F00;
color: white;
@@ -397,22 +399,22 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 315, ../sass/_layout.scss */
/* line 317, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a {
color: #FF7F00;
}
/* line 318, ../sass/_layout.scss */
/* line 320, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a:hover {
color: white;
}
/* line 326, ../sass/_layout.scss */
/* line 328, ../sass/_layout.scss */
#left nav#main-nav #user {
color: #FF7F00;
float: right;
padding: 10px;
}

/* line 334, ../sass/_layout.scss */
/* line 336, ../sass/_layout.scss */
#main {
background-color: #FFF8DC;
border: solid 1px #e0e0e0;
@@ -420,13 +422,13 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding: 0px;
background-color: white;
}
/* line 341, ../sass/_layout.scss */
/* line 343, ../sass/_layout.scss */
#main #img-big {
height: 130px;
overflow: hidden;
position: relative;
}
/* line 346, ../sass/_layout.scss */
/* line 348, ../sass/_layout.scss */
#main #img-big img.img-photo {
width: 100%;
position: absolute;
@@ -434,7 +436,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 50%;
transform: translate(-50%, -50%);
}
/* line 356, ../sass/_layout.scss */
/* line 358, ../sass/_layout.scss */
#main #infos-producer {
padding: 5px 10px;
margin-bottom: 0px;
@@ -444,20 +446,20 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
border-bottom: solid 1px #e0e0e0;
color: gray;
}
/* line 365, ../sass/_layout.scss */
/* line 367, ../sass/_layout.scss */
#main #infos-producer strong {
font-weight: bold;
}
/* line 369, ../sass/_layout.scss */
/* line 371, ../sass/_layout.scss */
#main #infos-producer .favorite {
float: right;
color: gray;
}
/* line 372, ../sass/_layout.scss */
/* line 374, ../sass/_layout.scss */
#main #infos-producer .favorite a {
color: black;
}
/* line 378, ../sass/_layout.scss */
/* line 380, ../sass/_layout.scss */
#main h2#page-title {
padding-left: 15px;
padding-right: 15px;
@@ -472,36 +474,36 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: -10px;
text-align: left;
}
/* line 392, ../sass/_layout.scss */
/* line 394, ../sass/_layout.scss */
#main h2#page-title #buttons {
margin-bottom: 15px;
font-family: "Arial";
}
/* line 399, ../sass/_layout.scss */
/* line 401, ../sass/_layout.scss */
#main #content {
padding: 0px 20px 20px 20px;
padding-bottom: 40px;
min-height: 300px;
}
/* line 404, ../sass/_layout.scss */
/* line 406, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "highvoltageregular";
margin-top: 30px;
margin-bottom: 20px;
}
/* line 409, ../sass/_layout.scss */
/* line 411, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px;
}
/* line 414, ../sass/_layout.scss */
/* line 416, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 418, ../sass/_layout.scss */
/* line 420, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 423, ../sass/_layout.scss */
/* line 425, ../sass/_layout.scss */
#main #content h3 {
font-family: "capsuularegular";
text-transform: uppercase;
@@ -510,29 +512,29 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
margin-bottom: 30px;
margin-top: 45px;
}
/* line 431, ../sass/_layout.scss */
/* line 433, ../sass/_layout.scss */
#main #content h3 span {
padding-top: 14px;
color: #323232;
}
/* line 437, ../sass/_layout.scss */
/* line 439, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 441, ../sass/_layout.scss */
/* line 443, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 445, ../sass/_layout.scss */
/* line 447, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}
/* line 451, ../sass/_layout.scss */
/* line 453, ../sass/_layout.scss */
#main #content form .form-group .hint-block {
color: gray;
}

/* line 459, ../sass/_layout.scss */
/* line 461, ../sass/_layout.scss */
#footer-producer {
text-align: center;
position: absolute;
@@ -540,28 +542,28 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 0px;
width: 100%;
}
/* line 466, ../sass/_layout.scss */
/* line 468, ../sass/_layout.scss */
#footer-producer a {
color: #FF7F00;
}
/* line 468, ../sass/_layout.scss */
/* line 470, ../sass/_layout.scss */
#footer-producer a:active {
text-decoration: underline;
}

/* line 474, ../sass/_layout.scss */
/* line 476, ../sass/_layout.scss */
#footer {
background-color: #FFF8DC;
height: 100px;
float: right;
text-align: center;
}
/* line 480, ../sass/_layout.scss */
/* line 482, ../sass/_layout.scss */
#footer .content {
padding-top: 20px;
color: black;
}
/* line 484, ../sass/_layout.scss */
/* line 486, ../sass/_layout.scss */
#footer .content a {
color: black;
font-family: "capsuularegular";
@@ -569,11 +571,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding-left: 10px;
padding-right: 10px;
}
/* line 491, ../sass/_layout.scss */
/* line 493, ../sass/_layout.scss */
#footer .content a:hover {
text-decoration: underline;
}
/* line 498, ../sass/_layout.scss */
/* line 500, ../sass/_layout.scss */
#footer #code-source img {
height: 20px;
}

Loading…
取消
儲存