Laclic
/
Souke
Слідкувати 5
В обрані 0
Форк 1
Код Проблеми 1 Запити на злиття 0 Релізи 0 Вікі Активність
Переглянути джерело

Améliorer le thème front

prodstable
keun 8 роки тому
джерело
3489b0509b
коміт
324dd7bba9
25 змінених файлів з 377 додано та 290 видалено
Розділений перегляд Показати статистику Diff
  1. +12
    -6
      frontend/views/commande/index.php
  2. +2
    -2
      frontend/views/layouts/main.php
  3. +10
    -10
      frontend/views/site/index.php
  4. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc
  5. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  6. +236
    -198
      frontend/web/css/screen.css
  7. BIN
      frontend/web/img/arches.png
  8. BIN
      frontend/web/img/arches_@2X.png
  9. BIN
      frontend/web/img/crisp_paper_ruffles.png
  10. BIN
      frontend/web/img/crisp_paper_ruffles2.png
  11. BIN
      frontend/web/img/crisp_paper_ruffles_@2X.png
  12. BIN
      frontend/web/img/laboulange2.png
  13. BIN
      frontend/web/img/laboulange3.png
  14. BIN
      frontend/web/img/laboulange4.png
  15. BIN
      frontend/web/img/retina_wood.png
  16. BIN
      frontend/web/img/retina_wood_@2X.png
  17. BIN
      frontend/web/img/ricepaper_v3.png
  18. BIN
      frontend/web/img/ricepaper_v3_@2X.png
  19. BIN
      frontend/web/img/swirl_pattern.png
  20. BIN
      frontend/web/img/worn_dots_1.png
  21. BIN
      frontend/web/img/worn_dots_@2X_1.png
  22. +47
    -20
      frontend/web/sass/_systeme_commandes.scss
  23. +70
    -54
      frontend/web/sass/screen.scss
  24. BIN
      frontend/web/uploads/Four_Le_Chat_des_Noisettes-58111db5d2ed4.jpg
  25. BIN
      frontend/web/uploads/baguettes-gf-58111e4bd476b.jpg

+ 12
- 6
frontend/views/commande/index.php Переглянути файл

@@ -21,13 +21,19 @@ $this->title = 'Commande' ;
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<?php echo Html::encode($e['nom']); ?>
<span class="localite"> - <?php echo Html::encode($e['ville']).' ('.Html::encode($e['code_postal']).')'; ?></span>
<a href="<?= Yii::$app->urlManager->createUrl(['commande/remove-etablissement','id'=>$e['id']]); ?>" class="btn btn-xs btn-default remove"><span class="glyphicon glyphicon-remove"></span></a>
</h3>
<?php if(isset($e['photo']) && strlen($e['photo'])): ?>
<img class="img-back" src="./uploads/<?= $e['photo'] ?>" />
<?php endif; ?>
</div>
<div class="panel-body">
<h3 class="panel-title">
<?php echo Html::encode($e['nom']); ?>
</h3>
<div class="localite"> à <?php echo Html::encode($e['ville']).' ('.Html::encode($e['code_postal']).')'; ?></div>
<a href="<?= Yii::$app->urlManager->createUrl(['commande/remove-etablissement','id'=>$e['id']]); ?>" class="btn btn-xs btn-default remove"><span class="glyphicon glyphicon-remove"></span></a>
<a class="btn btn-primary" href="<?= Yii::$app->urlManager->createUrl(['commande/create', 'id_etablissement' => $e['id']]) ?>">Commander</a>
<?php if(strlen($e['logo'])): ?>
<img class="logo" src="uploads/<?= Html::encode($e['logo']); ?>" />
@@ -37,7 +43,7 @@ $this->title = 'Commande' ;
</div>
<?php endforeach; ?>
<?php else: ?>
<div class="alert alert-info">Aucune boulangerie</div>
<!--<div class="alert alert-info">Aucune boulangerie</div>-->
<?php endif; ?>
</div>
<div class="col-md-6" id="bloc-add-etablissement">

+ 2
- 2
frontend/views/layouts/main.php Переглянути файл

@@ -38,8 +38,8 @@ AppAsset::register($this);
<header id="header">
<div class="container">
<a id="link-home" href="<?= Yii::$app->urlManager->createUrl('site/index') ; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange.png" alt="" />
La boîte à pain
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<!--La boîte à pain-->
</a>
<nav class="">
<ul class="nav nav-pills">

+ 10
- 10
frontend/views/site/index.php Переглянути файл

@@ -11,7 +11,7 @@ use dosamigos\leaflet\LeafLet;
use dosamigos\leaflet\widgets\Map;

/* @var $this yii\web\View */
$this->title = 'Système de réservation de pain';
$this->title = 'Service de réservation de pain';
?>

