BenoitCier
/
Opendistrib
派生自 Laclic/Souke
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Merge branch 'details_ergonomie_frontend' into dev

dev
Guillaume Bourgeois 5 年前
父节点
4432dd57d7 b3079e2396
当前提交
1709f49f61
共有 13 个文件被更改，包括 242 次插入 和 170 次删除
分列视图 显示文件统计
  1. +1
    -1
      common/helpers/Url.php
  2. +5
    -0
      common/models/UserProducer.php
  3. +24
    -3
      frontend/controllers/SiteController.php
  4. +0
    -1
      frontend/models/ProducerCodeForm.php
  5. +23
    -6
      frontend/models/SignupForm.php
  6. +24
    -5
      frontend/views/layouts/main.php
  7. +4
    -2
      frontend/views/site/index.php
  8. +1
    -1
      frontend/views/site/producer_code.php
  9. +1
    -1
      frontend/views/site/producers.php
  10. +143
    -140
      frontend/web/css/screen.css
  11. 二进制
      frontend/web/img/logo-distrib-gray.png
  12. +2
    -0
      frontend/web/sass/_responsive.scss
  13. +14
    -10
      frontend/web/sass/screen.scss

+ 1
- 1
common/helpers/Url.php 查看文件

@@ -143,6 +143,6 @@ class Url
public static function slugify($string)
{
return strtolower(trim(preg_replace('/[^A-Za-z0-9-]+/', '-', $string)));
return strtolower(trim(preg_replace('/[^A-Za-z0-9-]+/', '', $string)));
}
}

+ 5
- 0
common/models/UserProducer.php 查看文件

