BenoitCier
/
Opendistrib
форкнуто от Laclic/Souke
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

Nouveau layout 

Mise en place dans les grandes lignes du nouveau layout : sidebar à gauche avec les liens principaux et la liste des producteurs et contenu à droite.
master
keun 6 лет назад
Родитель
067e6f3ad1
Сommit
b727340d9e
10 измененных файлов: 727 добавлений и 199 удалений
Разделённый вид Показать статистику Diff
  1. +2
    -2
      common/controllers/CommonController.php
  2. +22
    -0
      frontend/components/MyView.php
  3. +3
    -0
      frontend/config/main.php
  4. +30
    -0
      frontend/controllers/EtablissementController.php
  5. +2
    -2
      frontend/views/commande/index.php
  6. +22
    -0
      frontend/views/etablissement/index.php
  7. +112
    -79
      frontend/views/layouts/main.php
  8. Двоичные данные
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  9. +296
    -89
      frontend/web/css/screen.css
  10. +238
    -27
      frontend/web/sass/screen.scss

+ 2
- 2
common/controllers/CommonController.php Просмотреть файл

@@ -12,8 +12,8 @@ class CommonController extends \yii\web\Controller {
}

return parent::beforeAction($event);
}
}
}

?>

+ 22
- 0
frontend/components/MyView.php Просмотреть файл

@@ -0,0 +1,22 @@
<?php

namespace frontend\components ;

class MyView extends \yii\web\View {
var $icon ;
public function setTitle($title, $icon) {
$this->title = $title ;
$this->icon = $icon ;
}
public function getTitle() {
return $this->title ;
}

public function getTitleIcon() {
return $this->icon ;
}
}

+ 3
- 0
frontend/config/main.php Просмотреть файл

@@ -41,6 +41,9 @@ return [
],
],
],
'view' => [
'class' => 'frontend\components\MyView',
]
],
'params' => $params,
];

+ 30
- 0
frontend/controllers/EtablissementController.php Просмотреть файл

@@ -0,0 +1,30 @@
<?php

namespace frontend\controllers;

use Yii;
use yii\filters\AccessControl;
use frontend\controllers\FrontendController;

class EtablissementController extends FrontendController {

public function behaviors() {
return [
'access' => [
'class' => AccessControl::className(),
'rules' => [
[
'allow' => true,
'roles' => ['@'],
]
],
],
];
}
public function actionIndex() {
return $this->render('index') ;
}
}

+ 2
- 2
frontend/views/commande/index.php Просмотреть файл

@@ -7,12 +7,12 @@ use common\models\Commande ;

$this->title = 'Commande' ;

$this->setTitle('Tableau de bord', 'glyphicon-th-list') ;

?>

<div id="index-commande">

<h1 class="title-systeme-commande"><span class="glyphicon glyphicon-th-list"></span> Tableau de bord</h1>

<h2>Producteurs</h2>

<?php if($commande_ok): ?>

+ 22
- 0
frontend/views/etablissement/index.php Просмотреть файл

@@ -0,0 +1,22 @@
<?php

$this->title = 'Établissement' ;

?>

<div class="header-etablissement">
<div id="block-main-img">
<img id="main-img" src="http://www.laboiteapain.net/uploads/Four_Le_Chat_des_Noisettes-582049376a029.jpg" />
<h1><span>Le Chat des Noisettes</span></h1>
</div>
</div>

<nav id="menu-etablissement">
<ul class="nav nav-pills">
<li><a href="#"><span class="glyphicon glyphicon-heart-empty"></span> Présentation</a></li>
<li><a href="#"><span class="glyphicon glyphicon-plus"></span> Commander</a></li>
<li><a href="#"><span class="glyphicon glyphicon-folder-open"></span> Historique</a></li>
<li><a href="#"><span class="glyphicon glyphicon-euro"></span> Crédit pain</a></li>
</ul>
</nav>


+ 112
- 79
frontend/views/layouts/main.php Просмотреть файл

