Merge branch 'dev'

USDA-FSA · Apr 19, 2017 · cd8f739 · cd8f739
2 parents e9b1168 + 51bb07c
commit cd8f739
Show file tree

Hide file tree

Showing 14 changed files with 119 additions and 346 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pcp-design",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/component_content-tabs.html b/src/component_content-tabs.html
@@ -59,6 +59,10 @@ <h3 class="fsa-font--sans">Justified</h3>
 
         {% include: 'includes/pcp-content-tabs__justified.html' %}
 
+        <h3 class="fsa-font--sans">Justified Equal</h3>
+
+        {% include: 'includes/pcp-content-tabs__justified-equal.html' %}
+
         <h2 class="fsa-font--sans">Samples</h2>
 
         <h3 class="fsa-font--sans">Mapping</h3>

diff --git a/src/includes/pcp-adjust__state.html b/src/includes/pcp-adjust__state.html
@@ -6,48 +6,48 @@ <h3 class="pcp-adjust__title">{{ title }}</h3>
     <table class="pcp-adjust__table">
       <thead>
         <tr>
-          <th colspan="3" class="pcp-adjust__th pcp-adjust__th--first" scope="col" title="State">State</th>
-          <th colspan="2" class="pcp-adjust__th" scope="col" title="Market">Mkt</th>
-          <th colspan="3" class="pcp-adjust__th pcp-adjust__th--bisect" scope="col" title="Change">Chg</th>
-          <th colspan="4" class="pcp-adjust__th pcp-adjust__th--last pcp-adjust__th--adj" scope="col" title="Adjustment">Adjust</th>
+          <th colspan="6" class="pcp-adjust__th pcp-adjust__th--first" scope="col" title="State">State</th>
+          <th colspan="6" class="pcp-adjust__th pcp-adjust__th--bisect" scope="col" title="Market">Market</th>
+          <th colspan="7" class="pcp-adjust__th pcp-adjust__th--adj" scope="col" title="Adjustment">Adjust</th>
+          <th colspan="3" class="pcp-adjust__th pcp-adjust__th--number pcp-adjust__th--last pcp-adjust__th--adj" scope="col" title="Change">Chg</th>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Kansas">KS</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">0.01</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55sefj9fa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Kansas">KS</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__55sefj9fa' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__55sefj9fa"></span></td>
         </tr>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Oklahoma">OK</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">0.01</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5shod21a' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Oklahoma">OK</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5shod21a' @VALUE:'-0.03' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__5shod21a"></span></td>
         </tr>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Colorado">CO</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">-0.01</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssthi9' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Colorado">CO</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssthi9' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__5sssthi9">-0.08</span></td>
         </tr>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Nebraska">NE</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">0.02</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5ss66h' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="Nebraska">NE</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5ss66h' @VALUE:'-0.05' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__5ss66h"></span></td>
         </tr>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="South Dakota">SD</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">0.00</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssssh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="South Dakota">SD</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5sssssh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__5sssssh"></span></td>
         </tr>
         <tr>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="California">CA</abbr></td>
-          <td colspan="2" class="pcp-adjust__td"><abbr title="Gulf">GLF</abbr></td>
-          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--bisect">0.07</td>
-          <td colspan="4" class="pcp-adjust__td pcp-adjust__td--last pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5s553fdgsh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--first"><abbr title="California">CA</abbr></td>
+          <td colspan="6" class="pcp-adjust__td pcp-adjust__td--bisect"><abbr title="Gulf">GLF</abbr></td>
+          <td colspan="7" class="pcp-adjust__td pcp-adjust__td--adj pcp-adjust__td--editable">{% include: 'includes/spinbox.html' @ID:'lorem-ipsum-amount__5s553fdgsh' @VALUE:'0.00' @STEP:'0.01' @CLASS:'pcp-adjust__spinbox' %}</td>
+          <td colspan="3" class="pcp-adjust__td pcp-adjust__td--number pcp-adjust__td--last pcp-adjust__td--adj"><span id="lorem-ipsum-change__5s553fdgsh"></span></td>
         </tr>
       </tbody>
     </table>

diff --git a/src/includes/pcp-adjust__state__adjustments-change.html b/src/includes/pcp-adjust__state__adjustments-change.html