Laclic
/
Souke
ウォッチ 5
スター 0
フォーク 1
コード 課題 1 プルリクエスト 0 リリース 0 Wiki アクティビティ
ソースを参照

Amélioration navigation

feature/souke
Guillaume Bourgeois 1年前
親
1534cdcf41
コミット
0550ab557a
11個のファイルの変更、643行の追加、535行の削除
分割表示 差分情報を表示
  1. +1
    -1
      backend/views/layouts/header.php
  2. +50
    -86
      backend/web/css/screen.css
  3. +2
    -36
      backend/web/sass/_adminlte.scss
  4. +47
    -5
      common/web/css/screen.css
  5. +41
    -0
      common/web/sass/_common.scss
  6. +12
    -3
      frontend/views/layouts/main.php
  7. +145
    -146
      frontend/web/css/screen.css
  8. +0
    -1
      frontend/web/sass/screen.scss
  9. +264
    -187
      producer/views/layouts/main.php
  10. +75
    -70
      producer/web/css/screen.css
  11. +6
    -0
      producer/web/sass/_layout.scss

+ 1
- 1
backend/views/layouts/header.php ファイルの表示

@@ -63,7 +63,7 @@ $producer = GlobalParam::getCurrentProducer();
<span class="sr-only">Toggle navigation</span>
</a>

<span class="producer<?php if(!$producer->logo): ?> without-logo<?php endif; ?>">
<span class="producer-panel<?php if(!$producer->logo): ?> without-logo<?php endif; ?>">
<?php if($producer->logo): ?>
<span class="logo">
<img class="img-logo"

+ 50
- 86
backend/web/css/screen.css ファイルの表示

@@ -1546,179 +1546,143 @@ body.skin-black .main-header .navbar {
background-color: white;
}
/* line 29, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer {
float: left;
padding: 15px;
padding-left: 57px;
}
/* line 34, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer.without-logo {
padding-left: 10px;
}
/* line 38, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer .logo {
position: absolute;
top: 5px;
left: 50px;
background-color: white;
width: 40px;
height: 40px;
-moz-border-radius: 50px;
-webkit-border-radius: 50px;
border-radius: 50px;
border: solid 1px #e0e0e0;
text-align: center;
overflow: hidden;
}
/* line 50, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer .logo .img-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 35px;
max-height: 35px;
body.skin-black .main-header .navbar .producer-panel {
margin-left: 7px;
}
/* line 60, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .producer .title {
position: relative;
top: 2px;
text-transform: uppercase;
}
/* line 67, ../sass/_adminlte.scss */
/* line 33, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .sidebar-toggle {
color: #333;
}
/* line 71, ../sass/_adminlte.scss */
/* line 37, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .navbar-custom-menu .navbar-nav > li > a,
body.skin-black .main-header .navbar .navbar-right > li > a {
border-left: solid 1px #e0e0e0;
color: #333;
}
/* line 77, ../sass/_adminlte.scss */
/* line 43, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav > li > a:hover, body.skin-black .main-header .navbar .nav > li > a:active, body.skin-black .main-header .navbar .nav > li > a:focus,
body.skin-black .main-header .navbar .nav .open > a, body.skin-black .main-header .navbar .nav .open > a:hover, body.skin-black .main-header .navbar .nav .open > a:focus,
body.skin-black .main-header .navbar .nav > .active > a {
color: #FF7F00;
}
/* line 83, ../sass/_adminlte.scss */
/* line 49, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .dropdown-menu {
-moz-box-shadow: 0px 0px 4px gray;
-webkit-box-shadow: 0px 0px 4px gray;
box-shadow: 0px 0px 4px gray;
}
/* line 88, ../sass/_adminlte.scss */
/* line 54, ../sass/_adminlte.scss */
body.skin-black .main-header .logo, body.skin-black .main-header .navbar .sidebar-toggle {
border-right: solid 1px #e0e0e0;
}
/* line 92, ../sass/_adminlte.scss */
/* line 58, ../sass/_adminlte.scss */
body.skin-black .main-header .link-control-sidebar {
display: none;
}
/* line 97, ../sass/_adminlte.scss */
/* line 63, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu {
max-height: 300px;
}
/* line 100, ../sass/_adminlte.scss */
/* line 66, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a {
padding-top: 4px;
padding-bottom: 4px;
}
/* line 104, ../sass/_adminlte.scss */
/* line 70, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a h5 {
margin-bottom: 2px;
}
/* line 107, ../sass/_adminlte.scss */
/* line 73, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a h5 small {
float: right;
}
/* line 112, ../sass/_adminlte.scss */
/* line 78, ../sass/_adminlte.scss */
body.skin-black .main-header .notifications-menu ul.menu li a p {
margin-left: 10px;
}
/* line 122, ../sass/_adminlte.scss */
/* line 88, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .label {
position: relative;
top: -2px;
left: 0px;
}
/* line 128, ../sass/_adminlte.scss */
/* line 94, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu #link-display-producers-offline {
color: #FF7F00;
}
/* line 132, ../sass/_adminlte.scss */
/* line 98, ../sass/_adminlte.scss */
body.skin-black .main-header .navbar .nav li.producer-menu .offline {
display: none;
}
/* line 138, ../sass/_adminlte.scss */
/* line 104, ../sass/_adminlte.scss */
body.skin-black .sidebar-menu > li.active > a {
border-color: #FF7F00;
}
/* line 143, ../sass/_adminlte.scss */
/* line 109, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel {
text-align: center;
}
/* line 146, ../sass/_adminlte.scss */
/* line 112, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel .image {
margin-bottom: 3px;
}
/* line 150, ../sass/_adminlte.scss */
/* line 116, ../sass/_adminlte.scss */
body.skin-black section.sidebar .user-panel .title {
font-weight: bold;
color: white;
}
/* line 157, ../sass/_adminlte.scss */
/* line 123, ../sass/_adminlte.scss */
body.skin-black .content-wrapper {
background-color: #f5f5f5;
}
/* line 160, ../sass/_adminlte.scss */
/* line 126, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header {
background-color: #F5F5F5;
padding-bottom: 15px;
border-bottom: solid 1px #e0e0e0;
border-top: solid 1px #e0e0e0;
}
/* line 166, ../sass/_adminlte.scss */
/* line 132, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header .btn {
padding: 3px 6px;
font-size: 10px;
font-family: Arial;
text-transform: uppercase;
}
/* line 173, ../sass/_adminlte.scss */
/* line 139, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .content-header h1 {
font-family: 'myriadpro-light';
font-size: 20px;
}
/* line 178, ../sass/_adminlte.scss */
/* line 144, ../sass/_adminlte.scss */
body.skin-black .content-wrapper a {
color: #FF7F00;
}
/* line 182, ../sass/_adminlte.scss */
/* line 148, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn {
color: white;
}
/* line 186, ../sass/_adminlte.scss */
/* line 152, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn-default {
color: #333;
background-color: white;
}
/* line 191, ../sass/_adminlte.scss */
/* line 157, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .btn-primary {
background-color: #FF7F00;
color: white;
border-color: #FF7F00;
}
/* line 198, ../sass/_adminlte.scss */
/* line 164, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert a {
color: white;
}
/* line 201, ../sass/_adminlte.scss */
/* line 167, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert a.btn {
color: #333;
text-decoration: none;
}
/* line 206, ../sass/_adminlte.scss */
/* line 172, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert .close {
font-size: 30px;
position: relative;
@@ -1727,89 +1691,89 @@ body.skin-black .content-wrapper .alert .close {
color: white;
opacity: 0.6;
}
/* line 214, ../sass/_adminlte.scss */
/* line 180, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .alert .close:hover {
opacity: 1;
}
/* line 221, ../sass/_adminlte.scss */
/* line 187, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout h4 .fa {
margin-right: 7px;
}
/* line 224, ../sass/_adminlte.scss */
/* line 190, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout a {
color: white;
}
/* line 227, ../sass/_adminlte.scss */
/* line 193, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .callout .btn {
color: #333;
text-decoration: none;
}
/* line 234, ../sass/_adminlte.scss */
/* line 200, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table th {
font-size: 13px;
}
/* line 237, ../sass/_adminlte.scss */
/* line 203, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table th.column-actions, body.skin-black .content-wrapper .table td.column-actions {
width: 150px;
text-align: right;
}
/* line 241, ../sass/_adminlte.scss */
/* line 207, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .table td.text-small, body.skin-black .content-wrapper .table th.text-small {
font-size: 12px;
}
/* line 246, ../sass/_adminlte.scss */
/* line 212, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > .active > a, body.skin-black .content-wrapper .pagination > .active > span, body.skin-black .content-wrapper .pagination > .active > a:hover, body.skin-black .content-wrapper .pagination > .active > span:hover, body.skin-black .content-wrapper .pagination > .active > a:focus, body.skin-black .content-wrapper .pagination > .active > span:focus {
background-color: #FF7F00;
border: solid 1px #FF7F00;
color: white;
}
/* line 251, ../sass/_adminlte.scss */
/* line 217, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > li > a, body.skin-black .content-wrapper .pagination > li > span {
color: #FF7F00;
}
/* line 253, ../sass/_adminlte.scss */
/* line 219, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .pagination > li > a:hover, body.skin-black .content-wrapper .pagination > li > span:hover {
color: #cc6600;
}
/* line 258, ../sass/_adminlte.scss */
/* line 224, ../sass/_adminlte.scss */
body.skin-black .content-wrapper .submenu {
margin-bottom: 25px;
}
/* line 264, ../sass/_adminlte.scss */
/* line 230, ../sass/_adminlte.scss */
body.skin-black .main-footer a {
color: #FF7F00;
}

