Merge branch 'master-v3.0' into saclay-v3.0

Conflicts:
	version.py

2 files changed, 6 insertions, 1 deletions

diff --git a/static/saclay/css/styles.css b/static/saclay/css/styles.css
index 62ab838..c2c20ee 100644
--- a/static/saclay/css/styles.css
+++ b/static/saclay/css/styles.css
@@ -742,6 +742,10 @@ a#ui-active-menuitem.ui-state-hover{
     display:block;
 }
 
+#frm-edit-marker{
+    padding-bottom: 35px;
+}
+
 #content{
     border:none;
     padding:0;
@@ -1815,6 +1819,7 @@ input.hasDatepicker{
 
 #add_media,
 #proposition_form_submit{
+    padding: 15px 0;
     width:278px;
     display:block;
     height:25px;
diff --git a/version.py b/version.py
index b0eab13..d59b1fd 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 from chimere.version import VERSION
 
-SACLAY_MINOR = 12
+SACLAY_MINOR = 9
 SACLAY_VERSION = list(VERSION) + [SACLAY_MINOR]