diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-05-31 11:30:01 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-31 11:30:01 +0200 |
| commit | dce8313df180f5f2f355dad8c0f1133052616b44 (patch) | |
| tree | cad6f8e50a942ce7fe03a8dd8b3c61e7f5a86227 | |
| parent | bf32349fe3bddba2f7956fde69f47cb0ecdc01dc (diff) | |
| parent | 1e3a40940d30e76c1736f9aaad3d26727e3370f9 (diff) | |
| download | Chimère - projet Saclay-ecopole.tar.bz2 Chimère - projet Saclay-ecopole.zip | |
Merge branch 'master' into ecopoleecopole
| -rw-r--r-- | static/saclay/css/styles.css | 7 | ||||
| -rw-r--r-- | static/saclay/images/popup/thanks_title.png | bin | 2057 -> 2136 bytes | |||
| -rw-r--r-- | templates/chimere/blocks/map.html | 2 | ||||
| -rw-r--r-- | templates/chimere/blocks/submited.html | 2 | ||||
| -rw-r--r-- | templates/chimere/main_map_simple.html | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css index fa512b6..39732ce 100644 --- a/static/saclay/css/styles.css +++ b/static/saclay/css/styles.css @@ -295,7 +295,7 @@ h3.warn{ } .no-titlebar-small.ui-dialog .ui-dialog-titlebar{ - width:300px; + width:340px; } .no-titlebar.ui-dialog .ui-dialog-titlebar{ @@ -335,6 +335,11 @@ h3.warn{ display:none; } +#cluster_list .dialog-content{ + overflow: auto; + max-height: 380px; +} + #welcome{ opacity:1; padding:0; diff --git a/static/saclay/images/popup/thanks_title.png b/static/saclay/images/popup/thanks_title.png Binary files differindex 3c6ec2c..40bfba5 100644 --- a/static/saclay/images/popup/thanks_title.png +++ b/static/saclay/images/popup/thanks_title.png diff --git a/templates/chimere/blocks/map.html b/templates/chimere/blocks/map.html index 231c143..fe5ea06 100644 --- a/templates/chimere/blocks/map.html +++ b/templates/chimere/blocks/map.html @@ -7,7 +7,7 @@ $(function(){ $('#cluster_list').dialog({'autoOpen':false, 'resizable':false, 'width':340, - 'dialogClass':'no-titlebar'}); + 'dialogClass':'no-titlebar-small'}); }); // --> </script> diff --git a/templates/chimere/blocks/submited.html b/templates/chimere/blocks/submited.html index dfa0228..d571f75 100644 --- a/templates/chimere/blocks/submited.html +++ b/templates/chimere/blocks/submited.html @@ -11,7 +11,7 @@ $("#submited-window").dialog({ modal: true, dialogClass:'no-titlebar-small', - width:300, + width:340, resizable:false, beforeClose: function() { window.location = "{{index_url}}"; diff --git a/templates/chimere/main_map_simple.html b/templates/chimere/main_map_simple.html index dd81d39..552d309 100644 --- a/templates/chimere/main_map_simple.html +++ b/templates/chimere/main_map_simple.html @@ -5,6 +5,8 @@ {% block menu %}{# no menu in simple mode #}{% endblock %} {% block message_edit %}{% endblock %} {% block sidebar %} + <div class='sidebar-handler' id='sidebar-handler-hide'> + </div> <div id='panel'> <a> <h2>{% trans "Categories"%}</h2> |
