summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-03-27 12:52:08 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-03-27 12:52:08 +0100
commit4846f15c8561056ade9e01cd1bcbff9b7524d161 (patch)
tree1afedcd6c21910dd562210e7871d6e64202b8ef1
parentfbae5528d901b6c729066ebdebdd217af859c70e (diff)
downloadChimère - projet de référence-4846f15c8561056ade9e01cd1bcbff9b7524d161.tar.bz2
Chimère - projet de référence-4846f15c8561056ade9e01cd1bcbff9b7524d161.zip
Change main logo position
-rw-r--r--chimere_example_static/carteouverte/img/carte-ouverte.pngbin0 -> 10308 bytes
-rw-r--r--chimere_example_static/carteouverte/img/maison-consommation-environnement.pngbin0 -> 25924 bytes
-rw-r--r--chimere_example_static/chimere/css/extra-styles.css10
-rw-r--r--templates/chimere/main_map.html6
4 files changed, 12 insertions, 4 deletions
diff --git a/chimere_example_static/carteouverte/img/carte-ouverte.png b/chimere_example_static/carteouverte/img/carte-ouverte.png
new file mode 100644
index 0000000..eee7241
--- /dev/null
+++ b/chimere_example_static/carteouverte/img/carte-ouverte.png
Binary files differ
diff --git a/chimere_example_static/carteouverte/img/maison-consommation-environnement.png b/chimere_example_static/carteouverte/img/maison-consommation-environnement.png
new file mode 100644
index 0000000..330bfb0
--- /dev/null
+++ b/chimere_example_static/carteouverte/img/maison-consommation-environnement.png
Binary files differ
diff --git a/chimere_example_static/chimere/css/extra-styles.css b/chimere_example_static/chimere/css/extra-styles.css
index 7d71af7..e29c6e8 100644
--- a/chimere_example_static/chimere/css/extra-styles.css
+++ b/chimere_example_static/chimere/css/extra-styles.css
@@ -118,7 +118,7 @@ label.labelSpan.olButton{
padding: 0.2em 0.4em;
}
-#panel, #detail-wrapper, .logos, #content .olControlLayerSwitcher .layersDiv{
+#panel, #detail-wrapper, #logos, #content .olControlLayerSwitcher .layersDiv{
background-color: #F8F8F8;
}
@@ -131,9 +131,6 @@ label.labelSpan.olButton{
padding:16px;
padding-top:60px;
width:400px;
- background-image:url('../../carteouverte/img/title.png');
- background-position: center 100%;
- background-repeat:no-repeat;
background-color:#99CA3C;
z-index:12;
}
@@ -497,6 +494,11 @@ span#permalink, .navbar-nav .lbl, #areas-div label, #permalink, #simple_button,
line-height:60px;
}
+#logo-mce{
+ bottom:220px;
+ height:340px;
+}
+
.logos > ul{
margin:0;
margin-right:10px;
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 92a5f84..f2e00b3 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -19,6 +19,12 @@
<form id="frm_categories"><div id='categories'></div></form>
<div id='search-box' class='ui-widget ui-corner-all'></div>
<a id='greenmap-logo' href='http://www.greenmap.org/' target='_blank'>Greenmap</a>
+ <div id='logo-mce' class='logos'>
+ <ul>
+ <li><a href='http://www.mce-info.org/' target='_blank'><img src='{{STATIC_URL}}carteouverte/img/maison-consommation-environnement.png' alt="Maison de la Consommation et de l'environnement"/></a></li>
+ <li><a href='http://www.carte-ouverte.org/' target='_blank'><img src='{{STATIC_URL}}carteouverte/img/carte-ouverte.png' alt="Carte OuVerte"/></a></li>
+ </ul>
+ </div>
<div id='logos' class='logos'>
<ul>
<li><a href='http://www.greenmap.org/' target='_blank'><img src='{{STATIC_URL}}carteouverte/img/green_map.png' alt='Green Map'/></a></li>