Merge branch '0.9.x' into mapstraction

2 files changed, 42 insertions, 11 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 96e169d6d..e5f5df68c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -122,8 +122,15 @@ float:left;
 .form_settings .form_data input {
 margin-left:1.795%;
 float:left;
+}
+.form_settings .form_data input {
 width:39%;
 }
+.form_settings .form_data input.submit,
+.form_settings .form_data input.checkbox,
+.form_settings .form_data input.radio {
+width:auto;
+}
 .form_settings .form_data textarea {
 width:63%;
 }
@@ -165,7 +172,8 @@ font-weight:bold;
 #form_password_recover legend,
 #form_password_change legend,
 .form_entity_block legend,
-#form_filter_bytag legend {
+#form_filter_bytag legend,
+#settings_design_theme legend {
 display:none;
 }
 
@@ -558,7 +566,7 @@ font-weight:bold;
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:74.702%;
+width:73%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -629,9 +637,9 @@ font-style:italic;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:2.35%;
+margin-left:2%;
 margin-bottom:18px;
-width:21%;
+min-width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -1325,16 +1333,16 @@ clear:both;
 margin-bottom:0;
 }
 
-#form_settings_design #settings_design_background-image img {
+#settings_design_background-image img {
 max-width:480px;
 max-height:480px;
 }
 
-#form_settings_design #settings_design_color .form_data,
-#form_settings_design #color-picker {
+#settings_design_color .form_data,
+#color-picker {
 float:left;
 }
-#form_settings_design #settings_design_color .form_data {
+#settings_design_color .form_data {
 width:400px;
 margin-right:28px;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 8799b0b09..6edc66ad2 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -135,7 +135,8 @@ button.close,
 .form_group_leave input.submit,
 .form_user_unsubscribe input.submit,
 .form_group_join input.submit,
-.form_user_subscribe input.submit {
+.form_user_subscribe input.submit,
+.entity_subscribe a {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -178,6 +179,12 @@ background-color:rgba(255, 255, 255, 0.7);
 #site_nav_local_views .current a {
 text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
 }
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
+
 
 .error {
 background-color:#F7E8E8;
@@ -216,7 +223,8 @@ background-position:0 1px;
 .form_group_join input.submit,
 .form_group_leave input.submit,
 .form_user_subscribe input.submit,
-.form_user_unsubscribe input.submit {
+.form_user_unsubscribe input.submit,
+.entity_subscribe a {
 background-color:#AAAAAA;
 color:#FFFFFF;
 }
@@ -225,7 +233,8 @@ color:#FFFFFF;
 background-position:5px -1246px;
 }
 .form_group_join input.submit,
-.form_user_subscribe input.submit {
+.form_user_subscribe input.submit,
+.entity_subscribe a {
 background-position:5px -1181px;
 }
 
@@ -328,3 +337,17 @@ background-position:10% -187px;
 .pagination .nav_next a {
 background-position:105% -252px;
 }
+.pagination .nav .processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+box-shadow:none;
+-moz-box-shadow:none;
+-webkit-box-shadow:none;
+outline:none;
+}
+.pagination .nav_next a.processing {
+background-position:90% 47%;
+}
+.pagination .nav_prev a.processing {
+background-position:10% 47%;
+}
+