forge-joniko/ldc-sbv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/ticket742' into develop

Browse source
This commit is contained in:
Olivier Legat 2022-03-30 12:33:24 +02:00
commit c7d73f2e42
4 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,22 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#f10f20",
"activityBar.activeBorder": "#1bd30c",
"activityBar.background": "#f10f20",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#1bd30c",
"activityBarBadge.foreground": "#15202b",
"sash.hoverBorder": "#f10f20",
"statusBar.background": "#c20b19",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#f10f20",
"statusBarItem.remoteBackground": "#c20b19",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#c20b19",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#c20b1999",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.remoteColor": "#C20B19"
}

6
wp-config.php
View file

@ -27,10 +27,8 @@ if (ENV === ENV_PROD) {
}
/** development **/
if (ENV === ENV_DEV) {
if (isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && "https" == $_SERVER["HTTP_X_FORWARDED_PROTO"]) {
$_SERVER["HTTPS"] = "on";
}
if (isset($_SERVER["HTTP_X_FORWARDED_PROTO"]) && "https" == $_SERVER["HTTP_X_FORWARDED_PROTO"]) {
$_SERVER["HTTPS"] = "on";
}
/** BOTH **/

4
wp-content/themes/pole-sbv/functions.php
View file

@ -106,8 +106,8 @@ pll_register_string("Accueil", "Accueil", 'Breadcrumb');
pll_register_string('Une histoire de terre', 'Une histoire de <-> terre', 'Homepage');
pll_register_string("Une histoire d'Hommes", "Une histoire <-> d'Hommes", 'Homepage');
pll_register_string("Une histoire de savoir-faire", "Une histoire de <-> savoir-faire", 'Homepage');
pll_register_string("Nos certifcations", "Nos certifcations", 'Homepage');
pll_register_string("Nos certifcations Text", "Nos certifcations Text", 'Homepage');
pll_register_string("Nos certifications", "Nos certifications", 'Homepage');
pll_register_string("Nos certifications Text", "Nos certifications Text", 'Homepage');
pll_register_string("Restauration commerciale et collective","Restauration commerciale et collective",'Nos Marques');
pll_register_string("Nos_marques_et_nos_solutions","Nos marques et nos solutions pour la restauration commerciale et collective",'Nos Marques');

2
wp-content/themes/pole-sbv/homepage_template.php
View file

@ -117,7 +117,7 @@ get_header(); ?>
<section class="image-bg">
<div class="container">
<h2 class="section-title
marked-middle-gray"><?php pll_e("Nos certifcations"); ?></span></h2>
marked-middle-gray"><?php pll_e("Nos certifications"); ?></span></h2>
<p><?php pll_e("Nos certifcations Text"); ?></p>
<div class="pictures-holder">
<?php