BenoitCier
/
Opendistrib
sforkowany z Laclic/Souke
Obserwuj 1
Polub 0
Forkuj 0
Kod Zgłoszenia 0 Oczekujące zmiany 0 Wydania 0 Wiki Aktywność
Przeglądaj źródła

Intégration du nom du site dans le header

master
keun 7 lat temu
rodzic
e15cfd19ef
commit
d1d047da6f
4 zmienionych plików z 106 dodań i 66 usunięć
Widok podzielony Pokaż statystyki zmian
  1. +7
    -3
      frontend/views/layouts/main.php
  2. BIN
      frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc
  3. +81
    -63
      frontend/web/css/screen.css
  4. +18
    -0
      frontend/web/sass/screen.scss

+ 7
- 3
frontend/views/layouts/main.php Wyświetl plik

@@ -45,12 +45,16 @@ AppAsset::register($this);
<?php endif; ?>
<header id="header">
<div class="container">
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?>
<div id="env-dev"><?php if(YII_ENV == 'dev'): ?>Dév.<?php elseif(YII_ENV == 'demo'): ?>Démo<?php endif; ?></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="" />
<div class="text">
<div class="bap">La boîte à pain</div>
<div class="plateforme">Plateforme de réservation
<?php if(YII_ENV == 'dev' || YII_ENV == 'demo'): ?><?php if(YII_ENV == 'dev'): ?>(dév)<?php elseif(YII_ENV == 'demo'): ?>(démo)<?php endif; ?></div><?php endif; ?></div>
</div>
</a>
<nav class="">
<ul class="nav nav-pills">
<?php if(!Yii::$app->user->isGuest):?>

BIN
frontend/web/.sass-cache/e1a48ee3204d3a535cdbe440c2995954a615ac19/screen.scssc Wyświetl plik


+ 81
- 63
frontend/web/css/screen.css Wyświetl plik

@@ -222,40 +222,58 @@ ul li {
text-decoration: none;
font-size: 22px;
color: black;
display: block;
}
/* line 191, ../sass/screen.scss */
/* line 192, ../sass/screen.scss */
#header #link-home img {
height: 60px;
margin-bottom: 5px;
float: left;
}
/* line 198, ../sass/screen.scss */
#header #link-home .text {
float: left;
padding-left: 10px;
}
/* line 202, ../sass/screen.scss */
#header #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 207, ../sass/screen.scss */
#header #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 197, ../sass/screen.scss */
/* line 215, ../sass/screen.scss */
#header #link-espace-boulanger {
border-left: solid 1px #e0e0e0;
color: #BB8757;
}
/* line 202, ../sass/screen.scss */
/* line 220, ../sass/screen.scss */
#header nav {
padding-top: 22px;
}
/* line 204, ../sass/screen.scss */
/* line 222, ../sass/screen.scss */
#header nav ul {
float: right;
}
/* line 207, ../sass/screen.scss */
/* line 225, ../sass/screen.scss */
#header nav ul li a {
text-decoration: none;
color: #505050;
}
/* line 210, ../sass/screen.scss */
/* line 228, ../sass/screen.scss */
#header nav ul li a.active {
background-color: white;
}
/* line 214, ../sass/screen.scss */
/* line 232, ../sass/screen.scss */
#header nav ul li a:hover {
color: black;
background-color: white;
}
/* line 224, ../sass/screen.scss */
/* line 242, ../sass/screen.scss */
#header #link-logout .nom {
color: gray;
font-size: 10px;
@@ -264,7 +282,7 @@ ul li {
top: -4px;
}