/* line 270, ../sass/_adminlte.scss */
/* line 236, ../sass/_adminlte.scss */
body.login-page {
background: none;
background-color: white;
}
/* line 274, ../sass/_adminlte.scss */
/* line 240, ../sass/_adminlte.scss */
body.login-page .login-box .login-logo {
text-align: center;
font-family: "comfortaalight";
}
/* line 277, ../sass/_adminlte.scss */
/* line 243, ../sass/_adminlte.scss */
body.login-page .login-box .login-logo img {
width: 50px;
}
/* line 282, ../sass/_adminlte.scss */
/* line 248, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body .btn-primary {
background-color: #FF7F00;
border-color: #FF7F00;
padding: 5px 10px;
}
/* line 287, ../sass/_adminlte.scss */
/* line 253, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body .btn-primary:active {
background-color: #ff8c1a;
border-color: #FF7F00;
}
/* line 293, ../sass/_adminlte.scss */
/* line 259, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body a {
color: #FF7F00;
}
/* line 295, ../sass/_adminlte.scss */
/* line 261, ../sass/_adminlte.scss */
body.login-page .login-box .login-box-body a:hover {
color: #ff8c1a;
}

+ 2
- 36
backend/web/sass/_adminlte.scss ファイルの表示

@@ -26,42 +26,8 @@ body.skin-black {
.navbar {
background-color: white ;

.producer {
float: left;
padding: 15px;
padding-left: 57px;

&.without-logo {
padding-left: 10px;
}

.logo {
position: absolute;
top: 5px;
left: 50px;
background-color: white;
width: 40px;
height: 40px;
@include border-radius(50px);
border: solid 1px #e0e0e0;
text-align: center;
overflow: hidden;

.img-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 35px;
max-height: 35px;
}
}

.title {
position: relative;
top: 2px;
text-transform: uppercase;
}
.producer-panel {
margin-left: 7px;
}

.sidebar-toggle {

+ 47
- 5
common/web/css/screen.css ファイルの表示

@@ -83,26 +83,68 @@ termes.
font-weight: normal;
font-style: normal;
}
/* line 2, ../sass/_common.scss */
/* line 4, ../sass/_common.scss */
.producer-panel {
position: relative;
float: left;
padding: 15px;
padding-left: 50px;
}
/* line 10, ../sass/_common.scss */
.producer-panel.without-logo {
padding-left: 10px;
}
/* line 14, ../sass/_common.scss */
.producer-panel .logo {
position: absolute;
top: 5px;
left: 0px;
background-color: white;
width: 40px;
height: 40px;
-moz-border-radius: 50px;
-webkit-border-radius: 50px;
border-radius: 50px;
border: solid 1px #e0e0e0;
text-align: center;
overflow: hidden;
}
/* line 26, ../sass/_common.scss */
.producer-panel .logo .img-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 35px;
max-height: 35px;
}
/* line 36, ../sass/_common.scss */
.producer-panel .title {
position: relative;
top: 2px;
text-transform: uppercase;
}

/* line 43, ../sass/_common.scss */
.block-date {
margin: 0px auto;
padding-top: 0px;
text-align: center;
}
/* line 7, ../sass/_common.scss */
/* line 48, ../sass/_common.scss */
.block-date .day {
text-transform: capitalize;
line-height: 15px;
font-size: 13px;
text-transform: uppercase;
}
/* line 14, ../sass/_common.scss */
/* line 55, ../sass/_common.scss */
.block-date .num {
font-size: 30px;
line-height: 35px;
font-weight: bold;
}
/* line 20, ../sass/_common.scss */
/* line 61, ../sass/_common.scss */
.block-date .month {
text-transform: uppercase;
line-height: 15px;
@@ -110,7 +152,7 @@ termes.
color: #e67200;
}

/* line 32, ../sass/_common.scss */
/* line 73, ../sass/_common.scss */
#footer #code-source img,
#footer #social-mastodon img,
#footer #social-diaspora img {

+ 41
- 0
common/web/sass/_common.scss ファイルの表示

@@ -1,4 +1,45 @@

@import "compass";

.producer-panel {
position: relative;
float: left;
padding: 15px;
padding-left: 50px;

&.without-logo {
padding-left: 10px;
}

.logo {
position: absolute;
top: 5px;
left: 0px;
background-color: white;
width: 40px;
height: 40px;
@include border-radius(50px);
border: solid 1px #e0e0e0;
text-align: center;
overflow: hidden;

.img-logo {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
max-width: 35px;
max-height: 35px;
}
}

.title {
position: relative;
top: 2px;
text-transform: uppercase;
}
}

.block-date {
margin: 0px auto ;
padding-top: 0px ;

+ 12
- 3
frontend/views/layouts/main.php ファイルの表示

@@ -82,11 +82,20 @@ if ($userManager->isCurrentProducer()) {
<div id="back"></div>

<section id="section-user-top">
<nav class="navbar navbar-inverse">
<nav class="navbar navbar-default">
<div class="container">
<?php if($userManager->isCurrentProducer()): ?>
<?php if ($userManager->isCurrentProducer()): ?>
<div class="navbar-header">
<span class="navbar-brand" href="javascript:void(0);"><?= Html::encode($producer->name); ?></span>
<span class="producer-panel<?php if (!$producer->logo): ?> without-logo<?php endif; ?>">
<?php if ($producer->logo): ?>
<span class="logo">
<img class="img-logo"
src="<?= \Yii::$app->urlManagerProducer->baseUrl; ?>/uploads/<?= $producer->logo; ?>"
alt="Logo <?= Html::encode($producer->name) ?>"/>
</span>
<?php endif; ?>
<span class="title"><?= Html::encode($producer->name); ?></span>
</span>
</div>
<?php endif; ?>


+ 145
- 146
frontend/web/css/screen.css
ファイル差分が大きすぎるため省略します
ファイルの表示


+ 0
- 1
frontend/web/sass/screen.scss ファイルの表示

@@ -103,7 +103,6 @@ strong {

#section-user-top {
.navbar {
background-color: #333;
margin-bottom: 0px;
@include border-radius(0px none);
}

+ 264
- 187
producer/views/layouts/main.php ファイルの表示

@@ -37,6 +37,8 @@
*/

use common\logic\Order\Order\Model\Order;
use common\logic\Producer\Producer\Wrapper\ProducerManager;
use common\logic\User\User\Wrapper\UserManager;
use common\logic\User\UserProducer\Model\UserProducer;
use yii\bootstrap\Nav;
use common\helpers\GlobalParam;
@@ -45,10 +47,16 @@ use yii\helpers\Html;
\common\assets\CommonAsset::register($this);
\producer\assets\AppAsset::register($this);

$userManager = UserManager::getInstance();
$userCurrent = GlobalParam::getCurrentUser();
$producerManager = ProducerManager::getInstance();
$producerUser = null;
if($userManager->isCurrentProducer()) {
$producerUser = $producerManager->findOneProducerById($userCurrent->id_producer);
}
$producer = $this->context->getProducerCurrent();
if (!Yii::$app->user->isGuest) {
$userProducer = UserProducer::findOne(['id_user' => GlobalParam::getCurrentUserId(), 'id_producer' => $producer->id]);
$userProducer = UserProducer::findOne(['id_user' => GlobalParam::getCurrentUserId(), 'id_producer' => $producer->id]);
}

?>
@@ -61,195 +69,264 @@ if (!Yii::$app->user->isGuest) {
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="base-url" content="<?= \Yii::$app->urlManager->baseUrl; ?>">
<meta name="slug-producer" content="<?= $producer->slug; ?>">
<?= Html::csrfMetaTags() ?>
<?= Html::csrfMetaTags() ?>
<link rel="icon" type="image/png"
href="<?php echo \Yii::$app->urlManager->getBaseUrl(); ?>/img/favicon-distrib.png"/>
<?php $this->head() ?>
<?php $this->head() ?>
<?= $this->render('@common/views/matomo.php') ?>
</head>
<body class="<?= \Yii::$app->controller->id . '-' . \Yii::$app->controller->action->id ?>">
<?php $this->beginBody() ?>

<div id="header-bap">
<?php
echo Nav::widget([
<section id="section-user-top">
<nav class="navbar navbar-default">
<div class="container">
<?php if ($userManager->isCurrentProducer()): ?>
<div class="navbar-header">
<span class="producer-panel<?php if (!$producerUser->logo): ?> without-logo<?php endif; ?>">
<?php if ($producerUser->logo): ?>
<span class="logo">
<img class="img-logo"
src="<?= \Yii::$app->urlManagerProducer->baseUrl; ?>/uploads/<?= $producerUser->logo; ?>"
alt="Logo <?= Html::encode($producerUser->name) ?>"/>
</span>
<?php endif; ?>
<span class="title"><?= Html::encode($producerUser->name); ?></span>
</span>
</div>
<?php endif; ?>

<?php
echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' => 'nav nav-pills navbar-nav navbar-right'],
'items' => [
[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-chevron-left"></span> Retour à l\'accueil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']),
'visible' => \Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-user"></span> Inscription',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/signup']),
'visible' => \Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/login', 'return_url' => \Yii::$app->urlManager->createAbsoluteUrl(['site/index'])]),
'visible' => \Yii::$app->user->isGuest
],
],
'visible' => \Yii::$app->user->isGuest
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => $this->getUrlManagerBackend()->createAbsoluteUrl(['site/index']),
'visible' => $userManager->isCurrentProducer()
],
/*[
'label' => '<span class="glyphicon glyphicon-search"></span> Producteurs',
'url' => $this->getUrlManagerFrontend()->createAbsoluteUrl(['site/producers']),
'visible' => true
],*/
[
'label' => '<span class="glyphicon glyphicon-user"></span> ' . ((!Yii::$app->user->isGuest) ? Html::encode(Yii::$app->user->identity->name . ' ' . strtoupper(substr(Yii::$app->user->identity->lastname, 0, 1))) : '') . '. ',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-user"></span> Profil',
'url' => $this->getUrlManagerFrontend()->createUrl(['user/update']),
],
[
'label' => '<span class="glyphicon glyphicon-off"></span> Déconnexion',
'url' => $this->getUrlManagerFrontend()->createUrl(['site/logout']),
]
],
'visible' => !Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => $this->getUrlManagerFrontend()->createUrl(['site/login']),
'visible' => \Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'site/login'
],
[
'label' => '<span class="glyphicon glyphicon-user"></span> Inscription',
'url' => $this->getUrlManagerFrontend()->createUrl(['site/signup']),
'visible' => \Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'site/signup'
],
]]);
?>
</div>
</nav>
</section>

[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-chevron-left"></span> Retour à l\'accueil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']),
],
[
'label' => '<span class="glyphicon glyphicon-user"></span> Profil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['user/update']),
],
[
'label' => '<span class="glyphicon glyphicon-off"></span> Déconnexion<br /><small>' . (!Yii::$app->user->isGuest ? Html::encode(Yii::$app->user->identity->name . ' ' . strtoupper(substr(Yii::$app->user->identity->lastname, 0, 1))) : '') . '.</small>',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/logout']),
]
],
'visible' => !Yii::$app->user->isGuest
],
<!--
<div id="header-bap">
<?php
echo Nav::widget([
'encodeLabels' => false,
'items' => [
[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-chevron-left"></span> Retour à l\'accueil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']),
'visible' => \Yii::$app->user->isGuest
],
'options' => ['id' => 'nav-bap'],
]);
?>
[
'label' => '<span class="glyphicon glyphicon-user"></span> Inscription',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/signup']),
'visible' => \Yii::$app->user->isGuest
],
[
'label' => '<span class="glyphicon glyphicon-log-in"></span> Connexion',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/login', 'return_url' => \Yii::$app->urlManager->createAbsoluteUrl(['site/index'])]),
'visible' => \Yii::$app->user->isGuest
],
],
'visible' => \Yii::$app->user->isGuest
],