@@ -86,6 +86,11 @@ class UserProducer extends ActiveRecordCommon
];
}
public function getProducer()
{
return $this->hasOne(Producer::className(), ['id' => 'id_producer']);
}
/**
* Retourne les options de base nécessaires à la fonction de recherche.
*

+ 24
- 3
frontend/controllers/SiteController.php 查看文件

@@ -189,7 +189,17 @@ class SiteController extends FrontendController
return $this->redirect($returnUrl);
}
else {
return $this->goBack();
$userProducerArray = UserProducer::find()
->with(['producer'])
->where(['id_user' => User::getCurrentId(), 'active' => 1, 'bookmark' => 1])
->all() ;
if($userProducerArray && is_array($userProducerArray) && count($userProducerArray) == 1) {
return $this->redirect(Yii::$app->urlManagerProducer->createAbsoluteUrl(['site/index', 'slug_producer' => $userProducerArray[0]->producer->slug ]));
}
else {
return $this->goBack();
}
}
} else {
return $this->render('@frontend/views/site/login', [
@@ -243,7 +253,18 @@ class SiteController extends FrontendController
if ($model->load(Yii::$app->request->post())) {
if ($user = $model->signup()) {
if (Yii::$app->getUser()->login($user)) {
$this->redirect(['site/index']);
if($model->option_user_producer == 'producer') {
$this->redirect(Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']));
}
else {
$producer = Producer::findOne($model->id_producer) ;
if($producer) {
$this->redirect(Yii::$app->urlManagerProducer->createAbsoluteUrl(['site/index','slug_producer' => $producer->slug]));
}
else {
$this->redirect(['site/index']);
}
}
}
}
}
@@ -339,7 +360,7 @@ class SiteController extends FrontendController
*/
public function actionProducerCode($id)
{
$producer = Producer::searchOne($id);
$producer = Producer::findOne($id);
if(!$producer) {
throw new \yii\web\HttpException(404, 'Producteur introuvable');

+ 0
- 1
frontend/models/ProducerCodeForm.php 查看文件

@@ -77,7 +77,6 @@ class ProducerCodeForm extends Model
['code', function($attribute, $params) {
$code = $this->$attribute;
$producer = Producer::findOne($this->id_producer);

if ($producer && strtolower(trim($code)) != strtolower(trim($producer->code))) {
$this->addError($attribute, 'Code incorrect');
}

+ 23
- 6
frontend/models/SignupForm.php 查看文件

@@ -163,6 +163,9 @@ class SignupForm extends Model
}
}
}],
['id_producer', 'required', 'message' => 'Champs obligatoire', 'when' => function($model) {
return $this->option_user_producer == 'user' ;
}],
['code', 'required', 'message' => 'Champs obligatoire', 'when' => function($model) {
$producer = Producer::findOne($this->id_producer);
if ($producer) {
@@ -230,7 +233,17 @@ class SignupForm extends Model
$producer->order_deadline = 20;
$producer->order_delay = 1;
$producer->free_price = (float) abs($this->free_price);
$producer->slug = \common\helpers\Url::slugify($this->name_producer) ;

$cptSlug = 0 ;
do {
$slug = \common\helpers\Url::slugify($this->name_producer) ;
if($cptSlug) {
$slug .= $cptSlug ;
}
$producer->slug = $slug ;
$cptSlug ++ ;
} while(Producer::findOne(['slug' => $producer->slug])) ;

// génération d'un code
do {
@@ -256,6 +269,11 @@ class SignupForm extends Model
->setFrom([Yii::$app->params['adminEmail'] => 'distrib'])
->setSubject('[distrib] Nouveau producteur')
->send();
$idProducer = $producer->id ;
}
else {
$idProducer = $this->id_producer ;
}

$user->setPassword($this->password);
@@ -263,13 +281,12 @@ class SignupForm extends Model
if ($user->save()) {

// on ajoute l'établissement sélectionnée par l'user en favoris
if ($this->option_user_producer == 'user' && $this->id_producer) {
$producer = Producer::find()->where(['id' => $this->id_producer])->one();
$producer = Producer::find()->where(['id' => $idProducer])->one();

if ($producer) {
Producer::addUser($user->id, $this->id_producer) ;
if ($producer) {
Producer::addUser($user->id, $idProducer) ;

if($this->option_user_producer == 'user') {
// envoi d'un email à l'utilisateur
Yii::$app->mailer->compose(
[

+ 24
- 5
frontend/views/layouts/main.php 查看文件

@@ -51,6 +51,11 @@ $isHome = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action-
\common\assets\CommonAsset::register($this);
\frontend\assets\AppAsset::register($this);

$producer = null ;
if(!Yii::$app->user->isGuest && Yii::$app->user->identity->id_producer > 0) {
$producer = Producer::searchOne(['id' => Yii::$app->user->identity->id_producer]) ;
}

?>
<?php $this->beginPage() ?>
<!DOCTYPE html>
@@ -112,6 +117,21 @@ $isHome = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action-
'active' => $this->getControllerAction() == 'site/producers',
'options' => ['id' => 'li-producteurs']
],
[
'label' => '<span class="glyphicon glyphicon-flag"></span> '.($producer ? Html::encode($producer->name) : ''),
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-th-large"></span> Mon espace',
'url' => Yii::$app->urlManagerProducer->createAbsoluteUrl(['site/index', 'slug_producer' => $producer ? $producer->slug : '']),
],
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => Yii::$app->urlManagerBackend->createAbsoluteUrl(['site/index']),
]
],
'visible' => !Yii::$app->user->isGuest && $producer
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => Yii::$app->urlManager->createUrl(['site/login']),
@@ -130,7 +150,7 @@ $isHome = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action-
'url' => '#',
'items' => [
[
'label' => 'Profil',
'label' => '<span class="glyphicon glyphicon-user"></span> Profil',
'url' => Yii::$app->urlManager->createUrl(['user/update']),
],
[
@@ -157,15 +177,14 @@ $isHome = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action-
->where([
'user_producer.id_user' => User::getCurrentId(),
'user_producer.bookmark' => 1,
'producer.active' => 1
])
->all() ;
?>
<?php if(count($producersArray)): ?>
<h2>Mes producteurs</h2>
<?php foreach($producersArray as $producer): ?>
<div class="col-md-<?php if(count($producersArray) == 1): ?>6<?php elseif(count($producersArray) == 2): ?>6<?php else: ?>3<?php endif; ?>">
<div class="producer" style="background-image:url('<?= Yii::$app->urlManagerProducer->getHostInfo().'/'.Yii::$app->urlManagerProducer->baseUrl ; ?>/uploads/<?= $producer->photo ?>');">
<div class="col-xs-6 col-md-<?php if(count($producersArray) == 1): ?>6<?php elseif(count($producersArray) == 2): ?>6<?php else: ?>3<?php endif; ?>">
<div class="producer<?= !strlen($producer->photo) ? ' logo-distrib-default' : '' ?>" style="background-image:url('<?= strlen($producer->photo) ? Yii::$app->urlManagerProducer->getHostInfo().'/'.Yii::$app->urlManagerProducer->baseUrl.'/uploads/'.$producer->photo : Yii::$app->urlManagerFrontend->getHostInfo().'/'.Yii::$app->urlManagerFrontend->baseUrl.'/img/logo-distrib-gray.png' ?>">
<a class="btn btn-primary" href="<?= Yii::$app->urlManagerProducer->createAbsoluteUrl(['site/index','slug_producer' => $producer->slug]); ?>"><?= Html::encode($producer->name); ?></a>
</div>
</div>
@@ -203,7 +222,7 @@ $isHome = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action-
<a href="<?php echo Yii::$app->urlManager->createUrl('site/contact') ; ?>">Contact</a> &bull;
<a href="<?php echo Yii::$app->urlManager->createUrl('site/mentions') ; ?>">Mentions légales</a> &bull;
<a href="<?php echo Yii::$app->urlManager->createUrl('site/cgv') ; ?>">CGS</a> &bull;
<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>
<a id="code-source" href="https://framagit.org/guillaume-bourgeois/distrib">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>
</div>
</footer>

+ 4
- 2
frontend/views/site/index.php 查看文件

@@ -57,7 +57,7 @@ $this->setPageTitle('Plateforme de réservation de pain') ;
<div id="presentation">
<div id="row-presentation-distrib">
<h2>
Un outil web de gestion de commandes pour les producteurs en vente directe.
<span>Un outil web de gestion de commandes pour les producteurs en vente directe.</span>
</h2>
</div>
<div class="row" id="row-users-producers">
@@ -82,7 +82,9 @@ $this->setPageTitle('Plateforme de réservation de pain') ;
</ul>
</div>
<a class="btn btn-primary" href="<?= Yii::$app->urlManagerFrontend->createUrl(['site/signup']) ; ?>"><span class="glyphicon glyphicon-user"></span> Je crée mon compte</a>
<?php if(Yii::$app->user->isGuest): ?>
<a class="btn btn-primary" href="<?= Yii::$app->urlManagerFrontend->createUrl(['site/signup']) ; ?>"><span class="glyphicon glyphicon-user"></span> Je crée mon compte</a>
<?php endif; ?>
</div>
<div class="col-md-6" id="users">
<h2>

+ 1
- 1
frontend/views/site/producer_code.php 查看文件

@@ -45,7 +45,7 @@ $this->title = 'Producteur '.Html::encode($producer->name) ;
<h1 class="title-system-order"><?= Html::encode($producer->name) ?></h1>
<p class="info"><span class="alert alert-warning">Ce producteur est protègé par un code d'accès.</span></p>
<?php $form = ActiveForm::begin(['id' => 'producer-code','enableClientValidation'=> false]); ?>
<?= $form->field($modelProducerCode, 'code',[
<?= $form->field($producerCodeForm, 'code',[
'inputTemplate' => '<div class="input-group"><span class="input-group-addon"><span class="glyphicon glyphicon-lock"></span></span>{input}</div>',
])
->label('Code du producteur')

+ 1
- 1
frontend/views/site/producers.php 查看文件

@@ -40,7 +40,7 @@ $this->setTitle('Producteurs') ;

?>

<h1 class="title-system-order"><span class="glyphicon glyphicon-grain"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
<h1 class="title-system-order"><span class="glyphicon glyphicon-search"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>

<?=


+ 143
- 140
frontend/web/css/screen.css 查看文件

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

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

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

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

/* line 352, ../sass/screen.scss */
/* line 350, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
padding-top: 35px;
padding-bottom: 50px;
}
/* line 358, ../sass/screen.scss */
/* line 356, ../sass/screen.scss */
#content h1#title-site, #content h1 {
font-family: "highvoltageregular";
font-size: 35px;
}
/* line 363, ../sass/screen.scss */
/* line 361, ../sass/screen.scss */
#content h2 {
color: #323232;
padding-bottom: 15px;
@@ -385,17 +381,17 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 374, ../sass/screen.scss */
/* line 372, ../sass/screen.scss */
#content h3 {
font-family: "highvoltageregular";
font-size: 20px;
color: #323232;
}
/* line 381, ../sass/screen.scss */
/* line 379, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 386, ../sass/screen.scss */
/* line 384, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -404,123 +400,123 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 393, ../sass/screen.scss */
/* line 391, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
padding-top: 40px;
}
/* line 398, ../sass/screen.scss */
/* line 396, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 10px 20px;
font-size: 20px;
text-transform: uppercase;
}
/* line 404, ../sass/screen.scss */
/* line 402, ../sass/screen.scss */
#content #row-signup a.btn-primary {
margin-right: 15px;
}
/* line 409, ../sass/screen.scss */
/* line 407, ../sass/screen.scss */
#content #row-presentation-distrib {
border-bottom: solid 1px #e0e0e0;
}
/* line 412, ../sass/screen.scss */
/* line 410, ../sass/screen.scss */
#content #row-presentation-distrib h2 {
font-family: "capsuularegular";
text-align: center;
margin-top: 0px;
text-transform: none;
}
/* line 420, ../sass/screen.scss */
/* line 418, ../sass/screen.scss */
#content #row-users-producers {
margin-bottom: 50px;
padding-top: 30px;
}
/* line 424, ../sass/screen.scss */
/* line 422, ../sass/screen.scss */
#content #row-users-producers h2 {
text-align: left;
margin-bottom: 10px;
margin-top: 0px;
}
/* line 428, ../sass/screen.scss */
/* line 426, ../sass/screen.scss */
#content #row-users-producers h2 .img {
height: 35px;
}
/* line 431, ../sass/screen.scss */
/* line 429, ../sass/screen.scss */
#content #row-users-producers h2 span {
margin-left: 10px;
font-size: 25px;
position: relative;
top: 5px;
}
/* line 439, ../sass/screen.scss */
/* line 437, ../sass/screen.scss */
#content #row-users-producers h3 {
margin-top: 0px;
}
/* line 443, ../sass/screen.scss */
/* line 441, ../sass/screen.scss */
#content #row-users-producers p.presentation {
font-family: "capsuularegular";
color: black;
font-size: 20px;
line-height: 26px;
}
/* line 450, ../sass/screen.scss */
/* line 448, ../sass/screen.scss */
#content #row-users-producers ul {
text-align: left;
}
/* line 452, ../sass/screen.scss */
/* line 450, ../sass/screen.scss */
#content #row-users-producers ul li {
color: #FF7F00;
}
/* line 457, ../sass/screen.scss */
/* line 455, ../sass/screen.scss */
#content #row-users-producers p {
padding-bottom: 4px;
}
/* line 461, ../sass/screen.scss */
/* line 459, ../sass/screen.scss */
#content #row-users-producers .btn-primary {
margin-top: 20px;
}
/* line 468, ../sass/screen.scss */
/* line 466, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}

/* line 478, ../sass/screen.scss */
/* line 476, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 482, ../sass/screen.scss */
/* line 480, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 488, ../sass/screen.scss */
/* line 486, ../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 493, ../sass/screen.scss */
/* line 491, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 497, ../sass/screen.scss */
/* line 495, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 500, ../sass/screen.scss */
/* line 498, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 507, ../sass/screen.scss */
/* line 505, ../sass/screen.scss */
#bookmarked-producers {
padding: 0px;
padding-top: 20px;
margin: 0px;
border-bottom: solid 1px #e0e0e0;
}
/* line 513, ../sass/screen.scss */
/* line 511, ../sass/screen.scss */
#bookmarked-producers h2 {
font-family: "highvoltageregular";
color: #323232;
@@ -531,23 +527,23 @@ ul li {
margin-left: 15px;
margin-bottom: 15px;
}
/* line 524, ../sass/screen.scss */
/* line 522, ../sass/screen.scss */
#bookmarked-producers .col-md-12, #bookmarked-producers .col-md-6, #bookmarked-producers .col-md-3 {
float: left;
}
/* line 528, ../sass/screen.scss */
/* line 526, ../sass/screen.scss */
#bookmarked-producers .col-md-12 .producer {
background-size: 920px auto;
}
/* line 531, ../sass/screen.scss */
/* line 529, ../sass/screen.scss */
#bookmarked-producers .col-md-6 .producer {
background-size: 460px auto;
}
/* line 535, ../sass/screen.scss */
/* line 533, ../sass/screen.scss */
#bookmarked-producers .col-md-3 .producer {
background-size: 230px auto;
}
/* line 539, ../sass/screen.scss */
/* line 537, ../sass/screen.scss */
#bookmarked-producers .producer {
position: relative;
height: 100px;
@@ -560,7 +556,12 @@ ul li {
border: solid 1px #e0e0e0;
background-color: white;
}
/* line 551, ../sass/screen.scss */
/* line 549, ../sass/screen.scss */
#bookmarked-producers .producer.logo-distrib-default {
background-size: auto 70px;
background-position: center 0px;
}
/* line 554, ../sass/screen.scss */
#bookmarked-producers .producer a {
position: absolute;
bottom: 0px;
@@ -573,28 +574,28 @@ ul li {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 561, ../sass/screen.scss */
/* line 564, ../sass/screen.scss */
#bookmarked-producers .producer a:hover {
background-color: #f57a00;
}
/* line 567, ../sass/screen.scss */
/* line 570, ../sass/screen.scss */
#bookmarked-producers #discover {
padding-bottom: 20px;
text-align: center;
}
/* line 571, ../sass/screen.scss */
/* line 574, ../sass/screen.scss */
#bookmarked-producers #discover p {
padding-bottom: 0px;
color: white;
}
/* line 576, ../sass/screen.scss */
/* line 579, ../sass/screen.scss */
#bookmarked-producers #discover .btn {
background-color: white;
color: #FF7F00;
border: solid 1px white;
}

