Merge pull request #210 from fedspendingtransparency/mod/column-color…

…-rule fix column colors for subawards
fedspendingtransparency · Jun 11, 2024 · cbedeca · cbedeca
2 parents 5c5b16d + e8a5147
commit cbedeca
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/components/table/Table.jsx b/components/table/Table.jsx
@@ -111,8 +111,8 @@ const Table = (props) => {
                 {props.subAward
                 && (
                     <colgroup>
-                        <col span={6} />
-                        <col span={2} className="usda-table__body-special-color" />
+                        <col span={4} />
+                        <col span={4} className="usda-table__body-special-color" />
                     </colgroup>
                 )}
                 <thead className="usda-table__head">

diff --git a/dist/data-transparency-ui.css b/dist/data-transparency-ui.css
diff --git a/dist/index.js b/dist/index.js
diff --git a/docs/211.120597ca.iframe.bundle.js b/docs/211.120597ca.iframe.bundle.js
diff --git a/docs/211.fb7a8e7d.iframe.bundle.js b/docs/211.fb7a8e7d.iframe.bundle.js
diff --git a/...211.120597ca.iframe.bundle.js.LICENSE.txt → ...211.fb7a8e7d.iframe.bundle.js.LICENSE.txt b/...211.120597ca.iframe.bundle.js.LICENSE.txt → ...211.fb7a8e7d.iframe.bundle.js.LICENSE.txt
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -338,7 +338,7 @@
         /* eslint-enable object-shorthand */
       })
     );
-  };</script><link href="main.69571959e13798a4fc21.css" rel="stylesheet"><style>#root[hidden],
+  };</script><link href="main.e9804e0aff1366fa1e54.css" rel="stylesheet"><style>#root[hidden],
       #docs-root[hidden] {
         display: none !important;
       }</style></head><body><div class="sb-preparing-story sb-wrapper"><div class="sb-loader"></div></div><div class="sb-preparing-docs sb-wrapper"><div class="sb-previewBlock"><div class="sb-previewBlock_header"><div class="sb-previewBlock_icon"></div><div class="sb-previewBlock_icon"></div><div class="sb-previewBlock_icon"></div><div class="sb-previewBlock_icon"></div></div><div class="sb-previewBlock_body"><div class="sb-loader"></div></div></div><table aria-hidden="true" class="sb-argstableBlock"><thead class="sb-argstableBlock-head"><tr><th><span>Name</span></th><th><span>Description</span></th><th><span>Default</span></th><th><span>Control</span></th></tr></thead><tbody class="sb-argstableBlock-body"><tr><td><span>propertyName</span><span title="Required">*</span></td><td><div><span>This is a short description</span></div><div class="sb-argstableBlock-summary"><div><span class="sb-argstableBlock-code">summary</span></div></div></td><td><div><span class="sb-argstableBlock-code">defaultValue</span></div></td><td><button>Set string</button></td></tr><tr><td><span>propertyName</span><span>*</span></td><td><div><span>This is a short description</span></div><div class="sb-argstableBlock-summary"><div><span class="sb-argstableBlock-code">summary</span></div></div></td><td><div><span class="sb-argstableBlock-code">defaultValue</span></div></td><td><button>Set string</button></td></tr><tr><td><span>propertyName</span><span>*</span></td><td><div><span>This is a short description</span></div><div class="sb-argstableBlock-summary"><div><span class="sb-argstableBlock-code">summary</span></div></div></td><td><div><span class="sb-argstableBlock-code">defaultValue</span></div></td><td><button>Set string</button></td></tr></tbody></table></div><div class="sb-nopreview sb-wrapper"><div class="sb-nopreview_main"><h1 class="sb-nopreview_heading sb-heading">No Preview</h1><p>Sorry, but you either have no stories or none are selected somehow.</p><ul><li>Please check the Storybook config.</li><li>Try reloading the page.</li></ul><p>If the problem persists, check the browser console, or the terminal you've run Storybook from.</p></div></div><div class="sb-errordisplay sb-wrapper"><pre id="error-message" class="sb-heading"></pre><pre class="sb-errordisplay_code"><code id="error-stack"></code></pre></div><div id="root"></div><div id="docs-root"></div><script>window['CONFIG_TYPE'] = "PRODUCTION";
@@ -361,4 +361,4 @@
 
 
 