@@ -17,98 +17,131 @@ AppAsset::register($this);
<?php $this->beginPage() ?>
<!DOCTYPE html>
<head>
<title><?php if($is_home): ?>La boîte à pain &bull; <?= Html::encode($this->title) ?> <?php else: ?><?= Html::encode($this->title) ?> &bull; La boîte à pain<?php endif; ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><?php if($is_home): ?>La boîte à pain &bull; <?= Html::encode($this->title) ?> <?php else: ?><?= Html::encode($this->title) ?> &bull; La boîte à pain<?php endif; ?></title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="./img/favicon.ico" /><![endif]-->
<link rel="icon" type="image/png" href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon4.png" />
<!--[if IE]><link rel="shortcut icon" type="image/x-icon" href="./img/favicon.ico" /><![endif]-->
<?php $this->head() ?>
<!--[if lt IE 9]>
<script src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/js/html5shiv.min.js"></script>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 7]>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie7.css" rel="stylesheet">
<![endif]-->
<script src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/js/html5shiv.min.js"></script>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie.css" rel="stylesheet">
<![endif]-->
<!--[if IE 7]>
<link href="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/css/ie7.css" rel="stylesheet">
<![endif]-->
</head>
<body class="<?php if($is_home): echo 'home' ; endif; ?><?php if(!Yii::$app->user->isGuest): ?> connected<?php endif; ?>">
<?php $this->beginBody() ?>
<div id="back"></div>
<?php if(YII_ENV == 'demo'): ?>
<div id="block-demo">
<div class="container">
<span class="glyphicon glyphicon-eye-open"></span> <strong>Espace de démonstration</strong> :
Testez la plateforme sans avoir à vous inscrire. Les données sont réinitialisées quotidiennement &bull; <?= Html::a('Retour', Url::env('prod', 'frontend')) ?>
<?php $this->beginBody() ?>
<?php if(YII_ENV == 'demo'): ?>
<div id="block-demo">
<div class="container">
<span class="glyphicon glyphicon-eye-open"></span> <strong>Espace de démonstration</strong> :
Testez la plateforme sans avoir à vous inscrire. Les données sont réinitialisées quotidiennement &bull; <?= Html::a('Retour', Url::env('prod', 'frontend')) ?>
</div>
</div>
<?php endif; ?>
<div id="main">
<div class="col-md-3" id="col-left">
<div class="affix">
<section id="logo">
<a id="link-home" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo Yii::$app->urlManager->createUrl('commande/index') ; endif; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<div class="text">
<div class="bap">La boîte à pain</div>
<div class="plateforme">Plateforme de réservation
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?><?php if(YII_ENV == 'dev'): ?><?php elseif(YII_ENV == 'demo'): ?><?php endif; ?></div><?php endif; ?>
</div>
</div>
<?php endif; ?>
<header id="header">
<div class="container">
<a id="link-home" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo Yii::$app->urlManager->createUrl('commande/index') ; endif; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<div class="text">
<div class="bap">La boîte à pain</div>
<div class="plateforme">Plateforme de réservation
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?><?php if(YII_ENV == 'dev'): ?>(dév)<?php elseif(YII_ENV == 'demo'): ?>(démo)<?php endif; ?></div><?php endif; ?></div>
</div>
</a>
<nav class="">
<ul class="nav nav-pills">
<div class="clr"></div>
</a>
</section>