[
'label' => '<span class="glyphicon glyphicon-menu-hamburger"></span>',
'options' => ['id' => 'label1'],
'url' => '#',
'items' => [
[
'label' => '<span class="glyphicon glyphicon-chevron-left"></span> Retour à l\'accueil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']),
],
[
'label' => '<span class="glyphicon glyphicon-user"></span> Profil',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['user/update']),
],
[
'label' => '<span class="glyphicon glyphicon-off"></span> Déconnexion<br /><small>' . (!Yii::$app->user->isGuest ? Html::encode(Yii::$app->user->identity->name . ' ' . strtoupper(substr(Yii::$app->user->identity->lastname, 0, 1))) : '') . '.</small>',
'url' => \Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/logout']),
]
],
'visible' => !Yii::$app->user->isGuest
],
],
'options' => ['id' => 'nav-bap'],
]);
?>
</div>
-->

<div class="container">
<div id="left" class="col-md-3">
<div class="fixed">
<?php if (strlen($producer->logo)): ?>
<div id="logo"<?php if (!is_null($producer->background_color_logo) && strlen($producer->background_color_logo)): ?> style="background-color:<?= Html::encode($producer->background_color_logo); ?>"<?php endif; ?>>
<a href="<?= \Yii::$app->urlManager->createUrl(['site/index']) ?>">
<img class="img-logo"
src="<?= \Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->logo; ?>"
alt="Logo <?= Html::encode($producer->name) ?>"/>
</a>
</div>
<?php endif; ?>
<?php if (strlen($producer->logo)): ?>
<div id="logo"<?php if (!is_null($producer->background_color_logo) && strlen($producer->background_color_logo)): ?> style="background-color:<?= Html::encode($producer->background_color_logo); ?>"<?php endif; ?>>
<a href="<?= \Yii::$app->urlManager->createUrl(['site/index']) ?>">
<img class="img-logo"
src="<?= \Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->logo; ?>"
alt="Logo <?= Html::encode($producer->name) ?>"/>
</a>
</div>
<?php endif; ?>
<h1><?= Html::encode($producer->name); ?></h1>
<h2><?= Html::encode($producer->type) ?> à <?= Html::encode($producer->city); ?>
(<?= Html::encode($producer->postcode); ?>)</h2>