<?php
@@ -22,9 +22,11 @@ $this->title = 'Système de réservation de pain';
<div class="container">
<div class="row" id="row-presentation">
<div class="col-md-12">
<h1>Service de réservation de pain</h1>
<p>Réservez votre pain en ligne et récupérez votre commande<br />
dans votre boulangerie ou dans un dépôt près de chez vous.</p>
<h1 id="title-site">La boîte à pain</h1>
<p><strong>Service de réservation de pain</strong>.<br /><br />
<em>Réservez votre pain en ligne et récupérez votre commande<br />
dans votre boulangerie ou dans un dépôt près de chez vous.</em></p>
<!--<img src="./img/four.jpg" alt="Baguettes" id="main-img" />-->
<div class="clr"></div>
</div>
@@ -38,7 +40,7 @@ $this->title = 'Système de réservation de pain';
<ul>
<li>Garantie d'avoir du pain</li>
<li>Possibilité de choisir un dépôt proche de chez soi</li>
<li><strong>Gratuit</strong></li>
<li class="prix"><strong>Gratuit</strong></li>
</ul>
</div>
<div class="col-md-6">
@@ -46,25 +48,23 @@ $this->title = 'Système de réservation de pain';
Boulanger
</h2>
<ul>
<li>Service supplémentaire pour les clients</li>
<li>Contact supplémentaire avec vos clients</li>
<li>Optimisation de la production</li>
<li><strong>20 € / mois</strong></li>
<li class="prix"><strong>20 € / mois</strong></li>
</ul>
</div>
</div>
<?php if(Yii::$app->user->isGuest): ?>
<div class="row" id="row-signup">
<a class="btn btn-primary btn-lg" href="<?= Yii::$app->urlManager->createUrl('site/signup'); ?>">Inscription</a>
<a class="btn btn-primary btn-lg" href="<?= Yii::$app->urlManager->createUrl('site/signup'); ?>">Je m'inscris</a>
</div>
<?php endif; ?>
<!--<div class="row">
<h1>Boulangeries partenaires</h1>
<?php
echo Map::widget(['leafLet' => $map,'height' => 400]);
?>
</div>-->
</div>
</div>

BIN
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/_systeme_commandes.scssc Переглянути файл


BIN
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Переглянути файл


+ 236
- 198
frontend/web/css/screen.css Переглянути файл

@@ -51,102 +51,124 @@
font-weight: normal;
font-style: normal;
}
/* line 23, ../sass/screen.scss */
/* line 25, ../sass/screen.scss */
html {
height: 100%;
}

/* line 29, ../sass/screen.scss */
body {
position: relative;
color: #505050;
font-family: "Arial";
background-attachment: fixed;
min-height: 100%;
margin: 0;
padding: 0;
}

/* line 30, ../sass/screen.scss */
/* line 39, ../sass/screen.scss */
strong {
font-weight: bold;
}

/* line 34, ../sass/screen.scss */
a {
/* line 43, ../sass/screen.scss */
#main a {
color: #505050;
text-decoration: underline;
}
/* line 38, ../sass/screen.scss */
a:focus, a:active {
/* line 47, ../sass/screen.scss */
#main a:focus, #main a:active {
outline-color: gray;
color: black;
}
/* line 43, ../sass/screen.scss */
a:hover {
/* line 52, ../sass/screen.scss */
#main a:hover {
color: black;
}
/* line 47, ../sass/screen.scss */
a.btn {
/* line 56, ../sass/screen.scss */
#main a.btn {
text-decoration: none;
}
/* line 60, ../sass/screen.scss */
#main a.btn-primary {
background-color: #BB8757;
border: solid 1px #BB8757;
color: white;
}
/* line 65, ../sass/screen.scss */
#main a.btn-primary:hover, #main a.btn-primary:active, #main a.btn-primary:focus {
background-color: #b17a48;
border: solid 1px #BB8757;
}

/* line 52, ../sass/screen.scss */
/* line 72, ../sass/screen.scss */
p {
padding-bottom: 20px;
line-height: 21px;
}

/* line 57, ../sass/screen.scss */
/* line 77, ../sass/screen.scss */
ul {
padding-left: 20px;
list-style-type: disc;
margin-bottom: 10px;
}
/* line 62, ../sass/screen.scss */
/* line 82, ../sass/screen.scss */
ul li {
padding-left: 5px;
}

/* line 67, ../sass/screen.scss */
/* line 87, ../sass/screen.scss */
.clr {
clear: both;
}

/* line 71, ../sass/screen.scss */
/* line 91, ../sass/screen.scss */
.btn {
background-image: none;
}

