Change layout of settings

2 files changed, 29 insertions, 14 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index 707f44630e1..cc0dffd3b7f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -26,28 +26,25 @@
         <thead>
         <% if @subcategory.key == @category.key && !category_desc(@category).blank? -%>
           <tr>
-            <td class="categoryDescription"><%= category_desc(@category) -%> </td>
+            <td class="categoryDescription" colspan="2"><%= category_desc(@category) -%> </td>
           </tr>
         <% end -%>
         <% if @subcategory.key != @category.key && !subcategory_desc(@category, @subcategory).blank? -%>
           <tr>
-            <td class="categoryDescription"><%= subcategory_desc(@category, @subcategory) -%> </td>
+            <td class="categoryDescription" colspan="2"><%= subcategory_desc(@category, @subcategory) -%> </td>
           </tr>
         <% end -%>
         </thead>
         <tbody>
         <% by_property_index_or_name(@definitions).each do |property| -%>
-          <tr class="property <%= cycle('even', 'odd', :name => 'properties') -%>">
-            <td style="padding: 10px" id="block_<%= property.key -%>">
+          <tr class="property" id="block_<%= property.key -%>">
+            <th>
               <h3>
                 <div><%= property_name(property) -%></div>
                 <div class="note"><%= property.key -%></div>
               </h3>
-              <% desc=property_description(property) -%>
-              <% unless desc.blank? %>
-                <p class="marginbottom10"><%= desc -%></p>
-              <% end -%>
-
+            </th>
+            <td>
               <% value = property_value(property) -%>
               <% if property.multi_values -%>
                 <% value.each_with_index do |sub_value, index| -%>
@@ -68,11 +65,16 @@
               <% unless default_prop_value.blank? -%>
                 <div class="note"><%= message('default') %>: <%= property.type.to_s=='PASSWORD' ? '********' : h(default_prop_value) -%></div>
               <% end -%>
+
+              <% desc=property_description(property) -%>
+              <% unless desc.blank? %>
+                <p class="marginbottom10"><%= desc -%></p>
+              <% end -%>
             </td>
           </tr>
         <% end -%>
-
         </tbody>
+
       </table>
 
       <% unless @definitions.empty? %>
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 98455cbd1de..f452f6f5aae 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2430,17 +2430,30 @@ textarea.width100 {
   box-sizing: border-box; /* Opera/IE 8+ */
 }
 
-.property table.data > tbody > tr > td {
+.property {
+  margin-bottom: 10px:
+}
+
+.property > th, .property > td {
   vertical-align: top;
+  padding-right: 10px;
+  padding-left: 10px;
+  padding-bottom: 10px;
+}
+
+.property > th {
+  text-align: right;
+  width: 1px;
+  max-width: 380px;
 }
 
 .property table.data {
   width: auto;
-  min-width: 600px;
+  min-width: 480px;
 }
 
-.property table.data > thead > tr > th {
-  vertical-align: top;
+.property table.data input {
+  max-width: 200px;
 }
 
 /* ------------------- Accordion navigation styles ------------------- */