-            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook","files":"**/stories/*.stories.@(mdx|js)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)stories\\/(?!\\.)(?=.)[^/]*?\\.stories\\.(mdx|js))$"}];</script><script src="runtime~main.868a37cc.iframe.bundle.js"></script><script src="211.120597ca.iframe.bundle.js"></script><script src="main.63c05521.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook","files":"**/stories/*.stories.@(mdx|js)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)stories[\\\\/](?!\\.)(?=.)[^\\\\/]*?\\.stories\\.(mdx|js))$"}];</script><script src="runtime~main.868a37cc.iframe.bundle.js"></script><script src="211.fb7a8e7d.iframe.bundle.js"></script><script src="main.ac760818.iframe.bundle.js"></script></body></html>
diff --git a/docs/main.63c05521.iframe.bundle.js b/docs/main.63c05521.iframe.bundle.js
diff --git a/docs/main.69571959e13798a4fc21.css.map b/docs/main.69571959e13798a4fc21.css.map
diff --git a/docs/main.ac760818.iframe.bundle.js b/docs/main.ac760818.iframe.bundle.js
diff --git a/docs/main.69571959e13798a4fc21.css → docs/main.e9804e0aff1366fa1e54.css b/docs/main.69571959e13798a4fc21.css → docs/main.e9804e0aff1366fa1e54.css
diff --git a/docs/main.e9804e0aff1366fa1e54.css.map b/docs/main.e9804e0aff1366fa1e54.css.map
diff --git a/docs/project.json b/docs/project.json
@@ -1 +1 @@
-{"generatedAt":1717079454724,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"9.8.1"},"storybookVersion":"6.5.16","language":"typescript","storybookPackages":{"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/addon-console":{"version":"1.2.3"},"@storybook/react":{"version":"6.5.16"},"@storybook/source-loader":{"version":"6.5.16"},"@storybook/theming":{"version":"6.5.16"},"storybook":{"version":"5.3.22"}},"framework":{"name":"react"},"addons":{"@storybook/addon-knobs":{"version":"6.4.0"},"@storybook/addon-docs":{"version":"6.5.16"},"@storybook/addon-a11y":{"version":"6.5.16"},"@storybook/addon-viewport":{"version":"6.5.16"},"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"},"@storybook/addon-controls":{"version":"6.5.16"}}}
+{"generatedAt":1718133053476,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":false,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"9.8.1"},"storybookVersion":"6.5.16","language":"typescript","storybookPackages":{"@storybook/builder-webpack5":{"version":"6.5.16"},"@storybook/manager-webpack5":{"version":"6.5.16"},"@storybook/addon-console":{"version":"1.2.3"},"@storybook/react":{"version":"6.5.16"},"@storybook/source-loader":{"version":"6.5.16"},"@storybook/theming":{"version":"6.5.16"},"storybook":{"version":"5.3.22"}},"framework":{"name":"react"},"addons":{"@storybook/addon-knobs":{"version":"6.4.0"},"@storybook/addon-docs":{"version":"6.5.16"},"@storybook/addon-a11y":{"version":"6.5.16"},"@storybook/addon-viewport":{"version":"6.5.16"},"@storybook/addon-actions":{"version":"6.5.16"},"@storybook/addon-essentials":{"version":"6.5.16"},"@storybook/addon-controls":{"version":"6.5.16"}}}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "data-transparency-ui",
-  "version": "6.2.29",
+  "version": "6.2.30",
   "description": "Library of UI components powering Data Transparency websites",
   "main": "dist/index.js",
   "style": "dist/data-transparency-ui.css",

diff --git a/styles/components/table/_table.scss b/styles/components/table/_table.scss
@@ -158,7 +158,7 @@ table.usda-table {
                 &:hover {
                     background-color: $gray-cool-2;
 
-                    &.special-hover-color td:nth-last-of-type(-n + 2) {
+                    &.special-hover-color td:nth-last-of-type(-n + 4) {
                             background-color: $blue-warm-10;
                     }
                 }

diff --git a/styles/components/table/_tableHeader.scss b/styles/components/table/_tableHeader.scss
@@ -74,6 +74,6 @@ th.table-header {
     border-right: solid 1px $gray-cool-10;
 }
 
-.table-header__subaward-color:nth-last-of-type(-n + 2) {
+.table-header__subaward-color:nth-last-of-type(-n + 4) {
         background-color: $blue-warm-20;
 }