<section id="links">
<nav>
<ul class="">
<?php if(!Yii::$app->user->isGuest):?>
<li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'index'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/index') ; ?>"><span class="glyphicon glyphicon-th-list"></span> Tableau de bord</a></li>
<li><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'create'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/create') ; ?>"><span class="glyphicon glyphicon-plus"></span> Commander</a></li>
<li><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'update'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/update') ; ?>"><span class="glyphicon glyphicon-user"></span> Profil</a></li>
<li><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> Déconnexion<br /><span class="nom"><?php echo Html::encode(Yii::$app->user->identity->prenom .' '. substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?></span></a></li>
<?php if(Yii::$app->user->identity->isBoulanger()): ?><li><a class="" id="link-espace-boulanger" href="<?php echo Url::backend(); ?>"><span class="glyphicon glyphicon-grain"></span> Espace boulanger</a></li><?php endif; ?>
<li class="col-md-3"><a <?php if(Yii::$app->controller->id == 'commande' && Yii::$app->controller->action->id == 'index'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('commande/index') ; ?>"><span class="glyphicon glyphicon-th-list"></span><span class="libelle">Tableau de bord</span></a></li>
<li class="col-md-3"><a <?php if(Yii::$app->controller->id == 'user' && Yii::$app->controller->action->id == 'update'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('user/update') ; ?>"><span class="glyphicon glyphicon-user"></span><span class="libelle">Profil</span></a></li>
<?php if(Yii::$app->user->identity->isBoulanger()): ?><li class="col-md-3"><a class="" id="link-espace-boulanger" href="<?php echo Url::backend(); ?>"><span class="glyphicon glyphicon-grain"></span> <span class="libelle">Espace boulanger</span></a></li><?php endif; ?>
<li class="col-md-3"><a id="link-logout" href="<?php echo Yii::$app->urlManager->createUrl('site/logout') ; ?>"><span class="glyphicon glyphicon-off"></span> <span class="libelle">Déconnexion</span><br /><span class="nom"><?php echo Html::encode(Yii::$app->user->identity->prenom .' '. substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?></span></a></li>
<?php else: ?>
<li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'login'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/login') ; ?>"><span class="glyphicon glyphicon-log-in"></span> Connexion</a></li>
<li><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'signup'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>"><span class="glyphicon glyphicon-user"></span> Inscription</a></li>
<li class="col-md-6"><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'login'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/login') ; ?>"><span class="glyphicon glyphicon-log-in"></span> Connexion</a></li>
<li class="col-md-6"><a <?php if(Yii::$app->controller->id == 'site' && Yii::$app->controller->action->id == 'signup'): ?>class="active" <?php endif; ?>href="<?php echo Yii::$app->urlManager->createUrl('site/signup') ; ?>"><span class="glyphicon glyphicon-user"></span> Inscription</a></li>
<?php endif;?>
</ul>
</nav>
</ul>
</nav>
<div class="clr"></div>
</section>

<?php if(Yii::$app->user->isGuest):?>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer ut ipsum venenatis, aliquam tellus sit amet, elementum ex. Sed a ex fermentum, viverra augue in, eleifend lectus. Morbi pretium vestibulum quam at vulputate. Sed malesuada est ligula, sit amet hendrerit risus eleifend vitae. Donec sed lacus ac dolor interdum ultrices. Maecenas malesuada elit vel est commodo aliquet. Praesent ullamcorper ante vitae rutrum placerat. Proin ornare hendrerit leo, iaculis cursus augue ultricies at. </p>
<?php else: ?>
<section id="producteurs">
<h2>Producteurs</h2>
<nav class="nav-producteurs">
<ul>
<li>
<a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">
<span class="name">Le Chat des Noisettes</span>
</a>
</li>
<li><a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">Ferme de Coucourdon</a></li>
<li><a href="<?= Yii::$app->urlManager->createUrl(['etablissement/index']) ; ?>">Terre de Pains</a></li>
<li><a href="#"><span class="glyphicon glyphicon-plus"></span> Ajouter un producteur</a></li>
</ul>
</nav>
</section>
<?php endif; ?>

<footer id="footer">
<div class="">
<a href="<?php echo Yii::$app->urlManager->createUrl('site/contact') ; ?>">Contact</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/mentions') ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/cgv') ; ?>">CGS</a>
</div>
</header>
<div id="main">
<section class="<?php if(!$is_home): ?>container<?php endif;?>" id="content">
<?php if(Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if(Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php endif; ?>
<?= $content ?>
</section>
</div>
<footer id="footer">
<div class="container">
<a href="<?php echo Yii::$app->urlManager->createUrl('site/contact') ; ?>">Contact</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/mentions') ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManager->createUrl('site/cgv') ; ?>">CGS</a>
</div>
</footer>
</footer>
</div>
</div>
<section class="col-md-9 col-lg-offset-3" id="content">
<?php if(strlen($this->getTitle())): ?>
<div class="header-title">
<h1><?php if(strlen($this->getTitleIcon())): ?><span class="glyphicon <?= $this->getTitleIcon(); ?>"></span><?php endif; ?> <?= $this->getTitle(); ?></h1>
</div>
<?php endif; ?>

<div id="the-content">
<?php if(Yii::$app->session->hasFlash('error')): ?>
<div class="alert alert-danger" role="alert">
<?= Yii::$app->session->getFlash('error') ?>
</div>
<?php endif; ?>
<?php if(Yii::$app->session->hasFlash('success')): ?>
<div class="alert alert-success" role="alert">
<?= Yii::$app->session->getFlash('success') ?>
</div>
<?php endif; ?>
<?= $content ?>
</div>
</section>
<div class="clr"></div>
</div>
<?php $this->endBody() ?>
<?php $this->endBody() ?>
<!-- analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
<!-- analytics -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-86917043-1', 'auto');
ga('send', 'pageview');
</script>
ga('create', 'UA-86917043-1', 'auto');
ga('send', 'pageview');
</script>
</body>
</html>
<?php $this->endPage() ?>

Двоичные данные
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Просмотреть файл


+ 296
- 89
frontend/web/css/screen.css Просмотреть файл

@@ -152,22 +152,21 @@ ul li {
/* line 121, ../sass/screen.scss */
#main {
position: relative;
padding-bottom: 150px;
}
/* line 124, ../sass/screen.scss */
/* line 123, ../sass/screen.scss */
#main .inner {
width: 960px;
margin: 0px auto;
}

/* line 131, ../sass/screen.scss */
/* line 130, ../sass/screen.scss */
#content .content-text h1 {
font-family: "myriadpro-regular";
font-size: 30px;
color: black;
text-transform: uppercase;
}
/* line 138, ../sass/screen.scss */
/* line 137, ../sass/screen.scss */
#content .content-text h2 {
font-family: "comfortaaregular";
font-size: 20px;
@@ -178,30 +177,36 @@ ul li {
}

/* line 148, ../sass/screen.scss */
#content #the-content {
padding-left: 30px;
}

/* line 154, ../sass/screen.scss */
#block-demo {
padding: 10px 0px;
background-color: #BB8757;
color: white;
text-align: center;
}
/* line 154, ../sass/screen.scss */
/* line 160, ../sass/screen.scss */
#block-demo a {
color: white;
text-decoration: underline;
}

