Преглед изворни кода

Ajout d'un lien vers Framagit dans le footer (frontend, producer)

refactoring
Guillaume Bourgeois пре 5 година
родитељ
комит
dd46e00d7a
11 измењених фајлова са 80 додато и 61 уклоњено
  1. +5
    -5
      .htaccess
  2. +2
    -1
      frontend/views/layouts/main.php
  3. +56
    -52
      frontend/web/css/screen.css
  4. BIN
      frontend/web/img/logo-framagit.png
  5. BIN
      frontend/web/img/logo-gitlab.png
  6. +6
    -3
      frontend/web/sass/screen.scss
  7. +1
    -0
      producer/views/layouts/main.php
  8. +4
    -0
      producer/web/css/screen.css
  9. BIN
      producer/web/img/logo-framagit.png
  10. BIN
      producer/web/img/logo-gitlab.png
  11. +6
    -0
      producer/web/sass/_layout.scss

+ 5
- 5
.htaccess Прегледај датотеку

@@ -13,17 +13,17 @@ Options -Indexes
RewriteCond %{REQUEST_URI} admin
RewriteRule .* backend/web/index.php [L]

RewriteCond %{REQUEST_URI} !^/(frontend|backend)/web/(assets|css)/
RewriteCond %{REQUEST_URI} !^/(frontend|backend)/web/(assets|css|img)/
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !admin
RewriteRule .* frontend/web/index.php [L]
</IfModule>

# Deny accessing below extensions
<Files ~ "(.json|.lock|.git)">
Order allow,deny
Deny from all
<Files ~ "(\.json|\.lock|\.git)">
Order allow,deny
Deny from all
</Files>

# Deny accessing dot files
RewriteRule (^\.|/\.) - [F]
RewriteRule (^\.|/\.) - [F]

+ 2
- 1
frontend/views/layouts/main.php Прегледај датотеку

@@ -206,7 +206,8 @@ $is_home = (Yii::$app->controller->id == 'site' && Yii::$app->controller->action
<div class="container">
<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>
<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>
</div>
</footer>

+ 56
- 52
frontend/web/css/screen.css Прегледај датотеку

@@ -691,21 +691,25 @@ ul li {
#footer a:last-child {
border: 0px none;
}

/* line 644, ../sass/screen.scss */
#footer #code-source img {
height: 20px;
}

/* line 650, ../sass/screen.scss */
#content #mentions {
padding-top: 20px;
}
/* line 647, ../sass/screen.scss */
/* line 653, ../sass/screen.scss */
#content #mentions div.content {
width: 60%;
font-size: 90%;
}
/* line 652, ../sass/screen.scss */
/* line 658, ../sass/screen.scss */
#content #mentions p {
padding-bottom: 15px;
}
/* line 656, ../sass/screen.scss */
/* line 662, ../sass/screen.scss */
#content #mentions h2 {
color: black;
padding-bottom: 40px;
@@ -713,7 +717,7 @@ ul li {
line-height: 35px;
font-family: "myriadpro-regular";
}
/* line 664, ../sass/screen.scss */
/* line 670, ../sass/screen.scss */
#content #mentions h3 {
font-family: "comfortaaregular";
font-size: 18px;
@@ -722,58 +726,58 @@ ul li {
color: black;
}

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

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

/* line 687, ../sass/screen.scss */
/* line 693, ../sass/screen.scss */
#profil-user .form-group.field-user-no_mail label {
font-weight: normal;
}
/* line 691, ../sass/screen.scss */
/* line 697, ../sass/screen.scss */
#profil-user .form-group label {
cursor: pointer;
}
/* line 696, ../sass/screen.scss */
/* line 702, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group {
float: left;
margin-right: 15px;
}
/* line 699, ../sass/screen.scss */
/* line 705, ../sass/screen.scss */
#profil-user #mails-jours-prod .form-group label {
font-weight: normal;
}
/* line 705, ../sass/screen.scss */
/* line 711, ../sass/screen.scss */
#profil-user p.strong {
font-weight: bold;
}

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

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

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

/* line 737, ../sass/screen.scss */
/* line 743, ../sass/screen.scss */
#modal-cgv .modal-body h2 {
margin-bottom: 5px;
padding-bottom: 0px;
@@ -781,37 +785,37 @@ ul li {
margin-top: 0px;
}

