remove the CSS class 'data2' => reverted to 'data'

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_filters/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_filters/index.html.erb
index 7b7f6c41e3b8d754cfdb524ead698b15416bd3ec..9569c7005557acc4f58c6f841943e3da42bfb8f7 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/admin_filters/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/admin_filters/index.html.erb
@@ -1,7 +1,7 @@
 <h1>Default filters</h1>
 <p>These filters are displayed on the homepage.</p>
 <br/>
-<table class="data2 width100" id="admin_console">
+<table class="data width100" id="admin_console">
   <thead>
     <tr>
       <th>Name</th>
@@ -43,7 +43,7 @@
 <h1>Shared filters</h1>
 <p>These filters are shared by administrators and can be added to default filters.</p>
 <br/>
-<table class="data2 width100" id="shared">
+<table class="data width100" id="shared">
   <thead>
     <tr>
       <th>Name</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb
index 6eeebbdf823d654fec5d98c6ce7be33400e7bbd1..24d85d03a610df0d58edb335b985d6cd6b47e7c4 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/alerts/index.html.erb
@@ -22,7 +22,7 @@
 <p id="alerts">No alerts.</p>
 <% else %>
 
-  <table class="data2 width100 marginbottom10" id="alerts">
+  <table class="data width100 marginbottom10" id="alerts">
     <thead><tr><th></td></th></tr></thead>
     <tbody>
       <% for alert in @alerts %>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/event_categories/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/event_categories/index.html.erb
index 34af2688d04d4a030a06a9d25dc1307a7ec7b481..7ce1cdb16402ec17fa23cf3df280d558a628911d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/event_categories/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/event_categories/index.html.erb
@@ -1,7 +1,7 @@
 <table width="100%">
   <tr>
     <td valign="top">
-      <table class="sortable data2 width100" id="event_categories">
+      <table class="sortable data width100" id="event_categories">
         <thead>
           <tr>
             <th class="left">Name</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
index d373dd0bd27dfd49b2e6cb6c3ef7817e4641d24b..e93191e52b52decf770a54a00ee928cb260679c6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/filters/_list.html.erb
@@ -1,6 +1,6 @@
 <% filter=data.filter %>
 <div class="tabs-panel marginbottom10">
-<table class="data2 nowrap width100" id="results">
+<table class="data nowrap width100" id="results">
   <thead id="results-head">
     <tr>
       <th width="1%"></th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
index 723c1d74d44c319048e49a01aa43a68f62ad90b8..a2e41ce838b55ebc8bda37e0aee4ca35c358368a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/groups/index.html.erb
@@ -3,7 +3,7 @@
     <td valign="top">
       <h1 class="marginbottom10">Groups</h1>
 
-      <table class="data2 width100" id="groups">
+      <table class="data width100" id="groups">
         <thead>
           <tr>
             <th class="left">Name</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb
index caa56958a6cc08e1f2b4c5a5039d7ad337399b30..d371750b7d95d21a079ffa32871587a5730f2807 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/ie6/index.css.erb
@@ -47,24 +47,24 @@ div#page {
   background-color: #eee;
   color: #333333;
 }
