From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Tue, 4 May 2021 14:32:36 +0000 (+0200)
Subject: Merge branch 'dev' into no-telemeta
X-Git-Tag: 2.1~66^2^2~91^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9be2621e9929e39ed9ff61c0291ad04be40cba99;p=teleforma.git

Merge branch 'dev' into no-telemeta
---

9be2621e9929e39ed9ff61c0291ad04be40cba99
diff --cc teleforma/static/teleforma/css/teleforma.css
index 712fbdbc,4ae7887e..d2072d60
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@@ -122,10 -122,11 +122,11 @@@ margin-bottom: 0em
  #header {
      padding: 0em;
  	background-color: #000000 ;
 -    background:no-repeat url(/static/telemeta/images/tw_hd.png) 0 0;
 +    background:no-repeat url(/static/teleforma/images/tw_hd.png) 0 0;
      background-color:#ebebeb;
      background-repeat:repeat; 
- 	border-top: .25em solid #6a0307;
+     /* border-top: .25em solid #6a0307; */
 -/*     background: url("/static/telemeta/images/waves.png") 100% 0% no-repeat; */
++    /*     background: url("/static/telemeta/images/waves.png") 100% 0% no-repeat; */
  }
  
  #content_header, #header{