Merge pull request #355 from dod-ccpo/ui/ie-fixes

IE fixes
This commit is contained in:
andrewdds 2018-10-01 14:56:38 -04:00 committed by GitHub
commit df6a0527c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 19 deletions

View File

@ -34,6 +34,7 @@ export default {
mounted: function () { mounted: function () {
this._setDisplayedMonths() this._setDisplayedMonths()
this._setMetrics() this._setMetrics()
addEventListener('load', this._setMetrics)
addEventListener('resize', this._setMetrics) addEventListener('resize', this._setMetrics)
}, },

View File

@ -4,6 +4,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
max-width: 100%;
@include media($medium-screen) { @include media($medium-screen) {
padding: 8rem ($gap * 4) 0; padding: 8rem ($gap * 4) 0;
@ -28,6 +29,7 @@
.empty-state__sub-message { .empty-state__sub-message {
@include h4; @include h4;
color: $color-gray; color: $color-gray;
max-width: 100%;
@include media($large-screen) { @include media($large-screen) {
@include h3; @include h3;

View File

@ -24,25 +24,10 @@
max-width: $site-max-width; max-width: $site-max-width;
overflow-x: hidden; overflow-x: hidden;
flex-grow: 1; flex-grow: 1;
-ms-flex-negative: 1;
@include ie-only {
max-width: 85%;
}
@include media($medium-screen) { @include media($medium-screen) {
margin: $gap * 2; margin: $gap * 2;
} }
@include media($large-screen) {
@include ie-only {
max-width: 80%;
}
}
@include media($xlarge-screen) {
@include ie-only {
max-width: $site-max-width;
}
}
} }
} }

View File

@ -58,7 +58,6 @@
flex-direction: row; flex-direction: row;
align-items: stretch; align-items: stretch;
justify-content: flex-end; justify-content: flex-end;
-ms-flex-pack: start;
.topbar__link--workspace { .topbar__link--workspace {
&:first-child { &:first-child {
@ -68,6 +67,7 @@
&.topbar__context--workspace { &.topbar__context--workspace {
background-color: $color-primary; background-color: $color-primary;
-ms-flex-pack: start;
.topbar__link { .topbar__link {
color: $color-white; color: $color-white;

View File

@ -14,6 +14,10 @@
flex-direction: row; flex-direction: row;
flex-basis: 50%; flex-basis: 50%;
@include ie-only {
max-width: 50%;
}
&:first-child { &:first-child {
padding-left: 0; padding-left: 0;
} }
@ -26,7 +30,11 @@
.panel { .panel {
padding: $gap * 2; padding: $gap * 2;
flex-grow: 1; width: 100%;
@include ie-only {
max-width: 100%;
}
// Spending Summary // Spending Summary
@ -38,20 +46,34 @@
.row { .row {
justify-content: space-between; justify-content: space-between;
@include ie-only {
max-width: 100%;
flex-wrap: wrap;
}
} }
.spend-summary__heading { .spend-summary__heading {
@include h3; @include h3;
margin: 0 $gap 0 0; margin: 0 $gap 0 0;
-ms-flex-negative: 1;
} }
.spend-summary__budget { .spend-summary__budget {
margin: 0 0 0 $gap; margin: 0 0 0 $gap;
@include ie-only {
margin: $gap 0 0 0;
}
> div { > div {
text-align: right; text-align: right;
margin: 0 0 ($gap / 2) 0; margin: 0 0 ($gap / 2) 0;
@include ie-only {
text-align: left;
}
dd, dt { dd, dt {
display: inline; display: inline;
} }

View File

@ -365,7 +365,9 @@
<td class='table-cell--align-right previous-month'>{{ workspace_totals.get(prev_month_index, 0) | dollars }}</td> <td class='table-cell--align-right previous-month'>{{ workspace_totals.get(prev_month_index, 0) | dollars }}</td>
<td class='table-cell--align-right current-month'>{{ workspace_totals.get(current_month_index, 0) | dollars }}</td> <td class='table-cell--align-right current-month'>{{ workspace_totals.get(current_month_index, 0) | dollars }}</td>
<td class='table-cell--expand current-month meter-cell'> <td class='table-cell--expand current-month meter-cell'>
<meter value='{{ workspace_totals.get(current_month_index, 0) }}' min='0' max='{{ workspace_totals.get(current_month_index, 0) }}'></meter> <meter value='{{ workspace_totals.get(current_month_index, 0) }}' min='0' max='{{ workspace_totals.get(current_month_index, 0) }}'>
<div class='meter__fallback' style='width: 100%'></div>
</meter>
</td> </td>
</tr> </tr>
</tbody> </tbody>