<nav id="main-nav">
<?php
<?php

$credit = '';
if (isset($userProducer) && $userProducer) {
$labelType = $userProducer->credit > 0 ? 'success' : 'danger';
$credit = ' <span class="label label-' . $labelType . '">' . number_format($userProducer->credit, 2) . ' €</span>';
}
$credit = '';
if (isset($userProducer) && $userProducer) {
$labelType = $userProducer->credit > 0 ? 'success' : 'danger';
$credit = ' <span class="label label-' . $labelType . '">' . number_format($userProducer->credit, 2) . ' €</span>';
}

$countSubcriptions = 0;
if($userCurrent) {
$countSubcriptions = $this->getSubscriptionManager()->countSubscriptionsByUser(
$userCurrent
);
}
$countSubcriptions = 0;
if ($userCurrent) {
$countSubcriptions = $this->getSubscriptionManager()->countSubscriptionsByUser(
$userCurrent
);
}

$labelSubscription = $countSubcriptions > 0 ? 'success' : 'default';
$labelSubscription = $countSubcriptions > 0 ? 'success' : 'default';

$countOrders = Order::find()
->joinWith(['distribution'])
->where([
'id_user' => GlobalParam::getCurrentUserId(),
'distribution.id_producer' => GlobalParam::getCurrentProducerId()
])
->params([':date_today' => date('Y-m-d')])
->andWhere('distribution.date >= :date_today')
->count();
$labelOrders = $countOrders > 0 ? 'success' : 'default';
$countOrders = Order::find()
->joinWith(['distribution'])
->where([
'id_user' => GlobalParam::getCurrentUserId(),
'distribution.id_producer' => GlobalParam::getCurrentProducerId()
])
->params([':date_today' => date('Y-m-d')])
->andWhere('distribution.date >= :date_today')
->count();
$labelOrders = $countOrders > 0 ? 'success' : 'default';


echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' => 'nav'],
'items' => [
[
'label' => '<span class="glyphicon glyphicon-th-large"></span> Accueil',
'url' => $this->getUrlManagerProducer()->createUrl(['site/index']),
'active' => $this->getControllerAction() == 'site/index',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => $this->getUrlManagerProducer()->createUrl(['order/order']),
'visible' => $producer->option_allow_order_guest || !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => $this->getUrlManagerFrontend()->createAbsoluteUrl(['site/producer', 'id' => $this->context->getProducerCurrent()->id, 'return_url' => \Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order', 'slug_producer' => $this->context->getProducerCurrent()->slug])]),
'visible' => !$producer->option_allow_order_guest && \Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes <span class="label label-' . $labelOrders . '">' . $countOrders . '</span>',
'url' => $this->getUrlManagerProducer()->createUrl(['order/history']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/history',
],
[
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnements <span class="label label-' . $labelSubscription . '">' . $countSubcriptions . '</span>',
'url' => $this->getUrlManagerProducer()->createUrl(['subscription/index']),
'visible' => !Yii::$app->user->isGuest && $producer->user_manage_subscription,
'active' => $this->getControllerAction() == 'subscription/index',
],
[
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit' . $credit,
'url' => $this->getUrlManagerProducer()->createUrl(['credit/history']),
'visible' => !Yii::$app->user->isGuest && $producer->credit,
'active' => $this->getControllerAction() == 'credit/history',
],
[
'label' => '<span class="glyphicon glyphicon-envelope"></span> Contact',
'url' => $this->getUrlManagerProducer()->createUrl(['site/contact']),
'active' => $this->getControllerAction() == 'site/contact',
],
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => $this->getUrlManagerBackend()->createAbsoluteUrl(['site/index']),
'visible' => isset(Yii::$app->user->identity) && $this->getUserManager()->isProducer(\Yii::$app->user->identity),
'options' => ['id' => 'btn-administration']
],
],
]);
?>
echo Nav::widget([
'encodeLabels' => false,
'options' => ['class' => 'nav'],
'items' => [
[
'label' => '<span class="glyphicon glyphicon-th-large"></span> Accueil',
'url' => $this->getUrlManagerProducer()->createUrl(['site/index']),
'active' => $this->getControllerAction() == 'site/index',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => $this->getUrlManagerProducer()->createUrl(['order/order']),
'visible' => $producer->option_allow_order_guest || !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-plus"></span> Commander',
'url' => $this->getUrlManagerFrontend()->createAbsoluteUrl(['site/producer', 'id' => $this->context->getProducerCurrent()->id, 'return_url' => \Yii::$app->urlManagerProducer->createAbsoluteUrl(['order/order', 'slug_producer' => $this->context->getProducerCurrent()->slug])]),
'visible' => !$producer->option_allow_order_guest && \Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/order',
],
[
'label' => '<span class="glyphicon glyphicon-folder-open"></span> Mes commandes <span class="label label-' . $labelOrders . '">' . $countOrders . '</span>',
'url' => $this->getUrlManagerProducer()->createUrl(['order/history']),
'visible' => !Yii::$app->user->isGuest,
'active' => $this->getControllerAction() == 'order/history',
],
[
'label' => '<span class="glyphicon glyphicon-repeat"></span> Abonnements <span class="label label-' . $labelSubscription . '">' . $countSubcriptions . '</span>',
'url' => $this->getUrlManagerProducer()->createUrl(['subscription/index']),
'visible' => !Yii::$app->user->isGuest && $producer->user_manage_subscription,
'active' => $this->getControllerAction() == 'subscription/index',
],
[
'label' => '<span class="glyphicon glyphicon-euro"></span> Crédit' . $credit,
'url' => $this->getUrlManagerProducer()->createUrl(['credit/history']),
'visible' => !Yii::$app->user->isGuest && $producer->credit,
'active' => $this->getControllerAction() == 'credit/history',
],
[
'label' => '<span class="glyphicon glyphicon-envelope"></span> Contact',
'url' => $this->getUrlManagerProducer()->createUrl(['site/contact']),
'active' => $this->getControllerAction() == 'site/contact',
],
[
'label' => '<span class="glyphicon glyphicon-cog"></span> Administration',
'url' => $this->getUrlManagerBackend()->createAbsoluteUrl(['site/index']),
'visible' => isset(Yii::$app->user->identity) && $this->getUserManager()->isProducer(\Yii::$app->user->identity),
'options' => ['id' => 'btn-administration']
],
],
]);
?>
</nav>
</div>
</div>