/* line 585, ../sass/screen.scss */
/* line 588, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -605,45 +606,43 @@ ul li {
background-color: white;
border-top: solid 1px #e0e0e0;
}
/* line 595, ../sass/screen.scss */
/* line 598, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
color: #323232;
text-transform: uppercase;
color: black;
font-family: "capsuularegular";
font-size: 18px;
text-decoration: none;
padding-left: 10px;
padding-right: 10px;
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 605, ../sass/screen.scss */
/* line 607, ../sass/screen.scss */
#footer a:hover {
color: gray;
text-decoration: underline;
}
/* line 609, ../sass/screen.scss */
/* line 611, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}
/* line 615, ../sass/screen.scss */
/* line 617, ../sass/screen.scss */
#footer #code-source img {
height: 20px;
}

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

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

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

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

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

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

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

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

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

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

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

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

/* line 966, ../sass/screen.scss */
/* line 970, ../sass/screen.scss */
.site-contact .col-lg-5 {
margin: 0px auto;
float: none;
@@ -1744,42 +1745,44 @@ termes.
}
/* line 85, ../sass/_responsive.scss */
#header nav ul {
position: relative;
display: block;
float: none;
margin: 0px none;
border: 0px none;
}
/* line 91, ../sass/_responsive.scss */
/* line 92, ../sass/_responsive.scss */
#header nav ul li {
display: block;
float: none;
}
/* line 94, ../sass/_responsive.scss */
/* line 95, ../sass/_responsive.scss */
#header nav ul li a {
display: block;
padding: 10px;
}
/* line 101, ../sass/_responsive.scss */
/* line 103, ../sass/_responsive.scss */
#header nav ul li#logo {
display: block;
}
/* line 108, ../sass/_responsive.scss */
/* line 110, ../sass/_responsive.scss */
#header a#link-commander {
display: none;
}