/* line 160, ../sass/screen.scss */
/* line 166, ../sass/screen.scss */
#header {
display: none;
z-index: 100;
border-bottom: solid 1px #e0e0e0;
background-color: #f8f1dd;
height: 86px;
}
/* line 166, ../sass/screen.scss */
/* line 173, ../sass/screen.scss */
#header .container {
position: relative;
}
/* line 170, ../sass/screen.scss */
/* line 177, ../sass/screen.scss */
#header #env-dev {
font-family: "comfortaabold";
text-align: center;
@@ -214,7 +219,7 @@ ul li {
top: 18px;
left: 79px;
}
/* line 183, ../sass/screen.scss */
/* line 190, ../sass/screen.scss */
#header #link-home {
position: absolute;
top: 10px;
@@ -224,56 +229,56 @@ ul li {
color: black;
display: block;
}
/* line 192, ../sass/screen.scss */
/* line 199, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
float: left;
}
/* line 198, ../sass/screen.scss */
/* line 205, ../sass/screen.scss */
#header #link-home .text {
float: left;
padding-left: 10px;
}
/* line 202, ../sass/screen.scss */
/* line 209, ../sass/screen.scss */
#header #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 207, ../sass/screen.scss */
/* line 214, ../sass/screen.scss */
#header #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 215, ../sass/screen.scss */
/* line 222, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
color: #BB8757;
}
/* line 220, ../sass/screen.scss */
/* line 227, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 222, ../sass/screen.scss */
/* line 229, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 225, ../sass/screen.scss */
/* line 232, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 228, ../sass/screen.scss */
/* line 235, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
}
/* line 232, ../sass/screen.scss */
/* line 239, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: white;
}
/* line 242, ../sass/screen.scss */
/* line 249, ../sass/screen.scss */
#header #link-logout .nom {
color: gray;
font-size: 10px;
@@ -282,20 +287,18 @@ ul li {
top: -4px;
}