<div id="main" class="col-md-9">
<?php if (strlen($producer->photo)): ?>
<div id="img-big">
<img class="img-photo" src="<?= \Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->photo; ?>"
alt="Photo <?= Html::encode($producer->name) ?>"/>
</div>
<?php endif; ?>
<?php if (strlen($producer->photo)): ?>
<div id="img-big">
<img class="img-photo" src="<?= \Yii::$app->urlManager->baseUrl; ?>/uploads/<?= $producer->photo; ?>"
alt="Photo <?= Html::encode($producer->name) ?>"/>
</div>
<?php endif; ?>
<div id="infos-producer">
<?php if(!$this->getProducerManager()->hasSpecificDelays($producer) && $producer->order_deadline && $producer->order_delay): ?>
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<?php if (!$this->getProducerManager()->hasSpecificDelays($producer) && $producer->order_deadline && $producer->order_delay): ?>
<span data-toggle="tooltip" data-placement="bottom" title="Heure limite de commande">
<span class="glyphicon glyphicon-time"></span> Commande avant
<strong><?php echo Html::encode($producer->order_deadline) ?> h</strong></span>,
<span data-toggle="tooltip" data-placement="bottom"
title="Exemple : commande le lundi pour le
<span data-toggle="tooltip" data-placement="bottom"
title="Exemple : commande le lundi pour le
<?php if ($producer->order_delay == 1): ?>mardi<?php elseif ($producer->order_delay == 2): ?>mercredi
<?php elseif ($producer->order_delay == 3): ?>jeudi<?php elseif ($producer->order_delay == 4): ?>vendredi
<?php elseif ($producer->order_delay == 5): ?>samedi<?php elseif ($producer->order_delay == 6): ?>dimanche
<?php elseif ($producer->order_delay == 7): ?>lundi d'après<?php endif; ?>"><strong><?= Html::encode($producer->order_delay) ?> jour<?php if ($producer->order_delay > 1): ?>s<?php endif; ?></strong> à l'avance</span>
<?php endif; ?>
<?php endif; ?>

<?php if (!Yii::$app->user->isGuest): ?>
<span class="favorite">
<?php if (!Yii::$app->user->isGuest): ?>
<span class="favorite">
<?php if ($userProducer && $userProducer->bookmark): ?>
<span class="glyphicon glyphicon-star"></span> <a
href="<?= \Yii::$app->urlManagerProducer->createUrl(['site/bookmarks', 'action' => 'delete']); ?>"
@@ -261,57 +338,57 @@ if (!Yii::$app->user->isGuest) {
title="Ajouter à mes favoris">Favoris</a>
<?php endif; ?>
</span>
<?php endif; ?>
<?php endif; ?>

<div class="clr"></div>
</div>

<?php if (strlen($this->getTitle())): ?>
<h2 id="page-title">
<?= $this->getTitle(); ?>
<?php
if ($this->buttons && count($this->buttons)): ?>
<span id="buttons">
<?php if (strlen($this->getTitle())): ?>
<h2 id="page-title">
<?= $this->getTitle(); ?>
<?php
if ($this->buttons && count($this->buttons)): ?>
<span id="buttons">
<?php foreach ($this->buttons as $button) {
echo '<a href="' . \Yii::$app->urlManagerProducer->createUrl($button['url']) . '" class="' . $button['class'] . '">' . $button['label'] . '</a>';
echo '<a href="' . \Yii::$app->urlManagerProducer->createUrl($button['url']) . '" class="' . $button['class'] . '">' . $button['label'] . '</a>';
}
?>
</span>
<?php endif; ?>
</h2>
<?php endif; ?>
<?php endif; ?>
</h2>
<?php endif; ?>

<section 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; ?>
<?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 ?>
<?= $content ?>
</section>

<?php if (strlen($producer->mentions) || strlen($producer->gcs)): ?>
<section id="footer-producer">
<?= Html::encode($producer->name) ?> :
<?php if (strlen($producer->mentions)): ?>
<a href="<?php echo \Yii::$app->urlManager->createUrl(['site/mentions']); ?>">Mentions
légales</a>
<?php endif; ?>
<?php if (strlen($producer->mentions) && strlen($producer->gcs)): ?>
&bull;
<?php endif; ?>
<?php if (strlen($producer->gcs)): ?>
<a href="<?php echo \Yii::$app->urlManager->createUrl(['site/gcs']); ?>">Conditions générales
de vente</a>
<?php endif; ?>
</section>
<?php endif; ?>
<?php if (strlen($producer->mentions) || strlen($producer->gcs)): ?>
<section id="footer-producer">
<?= Html::encode($producer->name) ?> :
<?php if (strlen($producer->mentions)): ?>
<a href="<?php echo \Yii::$app->urlManager->createUrl(['site/mentions']); ?>">Mentions
légales</a>
<?php endif; ?>
<?php if (strlen($producer->mentions) && strlen($producer->gcs)): ?>
&bull;
<?php endif; ?>
<?php if (strlen($producer->gcs)): ?>
<a href="<?php echo \Yii::$app->urlManager->createUrl(['site/gcs']); ?>">Conditions générales
de vente</a>
<?php endif; ?>
</section>
<?php endif; ?>
</div>
</div>


+ 75
- 70
producer/web/css/screen.css ファイルの表示

@@ -153,69 +153,74 @@ body {
z-index: 10;
}

/* line 67, ../sass/_layout.scss */
/* line 68, ../sass/_layout.scss */
#section-user-top .navbar-default {
background-color: white;
}

/* line 73, ../sass/_layout.scss */
#main {
position: relative;
}
/* line 69, ../sass/_layout.scss */
/* line 75, ../sass/_layout.scss */
#main .btn-primary {
background-color: #FF7F00;
border: solid 1px #FF7F00;
color: white;
}
/* line 74, ../sass/_layout.scss */
/* line 80, ../sass/_layout.scss */
#main .btn-primary:hover, #main .btn-primary:active, #main .btn-primary:focus {
background-color: #e67200;
border: solid 1px #FF7F00;
color: white;
}

/* line 83, ../sass/_layout.scss */
/* line 89, ../sass/_layout.scss */
.btn {
background-image: none;
}

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

/* line 95, ../sass/_layout.scss */
/* line 101, ../sass/_layout.scss */
.alert.alert-warning a {
color: #8a6d3b;
text-decoration: underline;
}
/* line 102, ../sass/_layout.scss */
/* line 108, ../sass/_layout.scss */
.alert.alert-danger a {
color: #a94442;
text-decoration: underline;
}

