wip #5877 @0.5

diff --git a/app/Fluidbook/Stats.php b/app/Fluidbook/Stats.php
index e80838a329c8c1f5983d3ca7e852c985727d1546..dbc1e60c154c0e4615eeb03b955d3ec6ce5eb9ab 100644 (file)
--- a/app/Fluidbook/Stats.php
+++ b/app/Fluidbook/Stats.php
@@ -266,7 +266,7 @@ class Stats extends Reporting
                 'label' => __('Visites'),
                 'backgroundColor' => '#f54d00', // Could make bars semi-transparent if desired
                 'borderColor'=> '#000000',
-                'borderWidth'=> 1,
+                'borderWidth'=> .75,
                 'data' => $this->_pagesByPeriod->pluck('nb_visits')->toArray(),
                 'order' => 1,
                 'bar_offset' => -5, // Negative offset shifts bar to left
@@ -276,7 +276,7 @@ class Stats extends Reporting
                 'label' => __('Pages vues'),
                 'backgroundColor' => '#514e49',
                 'borderColor'=> '#000000',
-                'borderWidth'=> 1,
+                'borderWidth'=> .75,
                 'data' => $this->_pagesByPeriod->pluck('nb_hits')->toArray(),
                 'order' => 2,
                 'bar_offset' => 5, // Positive offset shifts bar to right
@@ -291,7 +291,7 @@ class Stats extends Reporting
                     'label' => __('Visiteurs uniques'),
                     'backgroundColor' => 'hsl(72 100% 38% / 100%)',
                     'borderColor'=> '#000000',
-                    'borderWidth'=> 1,
+                    'borderWidth'=> .75,
                     'data' => $this->_pagesByPeriod->pluck('nb_uniq_visitors')->toArray(),
                     'order' => 1,
                     'bar_offset' => -8, // Negative offset shifts bar to left

diff --git a/public/packages/fluidbook/toolbox/css/style.less b/public/packages/fluidbook/toolbox/css/style.less
index b26f695ebbe49886f8460bc064a0ca7a30611e1e..ce342f71470372ecdc9df02d23668035066c4caa 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/style.less
+++ b/public/packages/fluidbook/toolbox/css/style.less
@@ -269,8 +269,12 @@ a, a.btn-link, a:not([href]):not([tabindex]) {
     background: @sidebar-active;
 }
 
-.table-striped tbody tr:nth-of-type(2n) {
-    background-color: transparent;
+table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) {
+    background-color: #fff;
+}
+
+table.dataTable th{
+    background-color: #fafafa;
 }
 
 .dropdown-item.active, .dropdown-item:active {

diff --git a/resources/views/fluidbook_stats/loader.blade.php b/resources/views/fluidbook_stats/loader.blade.php
index d37ecc48f5326c45da5a00b568c12b4311b4eabe..c3a580f439155b2b422651da1593a2490bfc7177 100644 (file)
--- a/resources/views/fluidbook_stats/loader.blade.php
+++ b/resources/views/fluidbook_stats/loader.blade.php
@@ -27,31 +27,6 @@
             justify-content: space-between;
         }
 
-        .summary {
-            display: grid;
-            grid-template-columns: max-content 1fr;
-        }
-
-        .summary dt, .summary dd {
-            margin: 0;
-            padding: 0.5em;
-        }
-
-        .summary dt {
-            display: flex;
-            align-items: center;
-            white-space: nowrap;
-            padding-right: 2em;
-        }
-
-        .summary dt:nth-of-type(odd), .summary dd:nth-of-type(odd), table.stats-details tbody tr:nth-of-type(odd) {
-            background-color: #f4f4f4;
-        }
-
-        .summary dt:nth-of-type(even), .summary dd:nth-of-type(even), table.stats-details tbody tr:nth-of-type(even) {
-            background-color: #eaeaea;
-        }
-
         table.stats-details {
             width: 100%;
             table-layout: fixed;
@@ -64,11 +39,11 @@
         table.stats-details thead tr {
             position: sticky;
             top: 0;
-            background-color: #fff;
+            background-color: #fafafa;
         }
 
-        table.stats-details tbody tr:hover td {
-            background-color: rgba(156, 195, 34, 0.15);
+        table.stats-details thead th{
+            border-bottom: medium solid rgba(0,40,100,.12);
         }
 
         [data-name="formatted_date"] {

diff --git a/resources/views/fluidbook_stats/summary.blade.php b/resources/views/fluidbook_stats/summary.blade.php
index fa688b561efd1858aeb523ebb4bc283c6d7b7620..163a5c73ee736f8ae7ad25609f9c2e7b7541871d 100644 (file)
--- a/resources/views/fluidbook_stats/summary.blade.php
+++ b/resources/views/fluidbook_stats/summary.blade.php
@@ -3,7 +3,7 @@
 {{-- This doesn't extend any templates because it is fetched from loader.blade.php and injected via JS --}}
 
 @php
-    $tableClasses='sortable bg-white table table-striped table-hover nowrap rounded shadow-xs border-xs mt-2 dataTable dtr-inline';
+    $tableClasses='stats-details sortable bg-white table table-striped table-hover nowrap rounded shadow-xs border-xs mt-2 dataTable dtr-inline';
 @endphp
 
 <h2 class="mt-4">