pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #223 from dod-ccpo/ui/meter-fix

Browse Source 
Ui/meter fix
This commit is contained in:
andrewdds 2018-08-28 11:57:08 -04:00 committed by GitHub
commit e026db0624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
styles/elements/_graphs.scss
View File

@ -1,6 +1,5 @@
meter { meter {
-moz-appearance: none; -moz-appearance: none;
appearance: none;
display: block; display: block;
background: $color-gray-lightest; background: $color-gray-lightest;

18
styles/sections/_reports.scss
View File

@ -222,6 +222,8 @@
&.meter-cell { &.meter-cell {
padding-left: 0; padding-left: 0;
position: relative;
min-width: 4rem;
@include media($medium-screen) { @include media($medium-screen) {
min-width: 12rem; min-width: 12rem;
@ -231,7 +233,6 @@
width: 100%; width: 100%;
height: 3rem; height: 3rem;
background: $color-white; background: $color-white;
position: relative;
display: none; display: none;
@include media($medium-screen) { @include media($medium-screen) {
@ -241,14 +242,17 @@
&::-webkit-meter-bar { &::-webkit-meter-bar {
background: $color-white; background: $color-white;
} }
}
&::before { .spend-table__meter-value {
content: attr(title); @include h5;
position: absolute;
top: .5rem; @include media($medium-screen) {
left: $gap; display: block;
@include h5;
color: $color-white; color: $color-white;
position: absolute;
top: 2.3rem;
left: $gap;
} }
} }
} }

6
templates/workspace_reports.html
View File

@ -130,7 +130,8 @@
<td class='table-cell--align-right previous-month'>$30,000</td> <td class='table-cell--align-right previous-month'>$30,000</td>
<td class='table-cell--align-right current-month'>$31,000</td> <td class='table-cell--align-right current-month'>$31,000</td>
<td class='table-cell--expand current-month meter-cell'> <td class='table-cell--expand current-month meter-cell'>
<meter value='31000' min='0' max='62000' title='50%'></meter> <span class='spend-table__meter-value'>50%</span>
<meter value='31000' min='0' max='62000'></meter>
</td> </td>
</tr> </tr>
@ -166,7 +167,8 @@
<td class='table-cell--align-right previous-month'>$30,000</td> <td class='table-cell--align-right previous-month'>$30,000</td>
<td class='table-cell--align-right current-month'>$31,000</td> <td class='table-cell--align-right current-month'>$31,000</td>
<td class='table-cell--expand current-month meter-cell'> <td class='table-cell--expand current-month meter-cell'>
<meter value='31000' min='0' max='62000' title='50%'></meter> <span class='spend-table__meter-value'>50%</span>
<meter value='31000' min='0' max='62000'></meter>
</td> </td>
</tr> </tr>

10
yarn.lock
View File

@ -2353,10 +2353,6 @@ flatten@^1.0.2:
version "1.0.2" version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
flexibility@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/flexibility/-/flexibility-1.0.6.tgz#faa5caf65708c91317508a491d194f434f2eba74"
flush-write-stream@^1.0.0: flush-write-stream@^1.0.0:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
@ -4816,12 +4812,6 @@ postcss-filter-plugins@^2.0.0:
dependencies: dependencies:
postcss "^5.0.4" postcss "^5.0.4"
postcss-flexibility@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/postcss-flexibility/-/postcss-flexibility-2.0.0.tgz#5612c1b85d6595ed480966839928a41617a6a768"
dependencies:
postcss "^6.0.1"
postcss-merge-idents@^2.1.5: postcss-merge-idents@^2.1.5:
version "2.1.7" version "2.1.7"
resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"