/* line 75, ../sass/screen.scss */
/* line 95, ../sass/screen.scss */
#main .alert {
background-image: none;
background-color: white;
border-bottom-width: 3px;
}

/* line 83, ../sass/screen.scss */
/* line 103, ../sass/screen.scss */
.alert.alert-warning a {
color: #8a6d3b;
}

/* line 92, ../sass/screen.scss */
/* line 112, ../sass/screen.scss */
#main {
position: relative;
padding-bottom: 150px;
}
/* line 94, ../sass/screen.scss */
/* line 115, ../sass/screen.scss */
#main .inner {
width: 960px;
margin: 0px auto;
}

/* line 100, ../sass/screen.scss */
/* line 121, ../sass/screen.scss */
#header {
z-index: 100;
border-bottom: solid 1px #e0e0e0;
background-color: white;
background-color: #FAFAFA;
-moz-box-shadow: 0px 0px 3px gray;
-webkit-box-shadow: 0px 0px 3px gray;
box-shadow: 0px 0px 3px gray;
background: transparent top left repeat url(../img/crisp_paper_ruffles2.png);
background: none;
background-color: #F7F7F7;
background-color: #f8f1dd;
height: 86px;
}
/* line 117, ../sass/screen.scss */
/* line 142, ../sass/screen.scss */
#header .container {
position: relative;
}
/* line 122, ../sass/screen.scss */
/* line 147, ../sass/screen.scss */
#header #link-home {
/*position: fixed ;
z-index: 1000 ;
@@ -167,38 +189,39 @@ ul li {
font-size: 22px;
color: black;
}
/* line 143, ../sass/screen.scss */
/* line 168, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
}
/* line 149, ../sass/screen.scss */
/* line 174, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
}
/* line 153, ../sass/screen.scss */
/* line 178, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 155, ../sass/screen.scss */
/* line 180, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 158, ../sass/screen.scss */
/* line 183, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 161, ../sass/screen.scss */
/* line 186, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
border: 1px solid #e0e0e0;
}
/* line 166, ../sass/screen.scss */
/* line 191, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: transparent;
}
/* line 176, ../sass/screen.scss */
/* line 201, ../sass/screen.scss */
#header #link-logout .nom {
font-size: 10px;
/*position: relative ;
@@ -206,12 +229,7 @@ ul li {
top: -3px ;*/
}

/* line 185, ../sass/screen.scss */
#main {
padding: 0px;
}

/* line 195, ../sass/screen.scss */
/* line 217, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
@@ -219,11 +237,32 @@ ul li {
padding-top: 35px;
min-height: 500px;
}
/* line 203, ../sass/screen.scss */
/* line 224, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 231, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
font-size: 25px;
line-height: 35px;
font-family: "myriadpro-regular";
text-transform: uppercase;
position: relative;
margin-top: 30px;
}
/* line 242, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 250, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 208, ../sass/screen.scss */
/* line 255, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -232,159 +271,129 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 215, ../sass/screen.scss */
/* line 262, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 219, ../sass/screen.scss */
/* line 266, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 20px;
}
/* line 224, ../sass/screen.scss */
/* line 271, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
}
/* line 226, ../sass/screen.scss */
/* line 273, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 230, ../sass/screen.scss */
/* line 277, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 236, ../sass/screen.scss */
/* line 283, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: center;
}
/* line 238, ../sass/screen.scss */
/* line 285, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: none;
}
/* line 243, ../sass/screen.scss */
/* line 290, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 248, ../sass/screen.scss */
#content .item {
position: relative;
min-height: 250px;
}
/* line 252, ../sass/screen.scss */
#content .item .container {
padding: 20px;
position: relative;
}
/* line 257, ../sass/screen.scss */
#content .item .separateur {
width: 600px;
border-top: 1px solid #e0e0e0;
margin: 0px auto;
padding-top: 20px;
margin-top: 20px;
}
/* line 265, ../sass/screen.scss */
#content .item h2 {
color: black;
padding-bottom: 30px;
font-size: 25px;
line-height: 35px;
font-family: "myriadpro-regular";
text-transform: uppercase;
position: relative;
margin-top: 30px;
}
/* line 277, ../sass/screen.scss */
#content .item h3 {
color: black;
font-family: "comfortaalight";
font-size: 20px;
padding-bottom: 12px;
}
/* line 284, ../sass/screen.scss */
#content .item .icon {
position: absolute;
/* line 294, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
}

/* line 293, ../sass/screen.scss */
/* line 303, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 297, ../sass/screen.scss */
/* line 307, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 306, ../sass/screen.scss */
/* line 316, ../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 311, ../sass/screen.scss */
/* line 321, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 315, ../sass/screen.scss */
/* line 325, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 318, ../sass/screen.scss */
/* line 328, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 325, ../sass/screen.scss */
/* line 335, ../sass/screen.scss */
.form-control:focus {
/*@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.075) inset, 0 0 8px $jaune) ;
border-color: $jaune ;*/
}

