diff --git a/update_site.sh b/update_site.sh index 970e760..df51328 100755 --- a/update_site.sh +++ b/update_site.sh @@ -2,6 +2,7 @@ cd /websites/piquemouche date >> update.log git fetch >> update.log -git merge master >> update.log +git restore . >> update.log +git merge origin/master >> update.log sed -i 's#class="align-left">www.piquemouche.fr
#>piquemouche.fr#g' *.html >> update.log echo '.footer__copyright ul{margin-left:2rem}.footer__copyright{text-transform:none!important;display:flex;flex-direction:row;justify-content:space-around}.footer__copyright>p{display:none}.footer__copyright ul>li{list-style:none}.footer__copyright ul>li:first-child{font-size:1.5em;font-weight:700}.footer__copyright{margin-left:10%;margin-right:10%}body{background: #FFF8D6;}' >> assets/css/style.css