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

Distinction visuelle entre la section prod et la section dév 

Ajout du mot "Dév." à côté du logo lorsque l'on est dans l'environnement de développement.
prodstable
keun 8年前
親
184406ffc3
コミット
fb172020de
8個のファイルの変更、287行の追加、227行の削除
分割表示 差分情報を表示
  1. +4
    -0
      backend/views/layouts/main.php
  2. バイナリ
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  3. +182
    -169
      backend/web/css/screen.css
  4. +12
    -0
      backend/web/sass/screen.scss
  5. +4
    -1
      frontend/views/layouts/main.php
  6. バイナリ
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  7. +70
    -57
      frontend/web/css/screen.css
  8. +15
    -0
      frontend/web/sass/screen.scss

+ 4
- 0
backend/views/layouts/main.php ファイルの表示

@@ -28,6 +28,7 @@ AppAsset::register($this);
</head>
<body>
<?php $this->beginBody() ?>
<div class="wrap">
<?php
NavBar::begin([
@@ -142,6 +143,9 @@ AppAsset::register($this);
?>

<div class="container-fluid container-body">
<?php if(YII_ENV == 'dev'): ?>
<div id="env-dev">Dév.</div>
<?php endif; ?>
<?php if(!Yii::$app->user->isGuest): ?>
<div class="nom-boulange">
<?php if(Yii::$app->user->identity->status == User::STATUS_BOULANGER): ?>

バイナリ
backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc ファイルの表示


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


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

@@ -27,6 +27,18 @@ a {
}
}

#env-dev {
font-family: 'comfortaabold' ;
text-align: center ;
font-size: 18px ;
padding: 5px 10px ;
color: white ;
position: fixed ;
top: 9px ;
left: 66px ;
z-index: 1031 ;
}

.pagination > .active > a, .pagination > .active > span, .pagination > .active > a:hover, .pagination > .active > span:hover, .pagination > .active > a:focus, .pagination > .active > span:focus {
background-color: $color1 ;
border: solid 1px $color1 ;

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

@@ -34,9 +34,12 @@ AppAsset::register($this);
</head>
<body class="<?php if($is_home): echo 'home' ; endif; ?><?php if(!Yii::$app->user->isGuest): ?> connected<?php endif; ?>">
<?php $this->beginBody() ?>
<div id="back"></div>
<div id="back"></div>
<header id="header">
<div class="container">
<?php if(YII_ENV == 'dev'): ?>
<div id="env-dev">Dév.</div>
<?php endif; ?>
<a id="link-home" href="<?php if(Yii::$app->user->isGuest): echo Yii::$app->urlManager->createUrl('site/index') ; else: echo Yii::$app->urlManager->createUrl('commande/index') ; endif; ?>">
<img class="icon" src="<?php echo Yii::$app->urlManager->getBaseUrl(); ?>/img/laboulange3.png" alt="" />
<!--La boîte à pain-->

バイナリ
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc ファイルの表示


+ 70
- 57
frontend/web/css/screen.css ファイルの表示

@@ -189,6 +189,19 @@ ul li {
position: relative;
}
/* line 158, ../sass/screen.scss */
#header #env-dev {
font-family: "comfortaabold";
text-align: center;
font-size: 18px;
padding-top: 10px;
padding-bottom: 10px;
color: #BB8757;
background-color: transparent;
position: absolute;
top: 18px;
left: 79px;
}
/* line 171, ../sass/screen.scss */
#header #link-home {
position: absolute;
top: 10px;
@@ -197,39 +210,39 @@ ul li {
font-size: 22px;
color: black;
}
/* line 166, ../sass/screen.scss */
/* line 179, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
}
/* line 172, ../sass/screen.scss */
/* line 185, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
color: #BB8757;
}
/* line 177, ../sass/screen.scss */
/* line 190, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 179, ../sass/screen.scss */
/* line 192, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 182, ../sass/screen.scss */
/* line 195, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 185, ../sass/screen.scss */
/* line 198, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
}
/* line 189, ../sass/screen.scss */
/* line 202, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: white;
}
/* line 199, ../sass/screen.scss */
/* line 212, ../sass/screen.scss */
#header #link-logout .nom {
color: gray;
font-size: 10px;
@@ -238,7 +251,7 @@ ul li {
top: -4px;
}