/* line 330, ../sass/screen.scss */
/* line 340, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
left: 0px;
width: 100%;
height: 50px;
background-color: white;
background-color: #515151;
text-align: center;
border-top: 1px solid #e0e0e0;
padding-top: 30px;
padding-bottom: 60px;
position: relative;
}
/* line 342, ../sass/screen.scss */
/* line 356, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
text-transform: uppercase;
text-decoration: none;
padding-left: 10px;
padding-right: 10px;
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 349, ../sass/screen.scss */
/* line 365, ../sass/screen.scss */
#footer a:hover {
color: black;
color: gray;
}
/* line 353, ../sass/screen.scss */
/* line 369, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 359, ../sass/screen.scss */
/* line 375, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 362, ../sass/screen.scss */
/* line 378, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 367, ../sass/screen.scss */
/* line 383, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 371, ../sass/screen.scss */
/* line 387, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -392,7 +401,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 379, ../sass/screen.scss */
/* line 395, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -401,40 +410,40 @@ ul li {
color: black;
}

/* line 390, ../sass/screen.scss */
/* line 406, ../sass/screen.scss */
.mentions #main, .mentions body {
background-color: white;
}

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

/* line 402, ../sass/screen.scss */
/* line 418, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 406, ../sass/screen.scss */
/* line 422, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 411, ../sass/screen.scss */
/* line 427, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 414, ../sass/screen.scss */
/* line 430, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 420, ../sass/screen.scss */
/* line 436, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* signup */
/* line 429, ../sass/screen.scss */
/* line 445, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
@@ -443,31 +452,31 @@ ul li {
h1.title-systeme-commande {
color: black;
padding-bottom: 35px;
font-size: 25px;
font-size: 30px;
line-height: 35px;
font-family: "myriadpro-regular";
text-transform: uppercase;
font-family: "comfortaalight";
text-align: center;
position: relative;
margin-top: 30px;
}
/* line 13, ../sass/_systeme_commandes.scss */
/* line 14, ../sass/_systeme_commandes.scss */
h1.title-systeme-commande img {
width: 35px;
margin-right: 7px;
}

/* line 19, ../sass/_systeme_commandes.scss */
/* line 20, ../sass/_systeme_commandes.scss */
h2 {
font-size: 20px;
text-transform: uppercase;
}

/* line 26, ../sass/_systeme_commandes.scss */
/* line 27, ../sass/_systeme_commandes.scss */
#index-commande {
position: relative;
}
/* line 29, ../sass/_systeme_commandes.scss */
/* line 30, ../sass/_systeme_commandes.scss */
#index-commande #logout {
position: absolute;
/*top: 45px ;
@@ -476,138 +485,167 @@ h2 {
right: 0;
z-index: 10;
}
/* line 38, ../sass/_systeme_commandes.scss */
/* line 39, ../sass/_systeme_commandes.scss */
#index-commande .accueil {
text-align: center;
padding-bottom: 20px;
}
/* line 49, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .remove {
float: right;
/* line 50, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-heading {
height: 200px;
overflow: hidden;
padding: 0px;
background: none;
background-color: #F8F1DD;
}
/* line 53, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .logo {
width: 30%;
max-height: 60px;
float: right;
padding-left: 20px;
/* line 56, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-heading .img-back {
width: 100%;
height: auto;
position: relative;
top: -50%;
}
/* line 65, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body {
position: relative;
width: 100%;
height: 120px;
max-height: 120px;
text-align: center;
}
/* line 64, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries h3 .localite {
/* line 72, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body h3 {
margin-bottom: 4px;
}
/* line 76, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .localite {
color: gray;
margin-bottom: 10px;
}
/* line 70, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body {
height: 108px;
max-height: 108px;
/* line 82, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .remove {
position: absolute;
top: 10px;
right: 10px;
}
/* line 88, ../sass/_systeme_commandes.scss */
#index-commande #liste-boulangeries .panel-body .logo {
display: none;
width: 150px;
position: absolute;
top: -40px;
left: 50%;
margin-left: -75px;
background-color: white;
padding: 10px 20px;
}
/* line 78, ../sass/_systeme_commandes.scss */
/* line 105, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .help-block {
padding-bottom: 0px;
}
/* line 82, ../sass/_systeme_commandes.scss */
/* line 109, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .field-addetablissementform-id_etablissement {
width: 80%;
float: left;
}
/* line 87, ../sass/_systeme_commandes.scss */
/* line 114, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .btn {
float: right;
position: relative;
top: 20px;
}
/* line 93, ../sass/_systeme_commandes.scss */
/* line 120, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .panel-heading {
background: none;
background-color: white;
cursor: pointer;
}
/* line 99, ../sass/_systeme_commandes.scss */
/* line 126, ../sass/_systeme_commandes.scss */
#index-commande #bloc-add-etablissement .panel-body {
display: none;
}
/* line 105, ../sass/_systeme_commandes.scss */
/* line 132, ../sass/_systeme_commandes.scss */
#index-commande #addetablissementform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 112, ../sass/_systeme_commandes.scss */
/* line 139, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .statut, #index-commande #historique-commandes .montant {
width: 175px;
}
/* line 115, ../sass/_systeme_commandes.scss */
/* line 142, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .montant {
width: 100px;
}
/* line 122, ../sass/_systeme_commandes.scss */
/* line 149, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes .localite {
font-size: 11px;
lin-height: 11px;
}
/* line 127, ../sass/_systeme_commandes.scss */
/* line 154, ../sass/_systeme_commandes.scss */
#index-commande #historique-commandes a {
text-decoration: none;
}