/* line 747, ../sass/screen.scss */
/* line 753, ../sass/screen.scss */
#form-signup #client-boulanger {
margin-bottom: 30px;
}
/* line 752, ../sass/screen.scss */
/* line 758, ../sass/screen.scss */
#form-signup #signupform-id_etablissement option:disabled {
font-weight: bold;
color: black;
}
/* line 758, ../sass/screen.scss */
/* line 764, ../sass/screen.scss */
#form-signup #champs-boulanger {
display: none;
}
/* line 762, ../sass/screen.scss */
/* line 768, ../sass/screen.scss */
#form-signup #boutons-inscrire {
margin-top: 30px;
}

/* line 767, ../sass/screen.scss */
/* line 773, ../sass/screen.scss */
#col-left {
padding: 0px;
z-index: 15;
}
/* line 771, ../sass/screen.scss */
/* line 777, ../sass/screen.scss */
#col-left .affix {
width: 25%;
border-right: solid 1px #e0e0e0;
background-color: #FAFAFA;
height: 100%;
}
/* line 778, ../sass/screen.scss */
/* line 784, ../sass/screen.scss */
#col-left #link-home {
text-decoration: none;
font-size: 22px;
@@ -820,28 +824,28 @@ ul li {
padding: 10px;
background-color: #F8F1DD;
}
/* line 786, ../sass/screen.scss */
/* line 792, ../sass/screen.scss */
#col-left #link-home img {
height: 50px;
margin-bottom: 5px;
float: left;
}
/* line 792, ../sass/screen.scss */
/* line 798, ../sass/screen.scss */
#col-left #link-home .text {
padding-left: 62px;
}
/* line 795, ../sass/screen.scss */
/* line 801, ../sass/screen.scss */
#col-left #link-home .text .bap {
font-family: "comfortaalight";
font-size: 24px;
}
/* line 800, ../sass/screen.scss */
/* line 806, ../sass/screen.scss */
#col-left #link-home .text .plateforme {
font-size: 17px;
font-family: "myriadpro-light";
color: #BB8757;
}
/* line 808, ../sass/screen.scss */
/* line 814, ../sass/screen.scss */
#col-left h2 {
font-family: "myriadpro-regular";
color: black;
@@ -849,37 +853,37 @@ ul li {
margin-bottom: 10px;
padding: 15px 0px 5px 15px;
}
/* line 816, ../sass/screen.scss */
/* line 822, ../sass/screen.scss */
#col-left #links {
background-color: white;
margin-bottom: 20px;
}
/* line 822, ../sass/screen.scss */
/* line 828, ../sass/screen.scss */
#col-left #links ul li a {
text-align: center;
border-right: solid 1px #e0e0e0;
}
/* line 826, ../sass/screen.scss */
/* line 832, ../sass/screen.scss */
#col-left #links ul li a:hover {
background-color: #BB8757;
color: white;
}
/* line 832, ../sass/screen.scss */
/* line 838, ../sass/screen.scss */
#col-left #links ul li:last-child a {
border-right: 0px none;
}
/* line 842, ../sass/screen.scss */
/* line 848, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li a {
padding-left: 50px;
height: 40px;
}
/* line 848, ../sass/screen.scss */
/* line 854, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a {
background-color: #BB8757;
position: relative;
color: white;
}
/* line 853, ../sass/screen.scss */
/* line 859, ../sass/screen.scss */
#col-left #producteurs nav.nav-producteurs ul li.active a:after {
right: -40px;
top: 50%;
@@ -894,18 +898,18 @@ ul li {
border-width: 20px;
margin-top: -20px;
}
/* line 872, ../sass/screen.scss */
/* line 878, ../sass/screen.scss */
#col-left ul {
list-style-type: none;
margin: 0px;
padding: 0px;
}
/* line 876, ../sass/screen.scss */
/* line 882, ../sass/screen.scss */
#col-left ul li {
margin: 0px;
padding: 0px;
}
/* line 879, ../sass/screen.scss */
/* line 885, ../sass/screen.scss */
#col-left ul li a {
text-decoration: none;
font-family: "comfortaaregular";
@@ -916,18 +920,18 @@ ul li {
display: block;
color: black;
}
/* line 889, ../sass/screen.scss */
/* line 895, ../sass/screen.scss */
#col-left ul li a span.nom, #col-left ul li a span.libelle {
display: none;
}
/* line 896, ../sass/screen.scss */
/* line 902, ../sass/screen.scss */
#col-left p {
padding: 20px;
padding-top: 0px;
color: gray;
}