/* line 112, ../sass/_layout.scss */
/* line 118, ../sass/_layout.scss */
ul.pagination li.active a {
background-color: #FF7F00;
border: solid 1px #FF7F00;
}
/* line 116, ../sass/_layout.scss */
/* line 122, ../sass/_layout.scss */
ul.pagination li.active a:hover {
background-color: white;
border: solid 1px white;
color: #FF7F00;
}
/* line 123, ../sass/_layout.scss */
/* line 129, ../sass/_layout.scss */
ul.pagination li a {
color: #FF7F00;
}
/* line 126, ../sass/_layout.scss */
/* line 132, ../sass/_layout.scss */
ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
background-color: white;
border: solid 1px white;
color: #FF7F00;
}

/* line 135, ../sass/_layout.scss */
/* line 141, ../sass/_layout.scss */
#header-bap {
position: absolute;
right: 0px;
@@ -227,39 +232,39 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
z-index: 1000;
}
/* line 146, ../sass/_layout.scss */
/* line 152, ../sass/_layout.scss */
#header-bap .container {
padding-left: 0px;
padding-right: 0px;
}
/* line 151, ../sass/_layout.scss */
/* line 157, ../sass/_layout.scss */
#header-bap a#logo {
color: black;
text-decoration: none;
position: relative;
top: 3px;
}
/* line 157, ../sass/_layout.scss */
/* line 163, ../sass/_layout.scss */
#header-bap a#logo img {
width: 45px;
}
/* line 162, ../sass/_layout.scss */
/* line 168, ../sass/_layout.scss */
#header-bap ul#nav-bap {
float: right;
}
/* line 166, ../sass/_layout.scss */
/* line 172, ../sass/_layout.scss */
#header-bap ul#nav-bap li a {
color: black;
font-size: 15px;
color: #FF7F00;
}
/* line 171, ../sass/_layout.scss */
/* line 177, ../sass/_layout.scss */
#header-bap ul#nav-bap li a:hover, #header-bap ul#nav-bap li a:focus {
color: #333;
color: #FF7F00;
background: none;
}
/* line 178, ../sass/_layout.scss */
/* line 184, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul {
background-color: white;
border-top: solid 2px #FF7F00;
@@ -267,23 +272,23 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: 50px;
width: 200px;
}
/* line 186, ../sass/_layout.scss */
/* line 192, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a {
text-transform: uppercase;
font-size: 13px;
}
/* line 190, ../sass/_layout.scss */
/* line 196, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a:hover {
color: #ff9933;
}
/* line 194, ../sass/_layout.scss */
/* line 200, ../sass/_layout.scss */
#header-bap ul#nav-bap li ul li a small {
font-size: 10px;
line-height: 13px;
margin-left: 18px;
}

/* line 206, ../sass/_layout.scss */
/* line 212, ../sass/_layout.scss */
#left {
background-color: #FFF8DC;
text-align: center;
@@ -291,12 +296,12 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding: 0px;
position: relative;
}
/* line 213, ../sass/_layout.scss */
/* line 219, ../sass/_layout.scss */
#left .fixed {
position: fixed;
display: none;
}
/* line 219, ../sass/_layout.scss */
/* line 225, ../sass/_layout.scss */
#left #logo {
position: relative;
background-color: white;
@@ -311,7 +316,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
overflow: hidden;
}
/* line 231, ../sass/_layout.scss */
/* line 237, ../sass/_layout.scss */
#left #logo img {
position: absolute;
top: 50%;
@@ -320,11 +325,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
max-width: 90px;
max-height: 90px;
}
/* line 241, ../sass/_layout.scss */
/* line 247, ../sass/_layout.scss */
#left h1, #left h2, #left #infos, #left #infos a {
color: #323232;
}
/* line 245, ../sass/_layout.scss */
/* line 251, ../sass/_layout.scss */
#left h1 {
text-transform: uppercase;
font-family: "highvoltageregular";
@@ -335,37 +340,37 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-align: center;
font-weight: normal;
}
/* line 256, ../sass/_layout.scss */
/* line 262, ../sass/_layout.scss */
#left h2 {
font-family: "capsuularegular";
font-size: 15px;
font-weight: normal;
text-align: center;
}
/* line 262, ../sass/_layout.scss */
/* line 268, ../sass/_layout.scss */
#left h2 .favorite {
padding-left: 0px;
}
/* line 265, ../sass/_layout.scss */
/* line 271, ../sass/_layout.scss */
#left h2 .favorite .glyphicon {
font-size: 14px;
}
/* line 270, ../sass/_layout.scss */
/* line 276, ../sass/_layout.scss */
#left h2 a {
color: #323232;
}
/* line 276, ../sass/_layout.scss */
/* line 282, ../sass/_layout.scss */
#left nav#main-nav {
background-color: white;
border: solid 1px #e0e0e0;
border-bottom: 0px none;
margin-top: 20px;
}
/* line 283, ../sass/_layout.scss */
/* line 289, ../sass/_layout.scss */
#left nav#main-nav ul li {
display: block;
}
/* line 286, ../sass/_layout.scss */
/* line 292, ../sass/_layout.scss */
#left nav#main-nav ul li a {
color: #323232;
color: black;
@@ -375,23 +380,23 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
display: block;
text-align: left;
}
/* line 295, ../sass/_layout.scss */
/* line 301, ../sass/_layout.scss */
#left nav#main-nav ul li a .glyphicon {
font-size: 15px;
margin-right: 3px;
}
/* line 300, ../sass/_layout.scss */
/* line 306, ../sass/_layout.scss */
#left nav#main-nav ul li a span.label {
padding-bottom: 3px;
font-family: "Arial";
float: right;
}
/* line 308, ../sass/_layout.scss */
/* line 314, ../sass/_layout.scss */
#left nav#main-nav ul li.active span.label, #left nav#main-nav ul li a:hover span.label {
background-color: #e67200;
color: white;
}
/* line 314, ../sass/_layout.scss */
/* line 320, ../sass/_layout.scss */
#left nav#main-nav ul li a:hover, #left nav#main-nav ul li.active a {
background: #FF7F00;
color: white;
@@ -399,22 +404,22 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 323, ../sass/_layout.scss */
/* line 329, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a {
color: #FF7F00;
}
/* line 326, ../sass/_layout.scss */
/* line 332, ../sass/_layout.scss */
#left nav#main-nav ul li#btn-administration a:hover {
color: white;
}
/* line 334, ../sass/_layout.scss */
/* line 340, ../sass/_layout.scss */
#left nav#main-nav #user {
color: #FF7F00;
float: right;
padding: 10px;
}