/* line 134, ../sass/_systeme_commandes.scss */
/* line 161, ../sass/_systeme_commandes.scss */
.commande-form {
min-height: 600px;
padding-bottom: 60px;
}
/* line 139, ../sass/_systeme_commandes.scss */
/* line 166, ../sass/_systeme_commandes.scss */
.commande-form h2 {
font-family: "myriadpro-regular";
}
/* line 143, ../sass/_systeme_commandes.scss */
/* line 170, ../sass/_systeme_commandes.scss */
.commande-form #infos-importantes.alert-warning {
float: right;
}
/* line 149, ../sass/_systeme_commandes.scss */
/* line 176, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-datepicker {
float: left;
margin-right: 20px;
}
/* line 154, ../sass/_systeme_commandes.scss */
/* line 181, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .ui-helper-clearfix:after {
clear: none;
}
/* line 158, ../sass/_systeme_commandes.scss */
/* line 185, ../sass/_systeme_commandes.scss */
.commande-form #datepicker-production .alert-info {
float: left;
}
/* line 163, ../sass/_systeme_commandes.scss */
/* line 190, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours {
margin-top: 15px;
}
/* line 166, ../sass/_systeme_commandes.scss */
/* line 193, ../sass/_systeme_commandes.scss */
.commande-form #has-commande-en-cours a {
color: #a94442;
text-decoration: none;
font-weight: bold;
}
/* line 173, ../sass/_systeme_commandes.scss */
/* line 200, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_point_vente {
margin-top: 30px;
}
/* line 177, ../sass/_systeme_commandes.scss */
/* line 204, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production {
margin-bottom: 0px;
}
/* line 179, ../sass/_systeme_commandes.scss */
/* line 206, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production label {
margin-bottom: 0px;
}
/* line 183, ../sass/_systeme_commandes.scss */
/* line 210, ../sass/_systeme_commandes.scss */
.commande-form .field-commande-id_production .help-block {
margin-bottom: 0px;
}
/* line 188, ../sass/_systeme_commandes.scss */
/* line 215, ../sass/_systeme_commandes.scss */
.commande-form .blocs {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 193, ../sass/_systeme_commandes.scss */
/* line 220, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc {
text-decoration: none;
width: 268px;
@@ -621,107 +659,107 @@ h2 {
background-color: #f9f9f9;
border: 1px solid #d8d8d8;
}
/* line 207, ../sass/_systeme_commandes.scss */
/* line 234, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .nom {
font-family: "comfortaalight";
font-size: 20px;
}
/* line 213, ../sass/_systeme_commandes.scss */
/* line 240, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .adresse {
color: gray;
font-size: 13px;
line-height: 16px;
}
/* line 219, ../sass/_systeme_commandes.scss */
/* line 246, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires {
margin-top: 7px;
}
/* line 221, ../sass/_systeme_commandes.scss */
/* line 248, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc .horaires .jour {
font-weight: bold;
display: none;
}
/* line 227, ../sass/_systeme_commandes.scss */
/* line 254, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected {
border-left: solid 5px black;
-moz-box-shadow: 0px 0px 5px #d8d8d8;
-webkit-box-shadow: 0px 0px 5px #d8d8d8;
box-shadow: 0px 0px 5px #d8d8d8;
}
/* line 231, ../sass/_systeme_commandes.scss */
/* line 258, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.selected .contenu {
position: relative;
left: -4px;
}
/* line 237, ../sass/_systeme_commandes.scss */
/* line 264, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc:hover {
-moz-box-shadow: 0px 0px 5px #d8d8d8;
-webkit-box-shadow: 0px 0px 5px #d8d8d8;
box-shadow: 0px 0px 5px #d8d8d8;
}
/* line 242, ../sass/_systeme_commandes.scss */
/* line 269, ../sass/_systeme_commandes.scss */
.commande-form .blocs .bloc.disabled {
display: none;
}
/* line 249, ../sass/_systeme_commandes.scss */
/* line 276, ../sass/_systeme_commandes.scss */
.commande-form #produits {
margin-top: 15px;
}
/* line 252, ../sass/_systeme_commandes.scss */
/* line 279, ../sass/_systeme_commandes.scss */
.commande-form #produits #label-produits {
display: block;
margin-bottom: 5px;
}
/* line 257, ../sass/_systeme_commandes.scss */
/* line 284, ../sass/_systeme_commandes.scss */
.commande-form #produits .table {
margin-top: 7px;
}
/* line 260, ../sass/_systeme_commandes.scss */
/* line 287, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .illu {
float: left;
height: auto;
width: 70px;
margin-right: 15px;
}
/* line 267, ../sass/_systeme_commandes.scss */
/* line 294, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .photo {
float: right;
margin-left: 10px;
width: 200px;
}
/* line 273, ../sass/_systeme_commandes.scss */
/* line 300, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .nom {
font-family: "comfortaalight";
font-weight: bold;
text-transform: uppercase;
font-size: 18px;
}
/* line 280, ../sass/_systeme_commandes.scss */
/* line 307, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .description {
font-style: italic;
}
/* line 284, ../sass/_systeme_commandes.scss */
/* line 311, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .recette {
font-size: 12px;
}
/* line 288, ../sass/_systeme_commandes.scss */
/* line 315, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group {
width: 133px;
}
/* line 290, ../sass/_systeme_commandes.scss */
/* line 317, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .input-group .quantity {
text-align: center;
}
/* line 295, ../sass/_systeme_commandes.scss */
/* line 322, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .colonne-quantite, .commande-form #produits .table .prix-unit, .commande-form #produits .table .total {
width: 150px;
text-align: center;
}
/* line 300, ../sass/_systeme_commandes.scss */
/* line 327, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td#total-commande, .commande-form #produits .table td#total-commande-vrac, .commande-form #produits .table td.total {
text-align: center;
}
/* line 304, ../sass/_systeme_commandes.scss */
/* line 331, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .epuise {
display: none;
text-transform: uppercase;
@@ -730,32 +768,32 @@ h2 {
font-size: 16px;
text-align: center;
}
/* line 313, ../sass/_systeme_commandes.scss */
/* line 340, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante {
font-size: 12px;
margin-top: 8px;
}
/* line 317, ../sass/_systeme_commandes.scss */
/* line 344, ../sass/_systeme_commandes.scss */
.commande-form #produits .table .quantite-restante .nb {
font-weight: bold;
}
/* line 322, ../sass/_systeme_commandes.scss */
/* line 349, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.produit, .commande-form #produits .table th.produit {
width: 70%;
}
/* line 326, ../sass/_systeme_commandes.scss */
/* line 353, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.prix-unit, .commande-form #produits .table th.prix-unit {
width: 10%;
}
/* line 330, ../sass/_systeme_commandes.scss */
/* line 357, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.colonne-quantite, .commande-form #produits .table th.colonne-quantite {
width: 10%;
}
/* line 334, ../sass/_systeme_commandes.scss */
/* line 361, ../sass/_systeme_commandes.scss */
.commande-form #produits .table td.total, .commande-form #produits .table th.total {
width: 10%;
}
/* line 340, ../sass/_systeme_commandes.scss */
/* line 367, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed {
position: fixed;
bottom: 0px;
@@ -772,7 +810,7 @@ h2 {
background-color: #F9F9F9;
text-align: center;
}
/* line 354, ../sass/_systeme_commandes.scss */
/* line 381, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom {
background-color: white;
-moz-border-radius: 20px;
@@ -781,37 +819,37 @@ h2 {
padding: 5px 25px;
border: solid 1px #e0e0e0;
}
/* line 361, ../sass/_systeme_commandes.scss */
/* line 388, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .valider-commande, .commande-form #bar-fixed .btn-commentaire {
float: right;
}
/* line 365, ../sass/_systeme_commandes.scss */
/* line 392, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-commentaire {
margin-right: 10px;
}
/* line 369, ../sass/_systeme_commandes.scss */
/* line 396, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .btn-retour, .commande-form #bar-fixed .annuler-commande {
float: left;
margin-right: 5px;
}
/* line 374, ../sass/_systeme_commandes.scss */
/* line 401, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .annuler-commande {
color: #b92c28;
background-color: white;
}
/* line 379, ../sass/_systeme_commandes.scss */
/* line 406, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed #total-commande-bottom {
display: none;
font-weight: bold;
font-family: "comfortaalight";
font-size: 24px;
}
/* line 386, ../sass/_systeme_commandes.scss */
/* line 413, ../sass/_systeme_commandes.scss */
.commande-form #bar-fixed .field-commande-commentaire {
display: none;
}

