summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-17 10:47:31 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-17 10:47:31 +0100
commit0a8551984b03d6c9472ba7998f1fa2d4c7890f42 (patch)
tree9a4f7229b8f2318da64d6fb685743b96776c43e2
parent21e99bf7b6a1855f02f5622cae505fb094ce7e77 (diff)
downloadChimère - projet Saclay-0a8551984b03d6c9472ba7998f1fa2d4c7890f42.tar.bz2
Chimère - projet Saclay-0a8551984b03d6c9472ba7998f1fa2d4c7890f42.zip
Rétablissement du message d'accueil
-rw-r--r--static/saclay/css/styles.css5
-rw-r--r--templates/chimere/blocks/welcome.html5
2 files changed, 3 insertions, 7 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index d350943..66b5118 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -280,11 +280,10 @@ h3.warn{
width:30px;
height:30px;
top:5px;
- background-image: url("../../chimere/img/close.png");
- background-repeat: no-repeat;
- background-position: bottom center;
+ background-image: none;
background-color: transparent;
border: 0 solid;
+ box-shadow: none;
}
.welcome-dialog.ui-dialog .ui-widget-header .ui-icon{
diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index 1abebf3..e06361a 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -7,11 +7,10 @@ $(function(){
$('#welcome div.media-player').jmeEmbedControls();
$('#welcome video').each(function(index){$(this).pause()});
$('#welcome audio').each(function(index){$(this).pause()});*/
- /*$("#welcome").dialog({width:550, height:350, dialogClass:'welcome-dialog'
+ $("#welcome").dialog({width:550, height:300, dialogClass:'welcome-dialog'
{% if not display %}, autoOpen:false{% endif %},
open: function () { $("#welcome_content").scrollTop(0); }
});
- */
});
// -->
</script>
@@ -26,8 +25,6 @@ $(function(){
<button type="button" id='haystack-search-page' class="btn btn-default"><span class="action-label">Rechercher </span><span class="glyphicon glyphicon-search"></span></button>
</p>
- <h2 style="background-color: #e89834;color: white;">Avant le 15 octobre, votez en un clic pour la Carte Ouverte sur <a style="color: #905a8f;" href='http://bit.ly/CartoSaclay'>bit.ly/CartoSaclay</a> !</h2>
-
<h4>L'agenda du Plateau en 1 clic</h4>
<p>
<a href='http://saclay.carte-ouverte.org/saclay/ty/RH'><img src='http://saclay.carte-ouverte.org/media/icons/event_reunions.png' title='Réunions publiques' alt='Réunions publiques'/></a>