Please cherry-pick:

- fixed some CSS stuff

diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index a63d488da27cac98428584e3329602fd290b69f0..f62ff88cff5579d002cf8a92ddbb68e737b1d1d9 100644 (file)
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -47,12 +47,12 @@
                                        <ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
                                        <div class="table_row">
-                                               <div class="table_left_medium">
+                                               <div class="table_left25_medium">
                                                        <h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
                                                </div>
 
-                                               <div class="table_right_medium">
-                                                       <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="7" cols="25" />
+                                               <div class="table_right75_medium">
+                                                       <h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
                                                </div>
 
                                                <div class="clear"></div>

diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css
index 7cf364a860ba9b5112ab15af70a0b2eb1092a0a7..7be9de14fd23af788425e5c5854383f0c5a0102f 100644 (file)
--- a/web/resources/css/cssLayout.css
+++ b/web/resources/css/cssLayout.css
@@ -125,13 +125,13 @@ table, .table, .table_medium {
 }
 
 .table_left25_medium {
-       width: 30px;
+       width: 150px;
        min-height: 20px;
        float: left;
 }
 
 .table_right75_medium {
-       width: 570px;
+       width: 490px;
        min-height: 20px;
        float: right;
 }