/* line 216, ../sass/screen.scss */
/* line 229, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
@@ -246,12 +259,12 @@ ul li {
padding-top: 35px;
min-height: 500px;
}
/* line 223, ../sass/screen.scss */
/* line 236, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 230, ../sass/screen.scss */
/* line 243, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -262,16 +275,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 241, ../sass/screen.scss */
/* line 254, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 249, ../sass/screen.scss */
/* line 262, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 254, ../sass/screen.scss */
/* line 267, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -280,54 +293,54 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 261, ../sass/screen.scss */
/* line 274, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 265, ../sass/screen.scss */
/* line 278, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
}
/* line 269, ../sass/screen.scss */
/* line 282, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 13px 32px;
font-size: 25px;
}
/* line 275, ../sass/screen.scss */
/* line 288, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
}
/* line 277, ../sass/screen.scss */
/* line 290, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 281, ../sass/screen.scss */
/* line 294, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 287, ../sass/screen.scss */
/* line 300, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: center;
}
/* line 289, ../sass/screen.scss */
/* line 302, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: none;
}
/* line 294, ../sass/screen.scss */
/* line 307, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 298, ../sass/screen.scss */
/* line 311, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
text-align: center;
}
/* line 303, ../sass/screen.scss */
/* line 316, ../sass/screen.scss */
#content #row-clients-boulanger .prix span {
color: #BB8757;
background-color: #F8F1DD;
@@ -340,7 +353,7 @@ ul li {
-webkit-border-radius: 10px;
border-radius: 10px;
}
/* line 317, ../sass/screen.scss */
/* line 330, ../sass/screen.scss */
#content #row-clients-boulanger #periode-essai {
margin-top: 8px;
text-align: center;
@@ -349,41 +362,41 @@ ul li {
font-family: "comfortaaregular";
}

/* line 329, ../sass/screen.scss */
/* line 342, ../sass/screen.scss */
#content #contact {
display: none;
}
/* line 333, ../sass/screen.scss */
/* line 346, ../sass/screen.scss */
#content #contact .icon {
width: 55px;
top: -15px;
margin-left: -70px;
}
/* line 342, ../sass/screen.scss */
/* line 355, ../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 347, ../sass/screen.scss */
/* line 360, ../sass/screen.scss */
#content #contact .form-group {
text-align: center;
}
/* line 351, ../sass/screen.scss */
/* line 364, ../sass/screen.scss */
#content #contact .img-right {
float: right;
}
/* line 354, ../sass/screen.scss */
/* line 367, ../sass/screen.scss */
#content #contact .img-right img {
width: 300px;
}

/* line 361, ../sass/screen.scss */
/* line 374, ../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 366, ../sass/screen.scss */
/* line 379, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -396,7 +409,7 @@ ul li {
padding-top: 30px;
padding-bottom: 60px;
}
/* line 382, ../sass/screen.scss */
/* line 395, ../sass/screen.scss */
#footer a {
color: #7e7e7e;
color: white;
@@ -407,29 +420,29 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 391, ../sass/screen.scss */
/* line 404, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 395, ../sass/screen.scss */
/* line 408, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

/* line 401, ../sass/screen.scss */
/* line 414, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 404, ../sass/screen.scss */
/* line 417, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 409, ../sass/screen.scss */
/* line 422, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 413, ../sass/screen.scss */
/* line 426, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -437,7 +450,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 421, ../sass/screen.scss */
/* line 434, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -446,58 +459,58 @@ ul li {
color: black;
}

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

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

/* line 444, ../sass/screen.scss */
/* line 457, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 448, ../sass/screen.scss */
/* line 461, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 453, ../sass/screen.scss */
/* line 466, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 456, ../sass/screen.scss */
/* line 469, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 462, ../sass/screen.scss */
/* line 475, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

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

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

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

/* line 494, ../sass/screen.scss */
/* line 507, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -505,20 +518,20 @@ ul li {
margin-top: 0px;
}

/* line 504, ../sass/screen.scss */
/* line 517, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 509, ../sass/screen.scss */
/* line 522, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 515, ../sass/screen.scss */
/* line 528, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 519, ../sass/screen.scss */
/* line 532, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

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

@@ -154,6 +154,19 @@ ul {
.container {
position: relative ;
}
#env-dev {
font-family: 'comfortaabold' ;
text-align: center ;
font-size: 18px ;
padding-top: 10px ;
padding-bottom: 10px ;
color: $color1 ;
background-color: transparent ;
position: absolute ;
top: 18px ;
left: 79px ;
}

#link-home {
position: absolute ;
@@ -521,6 +534,8 @@ ul {
}
}



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


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