/* line 259, ../sass/screen.scss */
/* line 266, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
padding-bottom: 0px;
padding-top: 35px;
min-height: 500px;
padding: 0px;
}
/* line 266, ../sass/screen.scss */
/* line 272, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 273, ../sass/screen.scss */
/* line 279, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -306,16 +309,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 284, ../sass/screen.scss */
/* line 290, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 292, ../sass/screen.scss */
/* line 298, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 297, ../sass/screen.scss */
/* line 303, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -324,76 +327,76 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 304, ../sass/screen.scss */
/* line 310, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 306, ../sass/screen.scss */
/* line 312, ../sass/screen.scss */
#content #row-presentation h1 {
color: black;
}
/* line 309, ../sass/screen.scss */
/* line 315, ../sass/screen.scss */
#content #row-presentation strong {
font-family: "myriadpro-light";
font-size: 20px;
color: #B17A48;
}
/* line 316, ../sass/screen.scss */
/* line 322, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
}
/* line 320, ../sass/screen.scss */
/* line 326, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 13px 32px;
font-size: 25px;
}
/* line 326, ../sass/screen.scss */
/* line 332, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
text-align: center;
}
/* line 329, ../sass/screen.scss */
/* line 335, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 333, ../sass/screen.scss */
/* line 339, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 339, ../sass/screen.scss */
/* line 345, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: left;
margin-left: 20%;
}
/* line 342, ../sass/screen.scss */
/* line 348, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: circle;
color: #BB8757;
}
/* line 348, ../sass/screen.scss */
/* line 354, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 354, ../sass/screen.scss */
/* line 360, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span {
background-color: #F8F1DD;
}
/* line 357, ../sass/screen.scss */
/* line 363, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span a {
color: #BB8757;
text-decoration: none;
}
/* line 365, ../sass/screen.scss */
/* line 371, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
text-align: center;
}
/* line 370, ../sass/screen.scss */
/* line 376, ../sass/screen.scss */
#content #row-clients-boulanger .prix span {
color: #BB8757;
border: solid 1px #BB8757;
@@ -408,7 +411,7 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 385, ../sass/screen.scss */
/* line 391, ../sass/screen.scss */
#content #row-clients-boulanger #periode-essai {
margin-top: 8px;
text-align: center;
@@ -416,98 +419,95 @@ ul li {
color: gray;
font-family: "comfortaaregular";
}
/* line 395, ../sass/screen.scss */
/* line 401, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}
/* line 401, ../sass/screen.scss */
/* line 407, ../sass/screen.scss */
#content #modal-tarifs .exemple {
color: gray;
}