/* line 241, ../sass/screen.scss */
/* line 259, ../sass/screen.scss */
#content {
position: relative;
padding: 20px 0px;
@@ -272,12 +290,12 @@ ul li {
padding-top: 35px;
min-height: 500px;
}
/* line 248, ../sass/screen.scss */
/* line 266, ../sass/screen.scss */
#content h1#title-site {
font-family: "comfortaalight";
font-size: 50px;
}
/* line 255, ../sass/screen.scss */
/* line 273, ../sass/screen.scss */
#content h2 {
color: black;
padding-bottom: 15px;
@@ -288,16 +306,16 @@ ul li {
position: relative;
margin-top: 30px;
}
/* line 266, ../sass/screen.scss */
/* line 284, ../sass/screen.scss */
#content h3 {
color: black;
font-size: 20px;
}
/* line 274, ../sass/screen.scss */
/* line 292, ../sass/screen.scss */
#content #description img {
width: 100%;
}
/* line 279, ../sass/screen.scss */
/* line 297, ../sass/screen.scss */
#content #main-img {
max-width: 100%;
border: solid 1px #e0e0e0;
@@ -306,76 +324,76 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 286, ../sass/screen.scss */
/* line 304, ../sass/screen.scss */
#content #row-presentation {
text-align: center;
}
/* line 288, ../sass/screen.scss */
/* line 306, ../sass/screen.scss */
#content #row-presentation h1 {
color: black;
}
/* line 291, ../sass/screen.scss */
/* line 309, ../sass/screen.scss */
#content #row-presentation strong {
font-family: "myriadpro-light";
font-size: 20px;
color: #B17A48;
}
/* line 298, ../sass/screen.scss */
/* line 316, ../sass/screen.scss */
#content #row-signup {
text-align: center;
margin-top: 40px;
}
/* line 302, ../sass/screen.scss */
/* line 320, ../sass/screen.scss */
#content #row-signup a.btn {
padding: 13px 32px;
font-size: 25px;
}
/* line 308, ../sass/screen.scss */
/* line 326, ../sass/screen.scss */
#content #row-clients-boulanger {
margin-bottom: 50px;
text-align: center;
}
/* line 311, ../sass/screen.scss */
/* line 329, ../sass/screen.scss */
#content #row-clients-boulanger h2 {
text-align: center;
margin-bottom: 15px;
padding-bottom: 0px;
}
/* line 315, ../sass/screen.scss */
/* line 333, ../sass/screen.scss */
#content #row-clients-boulanger h2 img {
height: 70px;
margin-bottom: 60px;
}
/* line 321, ../sass/screen.scss */
/* line 339, ../sass/screen.scss */
#content #row-clients-boulanger ul {
text-align: left;
margin-left: 20%;
}
/* line 324, ../sass/screen.scss */
/* line 342, ../sass/screen.scss */
#content #row-clients-boulanger ul li {
list-style-type: circle;
color: #BB8757;
}
/* line 330, ../sass/screen.scss */
/* line 348, ../sass/screen.scss */
#content #row-clients-boulanger #clients {
border-right: dotted 1px gray;
}
/* line 336, ../sass/screen.scss */
/* line 354, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span {
background-color: #F8F1DD;
}
/* line 339, ../sass/screen.scss */
/* line 357, ../sass/screen.scss */
#content #row-clients-boulanger .boulanger .prix span a {
color: #BB8757;
text-decoration: none;
}
/* line 347, ../sass/screen.scss */
/* line 365, ../sass/screen.scss */
#content #row-clients-boulanger .prix {
padding-top: 15px;
font-size: 18px;
text-align: center;
}
/* line 352, ../sass/screen.scss */
/* line 370, ../sass/screen.scss */
#content #row-clients-boulanger .prix span {
color: #BB8757;
border: solid 1px #BB8757;
@@ -390,7 +408,7 @@ ul li {
-webkit-border-radius: 5px;
border-radius: 5px;
}
/* line 367, ../sass/screen.scss */
/* line 385, ../sass/screen.scss */
#content #row-clients-boulanger #periode-essai {
margin-top: 8px;
text-align: center;
@@ -398,50 +416,50 @@ ul li {
color: gray;
font-family: "comfortaaregular";
}
/* line 377, ../sass/screen.scss */
/* line 395, ../sass/screen.scss */
#content #btn-demo:hover, #content #btn-demo:focus, #content #btn-demo:active {
color: black;
}
/* line 383, ../sass/screen.scss */
/* line 401, ../sass/screen.scss */
#content #modal-tarifs .exemple {
color: gray;
}

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

/* line 422, ../sass/screen.scss */
/* line 440, ../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 427, ../sass/screen.scss */
/* line 445, ../sass/screen.scss */
#footer {
position: absolute;
bottom: 0px;
@@ -454,7 +472,7 @@ ul li {
padding-top: 30px;
padding-bottom: 60px;
}
/* line 441, ../sass/screen.scss */
/* line 459, ../sass/screen.scss */
#footer a {
font-family: "myriadpro-regular";
color: #7e7e7e;
@@ -467,29 +485,29 @@ ul li {
border-right: solid 1px #7e7e7e;
border-right: solid 1px white;
}
/* line 452, ../sass/screen.scss */
/* line 470, ../sass/screen.scss */
#footer a:hover {
color: gray;
}
/* line 456, ../sass/screen.scss */
/* line 474, ../sass/screen.scss */
#footer a:last-child {
border: 0px none;
}

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

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

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

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

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

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

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

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

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

+ 18
- 0
frontend/web/sass/screen.scss Wyświetl plik

@@ -187,10 +187,28 @@ ul {
text-decoration: none ;
font-size: 22px ;
color: black ;
display: block ;
img {
height: 60px ;
margin-bottom: 5px ;
float: left ;
}
.text {
float: left ;
padding-left: 10px ;
.bap {
font-family: "comfortaalight" ;
font-size: 24px ;
}
.plateforme {
font-size: 17px ;
font-family: "myriadpro-light" ;
color: $color1 ;
}
}
}

Napisz Podgląd
Ładowanie…
Anuluj
Zapisz