/* line 113, ../sass/_responsive.scss */
/* line 115, ../sass/_responsive.scss */
#content #points-sale .content {
padding-left: 10px;
margin-top: 30px;
}

/* line 118, ../sass/_responsive.scss */
/* line 120, ../sass/_responsive.scss */
#menu-user {
position: relative;
top: 0px;
}

/* line 123, ../sass/_responsive.scss */
/* line 125, ../sass/_responsive.scss */
.connected #content {
padding-top: 0px;
}

二进制
frontend/web/img/logo-distrib-gray.png 查看文件

之前 之后
宽度: 400  |  高度: 400  |  大小: 6.3KB

+ 2
- 0
frontend/web/sass/_responsive.scss 查看文件

@@ -83,6 +83,7 @@ termes.
nav {
width: 100% ;
ul {
position: relative ;
display: block ;
float: none ;
margin: 0px none ;
@@ -93,6 +94,7 @@ termes.
float: none ;
a {
display: block ;
padding: 10px ;
}
}
}

+ 14
- 10
frontend/web/sass/screen.scss 查看文件

@@ -165,8 +165,6 @@ ul {

#content {
border-right: solid 1px #e0e0e0 ;
#the-content {
padding-top: 100px ;
padding-left: 30px ;
@@ -548,6 +546,11 @@ ul {
border: solid 1px #e0e0e0 ;
background-color: white ;

&.logo-distrib-default {
background-size: auto 70px;
background-position: center 0px ;
}
a {
position: absolute ;
bottom: 0px ;
@@ -593,17 +596,16 @@ ul {
border-top: solid 1px #e0e0e0 ;
a {
color: #7e7e7e;
color: white ;
color: $courant ;
text-transform: uppercase ;
color: black ;
font-family: 'capsuularegular' ;
font-size: 18px ;
text-decoration: none ;
padding-left: 10px ;
padding-right: 10px ;
border-right: solid 1px #7e7e7e ;
border-right: solid 1px white ;
&:hover {
color: gray ;
text-decoration: underline ;
}

&:last-child {
@@ -686,10 +688,13 @@ ul {

/* login */

$max-width-form: 500px ;

.site-login {
.col-lg-5 {
margin: 0px auto ;
float: none ;
max-width: $max-width-form ;
}
}

@@ -703,9 +708,8 @@ ul {
.col-lg-5 {
margin: 0px auto ;
float: none ;
max-width: $max-width-form ;
}
}

#modal-cgv {

撰写 预览
正在加载...
取消
保存