/* line 408, ../sass/screen.scss */
/* line 414, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 412, ../sass/screen.scss */
/* line 418, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 421, ../sass/screen.scss */
/* line 427, ../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 426, ../sass/screen.scss */
/* line 432, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 430, ../sass/screen.scss */
/* line 436, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 433, ../sass/screen.scss */
/* line 439, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 440, ../sass/screen.scss */
/* line 446, ../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 445, ../sass/screen.scss */
/* line 451, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
left: 0px;
width: 100%;
height: 50px;
background-color: white;
text-align: center;
border-top: 1px solid #e0e0e0;
padding-top: 30px;
padding-bottom: 60px;
padding-top: 20px;
padding-bottom: 40px;
background-color: #FAFAFA;
position: absolute;
bottom: 0px;
left: 0px;
}
/* line 459, ../sass/screen.scss */
/* line 465, ../sass/screen.scss */
#footer a {
font-family: "myriadpro-regular";
color: #7e7e7e;
color: white;
color: #999;
font-size: 12px;
color: gray;
text-transform: uppercase;
text-decoration: none;
padding-left: 10px;
padding-right: 10px;
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 470, ../sass/screen.scss */
/* line 473, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 474, ../sass/screen.scss */
/* line 477, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 480, ../sass/screen.scss */
/* line 483, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 483, ../sass/screen.scss */
/* line 486, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 488, ../sass/screen.scss */
/* line 491, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 492, ../sass/screen.scss */
/* line 495, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -515,7 +515,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 500, ../sass/screen.scss */
/* line 503, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -524,58 +524,58 @@ ul li {
color: black;
}

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

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

/* line 523, ../sass/screen.scss */
/* line 526, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 527, ../sass/screen.scss */
/* line 530, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 532, ../sass/screen.scss */
/* line 535, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 535, ../sass/screen.scss */
/* line 538, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 541, ../sass/screen.scss */
/* line 544, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

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

/* signup */
/* line 558, ../sass/screen.scss */
/* line 561, ../sass/screen.scss */
.modal-backdrop {
z-index: -1;
}

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

/* line 573, ../sass/screen.scss */
/* line 576, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -583,24 +583,231 @@ ul li {
margin-top: 0px;
}

/* line 583, ../sass/screen.scss */
/* line 586, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 588, ../sass/screen.scss */
/* line 591, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 594, ../sass/screen.scss */
/* line 597, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 598, ../sass/screen.scss */
/* line 601, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

/* line 606, ../sass/screen.scss */
#col-left {
padding: 0px;
z-index: 15;
}
/* line 610, ../sass/screen.scss */
#col-left .affix {
width: 25%;
border-right: solid 1px #e0e0e0;
background-color: #FAFAFA;
height: 100%;
}
/* line 617, ../sass/screen.scss */
#col-left #link-home {
text-decoration: none;
font-size: 22px;
color: black;
display: block;
padding: 10px;
background-color: #F8F1DD;
}
/* line 625, ../sass/screen.scss */
#col-left #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 631, ../sass/screen.scss */
#col-left #link-home .text {
padding-left: 62px;
}
/* line 634, ../sass/screen.scss */
#col-left #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 639, ../sass/screen.scss */
#col-left #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 647, ../sass/screen.scss */
#col-left h2 {
font-family: "myriadpro-regular";
color: black;
margin: 0px;
margin-bottom: 10px;
padding: 15px 0px 5px 15px;
}
/* line 655, ../sass/screen.scss */
#col-left #links {
background-color: white;
margin-bottom: 20px;
}
/* line 661, ../sass/screen.scss */
#col-left #links ul li a {
text-align: center;
border-right: solid 1px #e0e0e0;
}
/* line 665, ../sass/screen.scss */
#col-left #links ul li a:hover {
background-color: #BB8757;
color: white;
}
/* line 671, ../sass/screen.scss */
#col-left #links ul li:last-child a {
border-right: 0px none;
}
/* line 681, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li a {
padding-left: 50px;
height: 40px;
}
/* line 687, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a {
background-color: #BB8757;
position: relative;
color: white;
}
/* line 692, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a:after {
right: -40px;
top: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba(187, 135, 87, 0);
border-left-color: #BB8757;
border-width: 20px;
margin-top: -20px;
}
/* line 711, ../sass/screen.scss */
#col-left ul {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 715, ../sass/screen.scss */
#col-left ul li {
margin: 0px;
padding: 0px;
}
/* line 718, ../sass/screen.scss */
#col-left ul li a {
text-decoration: none;
font-family: "comfortaaregular";
font-family: "myriadpro-regular";
font-size: 15px;
padding: 10px;
border-bottom: solid 1px #e0e0e0;
display: block;
color: black;
}
/* line 728, ../sass/screen.scss */
#col-left ul li a span.nom, #col-left ul li a span.libelle {
display: none;
}
/* line 735, ../sass/screen.scss */
#col-left p {
padding: 20px;
color: gray;
}