/* line 394, ../sass/_systeme_commandes.scss */
/* line 421, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-widget-header {
background: none;
background-color: gray;
@@ -819,7 +857,7 @@ h2 {
color: black;
font-weight: normal;
}
/* line 402, ../sass/_systeme_commandes.scss */
/* line 429, ../sass/_systeme_commandes.scss */
.ui-datepicker .ui-datepicker-current-day a,
.ui-datepicker a.ui-state-hover {
background: none;

BIN
frontend/web/img/arches.png Переглянути файл

Before After
Width: 103  |  Height: 23  |  Size: 813B

BIN
frontend/web/img/arches_@2X.png Переглянути файл

Before After
Width: 206  |  Height: 46  |  Size: 4.5KB

BIN
frontend/web/img/crisp_paper_ruffles.png Переглянути файл

Before After
Width: 481  |  Height: 500  |  Size: 51KB

BIN
frontend/web/img/crisp_paper_ruffles2.png Переглянути файл

Before After
Width: 481  |  Height: 500  |  Size: 62KB

BIN
frontend/web/img/crisp_paper_ruffles_@2X.png Переглянути файл

Before After
Width: 962  |  Height: 1000  |  Size: 71KB

BIN
frontend/web/img/laboulange2.png Переглянути файл

Before After
Width: 200  |  Height: 199  |  Size: 1.7KB

BIN
frontend/web/img/laboulange3.png Переглянути файл

Before After
Width: 200  |  Height: 199  |  Size: 1.7KB

BIN
frontend/web/img/laboulange4.png Переглянути файл

Before After
Width: 200  |  Height: 199  |  Size: 1.7KB

BIN
frontend/web/img/retina_wood.png Переглянути файл

Before After
Width: 512  |  Height: 512  |  Size: 100KB

BIN
frontend/web/img/retina_wood_@2X.png Переглянути файл

Before After
Width: 1024  |  Height: 1024  |  Size: 388KB

BIN
frontend/web/img/ricepaper_v3.png Переглянути файл

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

BIN
frontend/web/img/ricepaper_v3_@2X.png Переглянути файл

Before After
Width: 500  |  Height: 500  |  Size: 128KB

BIN
frontend/web/img/swirl_pattern.png Переглянути файл

Before After
Width: 300  |  Height: 300  |  Size: 9.3KB

BIN
frontend/web/img/worn_dots_1.png Переглянути файл

Before After
Width: 200  |  Height: 200  |  Size: 19KB

BIN
frontend/web/img/worn_dots_@2X_1.png Переглянути файл

Before After
Width: 400  |  Height: 400  |  Size: 28KB

+ 47
- 20
frontend/web/sass/_systeme_commandes.scss Переглянути файл

@@ -2,10 +2,11 @@
h1.title-systeme-commande {
color: black ;
padding-bottom: 35px ;
font-size: 25px ;
font-size: 30px ;
line-height: 35px ;
font-family: 'myriadpro-regular' ;
text-transform: uppercase ;
font-family: "comfortaalight" ;
text-align: center ;
position: relative ;
margin-top: 30px ;
@@ -45,32 +46,58 @@ h2 {
#bloc-liste-boulangeries {
//border-right: solid 1px #e0e0e0 ;
}
.remove {
float: right;
}
.logo {
width: 30% ;
//max-width: 200px ;
max-height: 60px ;
float: right ;
padding-left: 20px ;
//border-right: solid 1px #e0e0e0 ;
//padding-bottom: 20px ;

.panel-heading {
height: 200px ;
overflow: hidden ;
padding: 0px ;
background: none ;
background-color: #F8F1DD ;
.img-back {
//display: none ;
width: 100% ;
height: auto ;
position: relative;
top: -50% ;
}
}
h3 {
.panel-body {
position: relative ;
width: 100% ;
height: 120px ;
max-height: 120px;
text-align: center ;
h3 {
margin-bottom: 4px ;
}

.localite {
//float: right ;
color: gray ;
margin-bottom: 10px ;
}

.remove {
position: absolute ;
top: 10px;
right: 10px ;
}
.logo {
display: none ;
width: 150px ;
position: absolute ;
top: -40px ;
left: 50% ;
margin-left: -75px ;
background-color: white ;
padding: 10px 20px ;
}
}
.panel-body {
height: 108px ;
max-height: 108px;
}
}
#bloc-add-etablissement {

+ 70
- 54
frontend/web/sass/screen.scss Переглянути файл

@@ -18,20 +18,29 @@ $color2: lighten($jaune,30%) ;
$color2: #fff2c7 ;
$color2: #fff6d5 ;
$color1: #BB8757 ;

@import "_fonts.scss" ;

html {
height: 100% ;
}

body {
position: relative ;
color: #505050 ;
font-family: 'Arial' ;
background-attachment: fixed ;
min-height: 100%;
margin: 0;
padding: 0;
}

strong {
font-weight: bold ;
}

a {
#main a {
color: $courant ;
text-decoration: underline ;

@@ -47,6 +56,17 @@ a {
&.btn {
text-decoration: none ;
}
&.btn-primary {
background-color: $color1 ;
border: solid 1px $color1 ;
color: white ;
&:hover, &:active, &:focus {
background-color: darken($color1, 5) ;
border: solid 1px $color1 ;
}
}
}

p {
@@ -91,6 +111,7 @@ ul {

#main {
position: relative ;
padding-bottom: 150px ;
.inner {
width: 960px ;
margin: 0px auto ;
@@ -103,8 +124,12 @@ ul {
border-bottom: solid 1px $gris1 ;
background-color: white ;
background-color: #FAFAFA ;
background: transparent top left repeat url(../img/crisp_paper_ruffles2.png) ;
background: none ;
background-color: #F7F7F7;
background-color: #f8f1dd ;
//border-top: 4px solid #2b669a ;
@include box-shadow(0px 0px 3px gray) ;
//@include box-shadow(0px 0px 3px gray) ;
height: 86px ;
//@include box-shadow(0px 0px 5px #ededed) ;
@@ -157,7 +182,7 @@ ul {
li {
a {
text-decoration: none ;
color: $courant ;
&.active {
background-color: white;
border: 1px solid #e0e0e0;
@@ -182,9 +207,6 @@ ul {
}
}

#main {
padding: 0px ;
}

.connected {
#content {
@@ -199,6 +221,31 @@ ul {
padding-top: 35px ;
min-height: 500px ;
h1#title-site {
font-family: "comfortaalight" ;
font-size: 50px ;
//border-bottom: 1px solid #e0e0e0 ;
//font-weight: bold ;
}
h2 {
color: black ;
padding-bottom: 15px ;
font-size: 25px ;
line-height: 35px ;
font-family: 'myriadpro-regular' ;
text-transform: uppercase ;
position: relative ;
margin-top: 30px ;
}

h3 {
color: black ;
//font-family: "comfortaalight" ;
font-size: 20px ;
//padding-bottom: 12px ;
}
#description {
img {
width: 100% ;
@@ -243,49 +290,12 @@ ul {
#clients {
border-right: dotted 1px gray ;
}
.prix {
padding-top: 15px ;
font-size: 18px ;
}
}
.item {
position: relative ;
min-height: 250px ;

.container {
padding: 20px ;
position: relative ;
}
.separateur {
width: 600px ;
border-top: 1px solid #e0e0e0 ;
margin: 0px auto ;
padding-top: 20px ;
margin-top: 20px ;
}

h2 {
color: black ;
padding-bottom: 30px ;
font-size: 25px ;
line-height: 35px ;
font-family: 'myriadpro-regular' ;
text-transform: uppercase ;
//text-align: center ;
position: relative ;
margin-top: 30px ;
}

h3 {
color: black ;
font-family: "comfortaalight" ;
font-size: 20px ;
padding-bottom: 12px ;
}

.icon {
position: absolute ;
}

}
}

@@ -328,26 +338,32 @@ ul {
}

#footer {
position: absolute ;
bottom: 0px ;
left: 0px ;
width: 100% ;
height: 50px ;
background-color: white ;
background-color: #515151 ;
text-align: center ;
border-top: 1px solid #e0e0e0 ;
padding-top: 30px ;
padding-bottom: 60px ;
position: relative ;
//position: relative ;
a {
color: #7e7e7e;
text-transform: uppercase ;
color: white ;
text-transform: uppercase ;
text-decoration: none ;
padding-left: 10px ;
padding-right: 10px ;
border-right: solid 1px #7e7e7e ;
border-right: solid 1px white ;
&:hover {
color: black ;
color: gray ;
}
&:last-child {

BIN
frontend/web/uploads/Four_Le_Chat_des_Noisettes-58111db5d2ed4.jpg Переглянути файл

Before After
Width: 1600  |  Height: 1200  |  Size: 888KB

BIN
frontend/web/uploads/baguettes-gf-58111e4bd476b.jpg Переглянути файл

Before After
Width: 1280  |  Height: 851  |  Size: 306KB

Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти