wip #5877 @0.5

diff --git a/resources/views/fluidbook_stats/loader.blade.php b/resources/views/fluidbook_stats/loader.blade.php
index bd183460fc8916c2bf489c626d712bf6da0c0270..d37ecc48f5326c45da5a00b568c12b4311b4eabe 100644 (file)
--- a/resources/views/fluidbook_stats/loader.blade.php
+++ b/resources/views/fluidbook_stats/loader.blade.php
@@ -19,7 +19,7 @@
 @endpush
 
 @section('after_styles')
-    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css" />
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/daterangepicker/daterangepicker.css"/>
     <style>
         .chart-header {
             display: flex;
@@ -106,33 +106,42 @@
         }
 
         /*=== Table Column Sorter ===*/
+        #sorttable_sortfwdind, #sorttable_sortrevind {
+            display: none !important;
+        }
+
         .sortable th:not(.sorttable_nosort) {
             cursor: pointer;
             white-space: nowrap;
+            position: relative;
+            font-size: 100% !important;
         }
 
-        .sortable th:not(.sorttable_nosort):after {
-            visibility: hidden; /* only shows on actively sorted column */
-            content: '';
-            display: inline-block;
-            vertical-align: middle;
-            margin-left: 0.5em;
-            margin-top: -0.1em;
-            width: 0;
-            height: 0;
-            border-style: solid;
-            border-width: 0 0.4em 0.6em 0.4em;
-            border-color: transparent transparent currentColor transparent;
-            opacity: 0.6;
+        .sortable th:not(.sorttable_nosort):after, .sortable th:not(.sorttable_nosort):before {
+            position: absolute;
+            content: "\f0d7";
+            font-family: Line Awesome Free;
+            font-weight: normal;
+            font-weight: 900;
+            right: .4em;
+            top: 50%;
+            font-size: 14px !important;
+            line-height: 1;
+            opacity: 0.125;
+        }
+
+        .sortable th:not(.sorttable_nosort):before {
+            content: "\f0d8";
+            top: auto;
+            bottom: 50%;
         }
 
-        .sorttable_sorted_ascending:after {
-            visibility: visible !important;
+        .sortable th:not(.sorttable_nosort).sorttable_sorted_reverse:after {
+            opacity: 1;
         }
 
-        .sorttable_sorted_descending:after {
-            visibility: visible !important;
-            transform: rotate(180deg);
+        .sortable th:not(.sorttable_nosort).sorttable_sorted:before {
+            opacity: 1;
         }
 
         .whitespace-nowrap {

diff --git a/resources/views/fluidbook_stats/summary.blade.php b/resources/views/fluidbook_stats/summary.blade.php
index 0b70ff8c8bfffff7d12f70087ae44005a628e04d..b695a009e32a204d4a974aa5996cb41d348f7720 100644 (file)
--- a/resources/views/fluidbook_stats/summary.blade.php
+++ b/resources/views/fluidbook_stats/summary.blade.php
@@ -97,7 +97,7 @@
         <thead>
         <tr>
             @foreach ($table_map['summary'] as $summary_heading_key => $summary_heading)
-                <th @if($summary_heading_key === 'formatted_date')class="sorttable_sorted_reverse"@endif>
+                <th>
                     {{ $summary_heading }}
                 </th>
             @endforeach
@@ -129,8 +129,7 @@
         <tr>
             @foreach ($table_map['per-page'] as $page_data_heading_key => $page_data_heading)
                 {{-- In the case of the "page_group" data, we want it to be sorted in ascending order by default, even though it's a numeric column --}}
-                <th @if($page_data_heading_key === 'page_group')class="sorttable_sorted"
-                    data-sort-direction="ascending"@endif>
+                <th @if($page_data_heading_key === 'page_group')@endif>
                     {{ $page_data_heading }}
                 </th>
             @endforeach