/* line 741, ../sass/screen.scss */
.header-title {
height: 79px;
padding: 20px 20px;
position: fixed;
top: 0px;
width: 100%;
background-color: white;
z-index: 10;
box-sizing: border-box;
border-bottom: solid 1px #e0e0e0;
-moz-box-shadow: 0px 0px 8px #e0e0e0;
-webkit-box-shadow: 0px 0px 8px #e0e0e0;
box-shadow: 0px 0px 8px #e0e0e0;
}
/* line 753, ../sass/screen.scss */
.header-title h1 {
color: black;
font-family: "myriadpro-regular";
margin: 0px;
font-size: 30px;
}

/* line 761, ../sass/screen.scss */
.header-etablissement {
z-index: 1;
}
/* line 763, ../sass/screen.scss */
.header-etablissement #block-main-img {
height: 144px;
overflow: hidden;
}
/* line 767, ../sass/screen.scss */
.header-etablissement #block-main-img #main-img {
width: 100%;
height: auto;
border: 0px none;
padding: 0px;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 776, ../sass/screen.scss */
.header-etablissement h1 {
font-family: "comfortaaregular";
text-align: center;
position: absolute;
top: 30px;
left: 40px;
}
/* line 783, ../sass/screen.scss */
.header-etablissement h1 span {
background-color: rgba(255, 255, 255, 0.8);
padding: 10px 30px;
border: dotted 1px black;
}

/* line 794, ../sass/screen.scss */
nav#menu-etablissement {
border-bottom: solid 1px #e0e0e0;
}
/* line 798, ../sass/screen.scss */
nav#menu-etablissement ul li {
padding: 0px;
margin: 0px;
}
/* line 801, ../sass/screen.scss */
nav#menu-etablissement ul li a {
border-right: solid 1px #e0e0e0;
text-decoration: none;
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 806, ../sass/screen.scss */
nav#menu-etablissement ul li a:hover {
background-color: #BB8757;
color: white;
}

/* line 2, ../sass/_systeme_commandes.scss */
h1.title-systeme-commande {
color: black;

+ 238
- 27
frontend/web/sass/screen.scss Просмотреть файл

@@ -120,7 +120,6 @@ ul {

#main {
position: relative ;
padding-bottom: 150px ;
.inner {
width: 960px ;
margin: 0px auto ;
@@ -145,6 +144,13 @@ ul {
}
}

#content {
#the-content {
padding-left: 30px ;
padding-right: 30px ;
}
}

#block-demo {
padding: 10px 0px ;
background-color: $color1 ;
@@ -158,6 +164,7 @@ ul {
}

#header {
display: none ;
z-index: 100 ;
border-bottom: solid 1px $gris1 ;
background-color: #f8f1dd ;
@@ -258,11 +265,10 @@ ul {

#content {
position: relative ;
padding: 20px 0px ;
padding-bottom: 0px ;
padding-top: 35px ;
min-height: 500px ;
//border-left: solid 1px #e0e0e0 ;
padding: 0px ;
h1#title-site {
font-family: "comfortaalight" ;
font-size: 50px ;
@@ -443,37 +449,34 @@ ul {
}

#footer {
position: absolute ;
bottom: 0px ;
left: 0px ;
width: 100% ;
height: 50px ;
background-color: white ;
text-align: center ;
border-top: 1px solid #e0e0e0 ;
padding-top: 20px ;
padding-bottom: 40px ;
background-color: #FAFAFA ;
padding-top: 30px ;
padding-bottom: 60px ;
position: absolute ;
bottom: 0px ;
left: 0px ;
a {
font-family: 'myriadpro-regular' ;
color: #7e7e7e;
color: white ;
color: #999 ;
text-transform: uppercase ;
text-decoration: none ;
padding-left: 10px ;
padding-right: 10px ;
border-right: solid 1px #7e7e7e ;
border-right: solid 1px white ;
&:hover {
color: gray ;
}
&:last-child {
border: 0px none ;
}
font-size: 12px ;
color: gray ;
text-transform: uppercase ;
text-decoration: none ;
padding-right: 10px ;
border-right: solid 1px white ;
&:hover {
color: gray ;
}

&:last-child {
border: 0px none ;
}
}
}