/* line 904, ../sass/screen.scss */
/* line 910, ../sass/screen.scss */
#content .header-title {
height: 79px;
padding: 20px 20px;
@@ -942,7 +946,7 @@ ul li {
-webkit-box-shadow: 0px 0px 8px #e0e0e0;
box-shadow: 0px 0px 8px #e0e0e0;
}
/* line 916, ../sass/screen.scss */
/* line 922, ../sass/screen.scss */
#content .header-title h1 {
color: black;
font-family: "myriadpro-regular";
@@ -950,7 +954,7 @@ ul li {
font-size: 25px;
text-transform: uppercase;
}
/* line 924, ../sass/screen.scss */
/* line 930, ../sass/screen.scss */
#content .header-title h2 {
color: gray;
text-transform: none;
@@ -959,16 +963,16 @@ ul li {
line-height: 20px;
}

/* line 935, ../sass/screen.scss */
/* line 941, ../sass/screen.scss */
.header-etablissement {
z-index: 1;
}
/* line 937, ../sass/screen.scss */
/* line 943, ../sass/screen.scss */
.header-etablissement #block-main-img {
height: 144px;
overflow: hidden;
}
/* line 941, ../sass/screen.scss */
/* line 947, ../sass/screen.scss */
.header-etablissement #block-main-img #main-img {
width: 100%;
height: auto;
@@ -978,7 +982,7 @@ ul li {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 950, ../sass/screen.scss */
/* line 956, ../sass/screen.scss */
.header-etablissement h1 {
font-family: "comfortaaregular";
text-align: center;
@@ -986,23 +990,23 @@ ul li {
top: 30px;
left: 40px;
}
/* line 957, ../sass/screen.scss */
/* line 963, ../sass/screen.scss */
.header-etablissement h1 span {
background-color: rgba(255, 255, 255, 0.8);
padding: 10px 30px;
border: dotted 1px black;
}

/* line 968, ../sass/screen.scss */
/* line 974, ../sass/screen.scss */
nav#menu-etablissement {
border-bottom: solid 1px #e0e0e0;
}
/* line 972, ../sass/screen.scss */
/* line 978, ../sass/screen.scss */
nav#menu-etablissement ul li {
padding: 0px;
margin: 0px;
}
/* line 975, ../sass/screen.scss */
/* line 981, ../sass/screen.scss */
nav#menu-etablissement ul li a {
border-right: solid 1px #e0e0e0;
text-decoration: none;
@@ -1010,7 +1014,7 @@ nav#menu-etablissement ul li a {
-webkit-border-radius: 0px;
border-radius: 0px;
}
/* line 980, ../sass/screen.scss */
/* line 986, ../sass/screen.scss */
nav#menu-etablissement ul li a:hover {
background-color: #BB8757;
color: white;

BIN
frontend/web/img/logo-framagit.png Прегледај датотеку

Before After
Width: 100  |  Height: 100  |  Size: 4.2KB

BIN
frontend/web/img/logo-gitlab.png Прегледај датотеку

Before After
Width: 100  |  Height: 92  |  Size: 4.2KB

+ 6
- 3
frontend/web/sass/screen.scss Прегледај датотеку

@@ -639,6 +639,12 @@ ul {
border: 0px none ;
}
}
#code-source {
img {
height: 20px ;
}
}
}

#content #mentions {
@@ -989,6 +995,3 @@ nav#menu-etablissement {
@import "_systeme_commandes.scss" ;
@import "_responsive.scss" ;





+ 1
- 0
producer/views/layouts/main.php Прегледај датотеку

@@ -215,6 +215,7 @@ $producer = $this->context->getProducer() ;
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/index']) ; ?>">La boîte à pain</a>
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/mentions']) ; ?>">Mentions légales</a>
<a href="<?php echo Yii::$app->urlManagerFrontend->createAbsoluteUrl(['site/cgv']) ; ?>">CGS</a>
<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>
</div>
</div>
</footer>

+ 4
- 0
producer/web/css/screen.css Прегледај датотеку

@@ -502,6 +502,10 @@ ul.pagination li a:hover, ul.pagination li a:focus, ul.pagination li a:active {
text-decoration: underline;
margin-right: 10px;
}
/* line 409, ../sass/_layout.scss */
#footer .container #code-source img {
height: 20px;
}

/**
Copyright La boîte à pain (2018)

BIN
producer/web/img/logo-framagit.png Прегледај датотеку

Before After
Width: 100  |  Height: 100  |  Size: 4.2KB

BIN
producer/web/img/logo-gitlab.png Прегледај датотеку

Before After
Width: 100  |  Height: 92  |  Size: 4.2KB

+ 6
- 0
producer/web/sass/_layout.scss Прегледај датотеку

@@ -404,5 +404,11 @@ ul.pagination {
margin-right: 10px ;
}
}
#code-source {
img {
height: 20px ;
}
}
}
}

Loading…
Откажи
Сачувај