Laclic
/
Souke
關註 5
收藏 0
複製 1
程式碼 問題管理 1 合併請求 0 版本發佈 0 Wiki Activity
瀏覽代碼

Pauffinage header frontend 

Ajout de l'identité de l'utilisateur dans le bouton de déconnexion pour qu'on sache quel compte est connecté.

Passage de "Espace boulanger" en marron pour inciter les boulangers à aller dans le backend.
prodstable
keun 8 年之前
父節點
6d92f7cecd
當前提交
92c4348fcb
共有 4 個文件被更改，包括 60 次插入 和 56 次删除
分割檢視 顯示文件統計
  1. +1
    -1
      frontend/views/layouts/main.php
  2. 二進制
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  3. +53
    -51
      frontend/web/css/screen.css
  4. +6
    -4
      frontend/web/sass/screen.scss

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

@@ -47,7 +47,7 @@ AppAsset::register($this);
<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<!-- <span class="nom">(<?php echo Html::encode(Yii::$app->user->identity->prenom .' '. substr(strtoupper(Yii::$app->user->identity->nom), 0, 1).'.') ; ?>)</span>--></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 if(Yii::$app->getRequest()->serverName == 'localhost'): ?>../../backend/web/<?php else: ?>boulanger.laboiteapain.net<?php endif; ?>"><span class="glyphicon glyphicon-grain"></span> Espace boulanger</a></li><?php endif; ?>
<?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>

二進制
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc 查看文件


+ 53
- 51
frontend/web/css/screen.css 查看文件

@@ -204,39 +204,41 @@ ul li {
/* line 182, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
color: #BB8757;
}
/* line 186, ../sass/screen.scss */
/* line 187, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 188, ../sass/screen.scss */
/* line 189, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 191, ../sass/screen.scss */
/* line 192, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 194, ../sass/screen.scss */
/* line 195, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
border: 1px solid #e0e0e0;
}
/* line 199, ../sass/screen.scss */
/* line 200, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: transparent;
}
/* line 209, ../sass/screen.scss */
/* line 210, ../sass/screen.scss */
#header #link-logout .nom {
color: gray;
font-size: 10px;
/*position: relative ;
left: 20px ;
top: -3px ;*/
left: 18px;
position: relative;
top: -4px;
}

/* line 225, ../sass/screen.scss */
/* line 227, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
@@ -244,12 +246,12 @@ ul li {
padding-top: 35px;
min-height: 500px;
}
/* line 232, ../sass/screen.scss */
/* line 234, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 239, ../sass/screen.scss */
/* line 241, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -260,16 +262,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 250, ../sass/screen.scss */
/* line 252, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 258, ../sass/screen.scss */
/* line 260, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 263, ../sass/screen.scss */
/* line 265, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -278,83 +280,83 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 270, ../sass/screen.scss */
/* line 272, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 274, ../sass/screen.scss */
/* line 276, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 20px;
}
/* line 279, ../sass/screen.scss */
/* line 281, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
}
/* line 281, ../sass/screen.scss */
/* line 283, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 285, ../sass/screen.scss */
/* line 287, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 291, ../sass/screen.scss */
/* line 293, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: center;
}
/* line 293, ../sass/screen.scss */
/* line 295, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: none;
}
/* line 298, ../sass/screen.scss */
/* line 300, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 302, ../sass/screen.scss */
/* line 304, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
}

/* line 311, ../sass/screen.scss */
/* line 313, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 315, ../sass/screen.scss */
/* line 317, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 324, ../sass/screen.scss */
/* line 326, ../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 329, ../sass/screen.scss */
/* line 331, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 333, ../sass/screen.scss */
/* line 335, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 336, ../sass/screen.scss */
/* line 338, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 343, ../sass/screen.scss */
/* line 345, ../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 348, ../sass/screen.scss */
/* line 350, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -367,7 +369,7 @@ ul li {
padding-top: 30px;
padding-bottom: 60px;
}
/* line 364, ../sass/screen.scss */
/* line 366, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
@@ -378,29 +380,29 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 373, ../sass/screen.scss */
/* line 375, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 377, ../sass/screen.scss */
/* line 379, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 383, ../sass/screen.scss */
/* line 385, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 386, ../sass/screen.scss */
/* line 388, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 391, ../sass/screen.scss */
/* line 393, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 395, ../sass/screen.scss */
/* line 397, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -408,7 +410,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 403, ../sass/screen.scss */
/* line 405, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -417,53 +419,53 @@ ul li {
color: black;
}

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

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

/* line 426, ../sass/screen.scss */
/* line 428, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 430, ../sass/screen.scss */
/* line 432, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 435, ../sass/screen.scss */
/* line 437, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 438, ../sass/screen.scss */
/* line 440, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 444, ../sass/screen.scss */
/* line 446, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

/* signup */
/* line 453, ../sass/screen.scss */
/* line 455, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 458, ../sass/screen.scss */
/* line 460, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 464, ../sass/screen.scss */
/* line 466, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 468, ../sass/screen.scss */
/* line 470, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

+ 6
- 4
frontend/web/sass/screen.scss 查看文件

@@ -181,6 +181,7 @@ ul {
#link-espace-boulanger {
border-left: solid 1px #e0e0e0 ;
color: $color1 ;
}
nav {
@@ -207,10 +208,11 @@ ul {
#link-logout {
.nom {
font-size: 10px ;
/*position: relative ;
left: 20px ;
top: -3px ;*/
color: gray;
font-size: 10px;
left: 18px;
position: relative;
top: -4px;
}
}
}

Write Preview
Loading…
取消
儲存