@@ -600,10 +603,218 @@ ul {
}
}

#col-left {
padding: 0px ;
z-index: 15 ;
.affix {
width: 25% ;
border-right: solid 1px #e0e0e0 ;
background-color: #FAFAFA ;
height: 100% ;
}
#link-home {
text-decoration: none ;
font-size: 22px ;
color: black ;
display: block ;
padding: 10px ;
background-color: $color2 ;
img {
height: 50px ;
margin-bottom: 5px ;
float: left ;
}

.text {
padding-left: 62px ;

.bap {
font-family: "comfortaalight" ;
font-size: 24px ;
}

.plateforme {
font-size: 17px ;
font-family: "myriadpro-light" ;
color: $color1 ;
}
}
}
h2 {
font-family: 'myriadpro-regular' ;
color: black ;
margin: 0px ;
margin-bottom: 10px ;
padding: 15px 0px 5px 15px ;
}
#links {
background-color: white ;
margin-bottom: 20px ;
ul {
li {
a {
text-align: center ;
border-right: solid 1px #e0e0e0 ;
&:hover {
background-color: $color1 ;
color: white ;
}
}
&:last-child a {
border-right: 0px none ;
}
}
}
}
#producteurs nav.nav-producteurs {
ul {
li {
a {
padding-left: 50px ;
height: 40px ;
//margin-right: 20px ;
}
&.active a {
background-color: $color1 ;
position: relative ;
color: white ;
&:after {
right: -40px ;
top: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba(187, 135, 87, 0);
border-left-color: #BB8757;
border-width: 20px;
margin-top: -20px;
}
}
}
}
}
ul {
list-style-type: none ;
margin: 0px ;
padding: 0px ;
li {
margin: 0px ;
padding: 0px ;
a {
text-decoration: none ;
font-family: 'comfortaaregular' ;
font-family: 'myriadpro-regular' ;
font-size: 15px ;
padding: 10px ;
border-bottom: solid 1px #e0e0e0 ;
display: block ;
color: black ;
span.nom, span.libelle {
display: none ;
}
}
}
}
p {
padding: 20px ;
color: gray ;
}
}

.header-title {
height: 79px ;
padding: 20px 20px ;
position: fixed ;
top: 0px ;
width: 100% ;
background-color: white ;
z-index: 10 ;
box-sizing: border-box ;
border-bottom: solid 1px #e0e0e0 ;
@include box-shadow(0px 0px 8px #e0e0e0) ;
h1 {
color: black ;
font-family: 'myriadpro-regular' ;
margin: 0px ;
font-size: 30px ;
}
}

.header-etablissement {
z-index: 1 ;
#block-main-img {
height: 144px ;
overflow: hidden ;
#main-img {
width: 100% ;
height: auto ;
border: 0px none ;
padding: 0px ;
@include border-radius(0px) ;
}
}
h1 {
font-family: 'comfortaaregular' ;
text-align: center ;
position: absolute ;
top: 30px ;
left: 40px ;
span {
background-color: rgba(255, 255, 255, 0.8) ;
//background-color: rgba(187, 135, 87, 0.6) ;
//color: white ;
padding: 10px 30px ;
border: dotted 1px black ;
//@include border-radius(20px) ;
}
}
}

nav#menu-etablissement {
border-bottom: solid 1px #e0e0e0 ;
//background-color: #FAFAFA ;
ul {
li {
padding: 0px ;
margin: 0px ;
a {
border-right: solid 1px #e0e0e0 ;
text-decoration: none ;
@include border-radius(0px) ;
&:hover {
background-color: $color1 ;
color: white ;
}
}
}
}
}

@import "_systeme_commandes.scss" ;
@import "_responsive.scss" ;





Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить