Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

9 years ago · 7f58bc6bd5
parent 7b4514d541 dee862a42c
commit 7f58bc6bd5
3 changed files with 480 additions and 474 deletions
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
--- a/static/client/css/main.css
+++ b/static/client/css/main.css
@ -13765,10 +13765,14 @@ blockquote{

 .top_page_banner{
    display: block;
-    width: 1200px;
-    height: 130px;
+    max-width: 1200px;
+    /*height: 130px;*/
    margin: 10px auto;
-    background-color: #00A6C7;
+    /*background-color: #00A6C7;*/
+}
+.top_page_banner img {
+    max-width: 100%;
+    height: auto;
 }
 .conference_interested{
    background-color: #fff;
--- a/static/client/css_min/main.min.css
+++ b/static/client/css_min/main.min.css