dfm_web 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd9352ce1a7db68e5c88c39e7992eb627a7ca3d
-  data.tar.gz: b1ef7521f408fd330f209121d95257d8457f3e8e
+  metadata.gz: 4add4c6aacd2593dffc57d635e1926cde90d9a8b
+  data.tar.gz: 32474a6cd49b4556802ef6996551cb1e00a2f3da
 SHA512:
-  metadata.gz: 39f08f0c84a6d34501666636d7c2ea9866b2c2cde2c5079eb33401894ee63021726aba81360bb150a03f8f6cd3d64fa7f7c1a666f9a654bb46994e14df78a704
-  data.tar.gz: c5747cd5114e5f24ef6fae279fa239b14e9bab5792d0d44b649c51eaf063e9ef9b5df11b99a212b03b383e62e809cf65945e1f25ad4ec81118bbf50947e36f9d
+  metadata.gz: e81d61b9a47f51cd10c1f81a51f1dd4d7e96a5063400b6cee7c389f70fb756a65991cef144a763a4919483e34fc6b074f686d9c04ba622d566660e9241e50ec1
+  data.tar.gz: 6b7a349bd1accf222e972143293f9759459cf9a2fc924c3f1757ada571e23d0ec9674f5f44857b6c22bd5c612f8ae76a71fa20faf2955fbf874cfd02aa498808

data/app/assets/stylesheets/dfm_web/tables.css

@@ -119,34 +119,47 @@ table.tablesorter thead th.sorter-false {
 
 /* Zebra & modifier classes */
 
-tr.highlight td {
-  background-color: rgba(255, 255, 0, 0.16);
-  border-color: rgba(128, 128, 0, 0.25);
+/* Backgrounds */
+table tr.okay td      { background-color: rgba(0, 255, 0, 0.11); }
+table tr.highlight td { background-color: rgba(255, 255, 0, 0.16); }
+table tr.warn td      { background-color: rgba(255, 147, 0, 0.11); }
+table tr.alert td     { background-color: rgba(255, 0, 0, 0.09); }
+table tr.gray td      { background-color: rgba(0, 0, 0, 0.1); }
+
+
+/* darken even rows */
+
+/* No modifier */
+.tablesorter-default tr.even td, tbody tr:nth-child(even) td {
+  background-color: rgba(128,128,128,.03);
 }
-.tablesorter-default tr.highlight.even td,
-tbody tr.highlight:nth-child(even) td {
-  /* tablesorter zebra highlight need to be a little darker */
-  background-color: rgba(200, 200, 0, 0.16);
+
+/* okay */
+.tablesorter-default tr.okay.even td, tbody tr.okay:nth-child(even) td {
+  background-color: rgba(0, 200, 0, 0.11);
 }
 
-tr.warn td {
-  color: #cd0000;
-  background-color: rgba(255, 230, 230, .3);
-  border-color: rgba(255, 0, 0, 0.25);
+/* highlight */
+.tablesorter-default tr.highlight.even td, tbody tr.highlight:nth-child(even) td {
+  background-color: rgba(200, 200, 0, 0.16);
 }
-.tablesorter-default tr.warn.even td,
-tbody tr.warn:nth-child(even) td {
-  /* tablesorter zebra warn need to be a little darker */
-  background-color: rgba(255, 150, 150, .12);
+
+/* warn */
+.tablesorter-default tr.warn.even td, tbody tr.warn:nth-child(even) td {
+  background-color: rgba(200, 120, 0, 0.14);
 }
 
+/* alert */
+.tablesorter-default tr.alert.even td, tbody tr.alert:nth-child(even) td {
+  background-color: rgba(200, 0, 0, .12);
+}
 
-/* darken even rows */
-.tablesorter-default tr.even td,
-tbody tr:nth-child(even) td {
-  background-color: rgba(128,128,128,.03);
+/* gray */
+.tablesorter-default tr.gray.even td, tbody tr.gray:nth-child(even) td {
+  background-color: rgba(0, 0, 0, 0.12)
 }
 
+
 table tfoot tr{
   transition: box-shadow 0.4s;
 }

data/lib/dfm_web/version.rb

@@ -1,10 +1,11 @@
 module DfmWeb
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end
 
 
 # Version History
 
+# 2.1.3   New Table TR modifier classes: okay, highlight, warn, alert, gray.
 # 2.1.2   Add submit buttons w/ modifier classes below "button" links with the same classes to the kitchen sink.
 # 2.1.1   Eliminate a visual jump when resizing from L to XL.
 # 2.1.0   Updated the print version of the "paper" class so it matches the screen version as it should.

data/spec/dummy/app/views/application/_tablesorter.html.erb

@@ -3,112 +3,26 @@
   <thead>
     <tr>
       <th class="sorter-false">Side TH</th>
-      <th>String</th>
+      <th>TR Class</th>
       <th>Date</th>
       <th>Number</th>
     </tr>
   </thead>
 
   <tbody>
-    <tr>
-      <th>Row 1</th>
-      <td>Apple</td>
-      <td>2017-01-11</td>
-      <td>4</td>
-    </tr>
-
-    <tr>
-      <th>Row 2</th>
-      <td>Cucumber</td>
-      <td>2014-03-11</td>
-      <td>3</td>
-    </tr>
-
-    <tr>
-      <th>Row 3</th>
-      <td>Banana</td>
-      <td>2018-03-20</td>
-      <td>6</td>
-    </tr>
-
-
-    <tr class="warn">
-      <th>Row 4</th>
-      <td>warn</td>
-      <td>2011-03-07</td>
-      <td>-9</td>
-    </tr>
-
-    <tr class="warn">
-      <th>Row 5</th>
-      <td>warn</td>
-      <td>2015-03-08</td>
-      <td>-11</td>
-    </tr>
-
-    <tr class="warn">
-      <th>Row 6</th>
-      <td>warn</td>
-      <td>2015-03-09</td>
-      <td>-17</td>
-    </tr>
-
-    <tr class="warn">
-      <th>Row 7</th>
-      <td>warn</td>
-      <td>2015-03-09</td>
-      <td>-2</td>
-    </tr>
 
+  <% counter = 0 %>
+  <% [nil, 'okay', 'highlight', 'warn', 'alert', 'gray'].each do |tr_class| %>
+    <% 4.times do %>
+      <tr class="<%= tr_class %>">
+        <th>Row <%= counter += 1 %></th>
+        <td><%= tr_class || 'n/a' %></td>
+        <td><%= Date.today - rand(2000).days %></td>
+        <td><%= (-100 .. 100).to_a.sample %></td>
+      </tr>
+    <% end %>
+  <% end %>
 
-    <tr class="highlight">
-      <th>Row 8</th>
-      <td>highlight</td>
-      <td>2018-03-20</td>
-      <td>22</td>
-    </tr>
-
-    <tr class="highlight">
-      <th>Row 9</th>
-      <td>highlight</td>
-      <td>2014-03-20</td>
-      <td>22</td>
-    </tr>
-
-    <tr class="highlight">
-      <th>Row 10</th>
-      <td>highlight</td>
-      <td>2018-03-20</td>
-      <td>22</td>
-    </tr>
-
-    <tr class="highlight">
-      <th>Row 11</th>
-      <td>highlight</td>
-      <td>2018-03-20</td>
-      <td>22</td>
-    </tr>
-
-    <tr>
-      <th>Row 12</th>
-      <td>Cake</td>
-      <td>2014-03-11</td>
-      <td>1</td>
-    </tr>
-
-    <tr>
-      <th>Row 13</th>
-      <td>Donut</td>
-      <td>2011-08-22</td>
-      <td>2</td>
-    </tr>
-
-    <tr>
-      <th>Row 14</th>
-      <td>Egg</td>
-      <td>2011-08-21</td>
-      <td>3</td>
-    </tr>
 
   </tbody>