Merge branch 'master' of github.com:piwik/piwik2.2.0-rc1

1 files changed, 10 insertions, 6 deletions

diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index 2eb7f8c82c..e763398e30 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -395,7 +395,7 @@ table.dataTable {
                 .font-default(10px, 12px);
                 padding-top: 12px;
                 padding-bottom: 12px;
-                border-bottom: 1px solid @silver-80;
+                border-bottom: 1px solid @silver-85;
                 &.columnSorted {
                     background:  @silver-95 !important;
                     .sortIcon {
@@ -407,7 +407,7 @@ table.dataTable {
     }
     tr {
         td {
-            border-color: @silver-80 !important;
+            border-color: @silver-85 !important;
             color: @brand-black;
             background: @silver-95;
 
@@ -493,8 +493,12 @@ table.dataTable .dataTableRowActions {
 }
 
 .dataTableFooterIcons {
-    padding: 6px 8px;
-    border-top: 1px solid @silver-80;
+  padding: 6px 8px;
+  border-top: 1px solid @silver-80;
+}
+
+#dashboard .dataTableFooterIcons {
+    padding: 0px 8px 6px;
 }
 
 div.sparkline {
@@ -900,13 +904,13 @@ table#editSites {
 
 #multisites table.dataTable {
     thead tr th {
-        background: @silver-95 !important;
+        background: @theme-color-background-base;
     }
     td {
         background: white;
     }
     tr:hover td {
-        background: #f8f8f8;
+        background: #f2f2f2;
     }
     tfoot tr:hover td {
         background: white;