/* line 342, ../sass/_layout.scss */
/* line 348, ../sass/_layout.scss */
#main {
background-color: #FFF8DC;
border: solid 1px #e0e0e0;
@@ -422,13 +427,13 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding: 0px;
background-color: white;
}
/* line 349, ../sass/_layout.scss */
/* line 355, ../sass/_layout.scss */
#main #img-big {
height: 130px;
overflow: hidden;
position: relative;
}
/* line 354, ../sass/_layout.scss */
/* line 360, ../sass/_layout.scss */
#main #img-big img.img-photo {
width: 100%;
position: absolute;
@@ -436,7 +441,7 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 50%;
transform: translate(-50%, -50%);
}
/* line 364, ../sass/_layout.scss */
/* line 370, ../sass/_layout.scss */
#main #infos-producer {
padding: 5px 10px;
margin-bottom: 0px;
@@ -446,20 +451,20 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
border-bottom: solid 1px #e0e0e0;
color: gray;
}
/* line 373, ../sass/_layout.scss */
/* line 379, ../sass/_layout.scss */
#main #infos-producer strong {
font-weight: bold;
}
/* line 377, ../sass/_layout.scss */
/* line 383, ../sass/_layout.scss */
#main #infos-producer .favorite {
float: right;
color: gray;
}
/* line 380, ../sass/_layout.scss */
/* line 386, ../sass/_layout.scss */
#main #infos-producer .favorite a {
color: black;
}
/* line 386, ../sass/_layout.scss */
/* line 392, ../sass/_layout.scss */
#main h2#page-title {
padding-left: 15px;
padding-right: 15px;
@@ -474,36 +479,36 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
top: -10px;
text-align: left;
}
/* line 400, ../sass/_layout.scss */
/* line 406, ../sass/_layout.scss */
#main h2#page-title #buttons {
margin-bottom: 15px;
font-family: "Arial";
}
/* line 407, ../sass/_layout.scss */
/* line 413, ../sass/_layout.scss */
#main #content {
padding: 0px 20px 20px 20px;
padding-bottom: 40px;
min-height: 300px;
}
/* line 412, ../sass/_layout.scss */
/* line 418, ../sass/_layout.scss */
#main #content h1, #main #content h2, #main #content h3, #main #content h4, #main #content h5, #main #content h6 {
font-family: "highvoltageregular";
margin-top: 30px;
margin-bottom: 20px;
}
/* line 417, ../sass/_layout.scss */
/* line 423, ../sass/_layout.scss */
#main #content h1.first, #main #content h2.first, #main #content h3.first, #main #content h4.first, #main #content h5.first, #main #content h6.first {
margin-top: 0px;
}
/* line 422, ../sass/_layout.scss */
/* line 428, ../sass/_layout.scss */
#main #content h1 {
font-size: 30px;
}
/* line 426, ../sass/_layout.scss */
/* line 432, ../sass/_layout.scss */
#main #content h2 {
font-size: 25px;
}
/* line 431, ../sass/_layout.scss */
/* line 437, ../sass/_layout.scss */
#main #content h3 {
font-family: "capsuularegular";
text-transform: uppercase;
@@ -512,29 +517,29 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
margin-bottom: 30px;
margin-top: 45px;
}
/* line 439, ../sass/_layout.scss */
/* line 445, ../sass/_layout.scss */
#main #content h3 span {
padding-top: 14px;
color: #323232;
}
/* line 445, ../sass/_layout.scss */
/* line 451, ../sass/_layout.scss */
#main #content h4 {
font-size: 20px;
}
/* line 449, ../sass/_layout.scss */
/* line 455, ../sass/_layout.scss */
#main #content h5 {
font-size: 18px;
}
/* line 453, ../sass/_layout.scss */
/* line 459, ../sass/_layout.scss */
#main #content h6 {
font-size: 16px;
}
/* line 459, ../sass/_layout.scss */
/* line 465, ../sass/_layout.scss */
#main #content form .form-group .hint-block {
color: gray;
}

/* line 467, ../sass/_layout.scss */
/* line 473, ../sass/_layout.scss */
#footer-producer {
text-align: center;
position: absolute;
@@ -542,28 +547,28 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
left: 0px;
width: 100%;
}
/* line 474, ../sass/_layout.scss */
/* line 480, ../sass/_layout.scss */
#footer-producer a {
color: #FF7F00;
}
/* line 476, ../sass/_layout.scss */
/* line 482, ../sass/_layout.scss */
#footer-producer a:active {
text-decoration: underline;
}

/* line 482, ../sass/_layout.scss */
/* line 488, ../sass/_layout.scss */
#footer {
background-color: #FFF8DC;
height: 100px;
float: right;
text-align: center;
}
/* line 488, ../sass/_layout.scss */
/* line 494, ../sass/_layout.scss */
#footer .content {
padding-top: 20px;
color: black;
}
/* line 492, ../sass/_layout.scss */
/* line 498, ../sass/_layout.scss */
#footer .content a {
color: black;
font-family: "capsuularegular";
@@ -571,11 +576,11 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
padding-left: 10px;
padding-right: 10px;
}
/* line 499, ../sass/_layout.scss */
/* line 505, ../sass/_layout.scss */
#footer .content a:hover {
text-decoration: underline;
}
/* line 506, ../sass/_layout.scss */
/* line 512, ../sass/_layout.scss */
#footer #code-source img {
height: 20px;
}

+ 6
- 0
producer/web/sass/_layout.scss ファイルの表示

@@ -64,6 +64,12 @@ body {
z-index: 10 ;
}

#section-user-top {
.navbar-default {
background-color: white;
}
}

#main {
position: relative ;
.btn-primary {

書き込み プレビュー
読み込み中…
キャンセル
保存