-table.data2  tbody  tr {
+table.data  tbody  tr {
   border-left: 1px solid #ddd;
   border-right: 1px solid #ddd;
 }
-table.data2 thead tr {
+table.data thead tr {
   height: 20px;
   border: 0;
 }
-table.data2 thead tr th, table.data2 tbody tr td {
+table.data thead tr th, table.data tbody tr td {
   border-bottom: 1px solid #DDD;
   padding: 3px 5px;
   height: 20px;
   vertical-align: top;
 }
-table.data2 thead tr th {
+table.data thead tr th {
   font-weight: bold;
 }
-table.data2 tfoot tr td {
+table.data tfoot tr td {
   border-bottom: 0;
   padding: 3px 5px;
 }

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
index 5d2d4b3062c300cba718e1952e0fab10e202f1d5..7c1c0f6da9a4b14710cee0fed2f76f67f2a5cc3c 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/metrics/index.html.erb
@@ -1,7 +1,7 @@
 <table width="100%">
   <tr>
     <td valign="top">
-      <table class="sortable data2 width100" id="metrics">
+      <table class="sortable data width100" id="metrics">
         <thead>
           <tr>
             <th class="left">Name</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/available.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/available.html.erb
index fae9a34652f95eef81d10eb5e5d9a33fbc207958..4e2e0e3071b14c351fb3e2af544b67d67749503f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/available.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/available.html.erb
@@ -17,7 +17,7 @@
   <% @updates_by_category.keys.sort_by{|c| c.downcase }.each do |category|
        updates=@updates_by_category[category]
   %>
-    <table class="data2 width100" id="category-<%= u category -%>">
+    <table class="data width100" id="category-<%= u category -%>">
       <thead>
         <tr>
           <th colspan="2"><h2><%= category -%></h2></th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/index.html.erb
index 09c7f17a6a91a38ddae11ba0741ce0fc98fea96d..c3b89859719eda6a151a52afcee94231bfab7471 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/index.html.erb
@@ -12,7 +12,7 @@
 <div class="tabs-panel">
 
 <h2>User-installed plugins</h2>
-<table class="data2 width100" id="user-plugins">
+<table class="data width100" id="user-plugins">
   <thead>
     <tr>
       <th>Plugin</th>
@@ -47,7 +47,7 @@
 <div class="break30"> </div>
 
 <h2>System plugins</h2>
-<table class="data2 width100" id="core-plugins">
+<table class="data width100" id="core-plugins">
   <thead><tr>
     <th>Plugin</th>
     <th>Description</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/updates.html.erb
index c3c0b905c2258ca38b9acf2894d9690aeeec4e93..ad470b38b1ab58a5f9917e5beefeb967a6c35d48 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/plugins/updates.html.erb
@@ -13,7 +13,7 @@
 <%= render :partial => 'plugins/downloads' %>
 
 <% if @center %>
-  <table class="data2 width100" id="plugin-updates">
+  <table class="data width100" id="plugin-updates">
     <thead>
         <tr>
           <th colspan="3"><h2>User-installed plugins</h2></th>
@@ -40,7 +40,7 @@
     </tbody>
   </table>
   <br/>
-  <table class="data2 width100" id="system-updates">
+  <table class="data width100" id="system-updates">
     <thead>
         <tr>
           <th colspan="2"><h2>System</h2></th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
index 166236e64816d655b650574911e39c1ead475515..d402cf272b588969e7e4e7e9a0a6d9980edf6ca6 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
@@ -67,7 +67,7 @@
   </form>
 <% end %>
 
-<table class="data2 width100" id="profiles_<%= language.getKey() -%>">
+<table class="data width100" id="profiles_<%= language.getKey() -%>">
     <thead>
       <tr>
         <th class="left">Name</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb
index 06d481b1e124d8a3567df930254cf770eb676921..0b1bd2acd4d15f31e86e17399e3396aeedb3ee65 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb
@@ -7,7 +7,7 @@
          <p>No permalinks</p>
        <% else %>
          <br/>
-         <table class="data2 without-header marginbottom10" id="permalinks-table">
+         <table class="data without-header marginbottom10" id="permalinks-table">
            <tbody>
            <% exporters.to_a.sort{|x,y| x.getName() <=> y.getName()}.each do |exporter| %>
              <tr class="<%= cycle('even','odd') -%>">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
index 4b99be75af5cbb5d828f6c45d58048613ea6284a..1c2f3847cc3fc93c37b6bee2d9e1872bed1bb386 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/project_roles/index.html.erb
@@ -1,5 +1,5 @@
 <h1 class="marginbottom10">Project roles</h1>
-<table class="data2 width100">
+<table class="data width100">
   <thead>
   <tr>
     <th>Role</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
index 77cc3e57d70741e56905c706e59c2b2bb412e584..06498d1c12af1dfaff4819f86e978702adeb987d 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb
@@ -1,6 +1,6 @@
 <h1 class="marginbottom10">Global roles</h1>
 
-<table class="data2 width100" id="global-roles">
+<table class="data width100" id="global-roles">
   <thead>
   <tr >
     <th>Role</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
index e1cd91c3626de26533d678e52af2d157bb77f1b0..05066f0b443fb5bc2f27c82270beeeedeb85e998 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/projects.html.erb
@@ -1,6 +1,6 @@
 <h1 class="marginbottom10">Default roles for new projects</h1>
 
-<table class="data2 width100" id="default-project-roles">
+<table class="data width100" id="default-project-roles">
   <thead>
   <tr >
     <th>Role</th>
@@ -50,7 +50,7 @@
 
 <h1 class="marginbottom10">Projects</h1>
 
-<table class="data2 width100" >
+<table class="data width100" >
   <thead>
   <tr >
     <th>Project</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
index dcf9a5fce7745fd75856695a8da2e165d2e65a76..f185119243108c81a9823d921a0f2f24c9313970 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
@@ -98,7 +98,7 @@
      <% if @hidden_inactives && @hidden_inactives>0 %><span class="small">[<a href="<%= url_for params.merge({:rule_status => ''}) -%>" id="inactive-rules-link">+<%= @hidden_inactives -%> found in inactive rules</a>]</span><% end %>
   </h2>
 </div>
-<table class="data2 width100 marginbottom10" id="result_table">
+<table class="data width100 marginbottom10" id="result_table">
   <thead>
     <tr>
         <th class="left" nowrap>Active/Priority</th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
index 68aedf8ba2adff5239ef04c9f9c86cc884006beb..6e7330c34857a0eff0887769dc56873939c1bee8 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/system/index.html.erb
@@ -4,7 +4,7 @@
   </li>
 </ul>
 
-<table class="data2 width100" id="system_info">
+<table class="data width100" id="system_info">
 <thead>
   <tr>
     <th colspan="2"><h2>System Info</h2></th>
@@ -20,7 +20,7 @@
 
 <br/>
 
-<table class="data2 width100" id="sonar">
+<table class="data width100" id="sonar">
 <thead>
   <tr>
     <th colspan="2"><h2>Sonar Info</h2></th>
@@ -36,7 +36,7 @@
 
 <br/>
 
-<table class="data2 width100" id="memory">
+<table class="data width100" id="memory">
 <thead>
   <tr>
     <th colspan="2"><h2>Java VM Statistics</h2></th>
@@ -52,7 +52,7 @@
 
 <br/>
 
-<table class="data2 width100" id="database">
+<table class="data width100" id="database">
 <thead>
   <tr>
     <th colspan="2"><h2>Database Statistics</h2></th>
@@ -68,7 +68,7 @@
 
 <br/>
 
-<table class="data2 width100" id="plugins">
+<table class="data width100" id="plugins">
 <thead>
   <tr>
     <th colspan="2"><h2>Sonar Plugins</h2></th>
@@ -84,7 +84,7 @@
 
 <br/>
 
-<table class="data2 width100" id="system_properties">
+<table class="data width100" id="system_properties">
 <thead>
   <tr>
     <th colspan="2"><h2>System Properties</h2></th>

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
index f2106c73260bae5a55e46349ecbf5332d61ae424..866363428b66378cc9ae80e813c2a51a5b7ce58b 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/users/index.html.erb
@@ -2,7 +2,7 @@
   <tr>
     <td valign="top">
       <h1 class="marginbottom10">Users</h1>
-      <table class="data2 width100 sortable" id="users">
+      <table class="data width100 sortable" id="users">
         <thead>
           <tr>
             <th class="left">Login</th>

diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index 8f82420b770274e9612ae7b4fe1a485157a32e45..e986ba12579bb710622ad4b531c79e9a4b460e3c 100644 (file)
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -429,32 +429,33 @@ h4, .h4 {
   background-color: #4b9fd5;
   color: #fff;
 }
-table.data thead th {
+table.data > thead > tr > th {
   font-size: 93%;
-  padding: 3px 7px 3px 3px;
+  padding: 4px 7px 4px 3px;
+  font-weight: bold;
 }
-table.data tfoot td {
+table.data > tfoot > tr > td {
   font-size: 93%;
   color: #777;
-  padding: 3px 0 3px 10px;
+  padding: 4px 0 4px 10px;
 }
 
-table.data tbody td {
-  padding: 3px 7px 3px 3px;
-  vertical-align: middle;
+table.data > tbody > tr > td {
+  padding: 4px 7px 4px 3px;
+  vertical-align: text-top;
 }
 table.data td.small, table.data th.small {
   padding: 0;
   white-space: nowrap;
 }
 table.data th img, table.data td img {
-  vertical-align: middle;
+  vertical-align: top;
 }
 .data thead tr.total {
   background-color: #eee;
   font-weight: normal;
-  border-bottom: 1px solid silver;
-  border-top: 1px solid silver;
+  border-bottom: 1px solid #ddd;
+  border-top: 1px solid #ddd;
 }
 .data thead tr.total th {
   font-weight: normal;
@@ -468,6 +469,9 @@ table.data th img, table.data td img {
   border-top: 1px solid #4B9FD5;
   border-bottom: 1px solid #4B9FD5;
 }
+.data input, .data select, .data button {
+  vertical-align: baseline;
+}
 .hoverable:hover {
   background-color: #CAE3F2;
 }
@@ -1355,8 +1359,14 @@ h4 a, h4 a:visited, .gray, table.data tfoot a, table.data tfoot a:visited {
   background-color: #f4f4f4;
 }
 
-.bordered, table.data thead, table.data tbody {
-  border-bottom: 1px solid silver;
+.bordered, table.data > thead {
+  border-bottom: 1px solid #ddd;
+}
+
+table.data > tbody {
+  border-bottom: 1px solid #ddd;
+  border-right: 1px solid #ddd;
+  border-left: 1px solid #ddd;
 }
 
 table.data, table.spaced, .gwt-SourcePanel .sources {
@@ -1417,48 +1427,6 @@ ul.horizontal li {
 table.nowrap td, td.nowrap {
   white-space: nowrap;
 }
-
-table.data2 {
-  border-collapse: collapse;
-}
-table.without-header {
-  border-top: 1px solid #ddd;
-}
-table.data2 > tbody > tr {
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-}
-table.data2 > thead > tr {
-  height: 18px;
-  border: 0;
-}
-table.data2 > thead > tr > th, table.data2 > tbody > tr > td {
-  border-bottom: 1px solid #DDD;
-  padding: 4px 5px 0px 5px;
-  height: 20px;
-  vertical-align: top;
-}
-table.data2 > thead > tr > th {
-  font-weight: bold;
-}
-table.data2 > tfoot > tr > td {
-  border-bottom: 0;
-  padding: 3px 5px;
-}
-table.data2 td, table.data2 td a, table.data2 th, table.data2 th a {
-  color: #444;
-}
-table.data2 img {
-  vertical-align: text-bottom;
-}
-table.data2 input, table.data2 select {
-  vertical-align: baseline;
-}
-.data2 tr.highlight {
-  background-color: #CAE3F2;
-  border-top: 1px solid #4B9FD5;
-  border-bottom: 1px solid #4B9FD5;
-}
 .background-gray {
   background-color: #f4f4f4;
   color: #555;