From 5d371c62b2a05617ec3fafe3356a7cff8bd1d589 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Fri, 15 Feb 2019 15:46:18 -0500 Subject: [PATCH 1/5] Don't show outline on an anchor tag that doesn't have a href --- styles/atat.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/styles/atat.scss b/styles/atat.scss index 2d18992e..421e50b5 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -50,3 +50,7 @@ @import 'sections/member_edit'; @import 'sections/reports'; @import 'sections/task_order'; + +a:focus:not([href]) { + outline: none; +} From 474450d07a1e403ee298795658d080e7a48d9cb4 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Feb 2019 10:59:22 -0500 Subject: [PATCH 2/5] Revert "Fix z-index of tooltip arrow" This reverts commit ee7ad23dde8afd227e02027185cf617c87d68ec4. --- styles/elements/_tooltip.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/styles/elements/_tooltip.scss b/styles/elements/_tooltip.scss index 76a1be50..d444826f 100644 --- a/styles/elements/_tooltip.scss +++ b/styles/elements/_tooltip.scss @@ -8,8 +8,6 @@ background-color: $color-aqua-lightest; padding: $gap * 3; border-left: ($gap / 2) solid $color-blue; - position: relative; - z-index: 2; } .tooltip-arrow { From 93a118d4343026d3062fb202d9b807a57e9055db Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Feb 2019 11:18:38 -0500 Subject: [PATCH 3/5] Use Tooltip component and fix overflow --- styles/components/_portfolio_layout.scss | 4 ++++ templates/portfolios/header.html | 10 +++++++--- translations.yaml | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 080d6d8d..e53d0c83 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -65,6 +65,10 @@ margin: 2 * $gap; + .col--grow { + overflow: inherit; + } + .portfolio-header__name { @include h1; } diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 7809f8a0..1af5dbd5 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -1,4 +1,5 @@ {% from "components/icon.html" import Icon %} +{% from "components/tooltip.html" import Tooltip %} {% macro Link(icon, text, url, active=False) %} @@ -17,9 +18,12 @@
Available budget - + {{ + Tooltip( + ('portfolios.task_orders.available_budget_help_description' | translate), + title='' + ) + }}
diff --git a/translations.yaml b/translations.yaml index d9512816..4547e4fb 100644 --- a/translations.yaml +++ b/translations.yaml @@ -510,6 +510,8 @@ task_orders: review_title: Task Order Builder task_order_information: Task Order Information portfolios: + task_orders: + available_budget_help_description: The available budget shown includes the available budget of all active task orders index: empty: title: You have no apps yet From 703900b906a2e5894ed9461d482fc79f5da6e82d Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Feb 2019 13:31:59 -0500 Subject: [PATCH 4/5] Fix IE outline on focus --- styles/atat.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/styles/atat.scss b/styles/atat.scss index 421e50b5..fc13952f 100644 --- a/styles/atat.scss +++ b/styles/atat.scss @@ -51,6 +51,10 @@ @import 'sections/reports'; @import 'sections/task_order'; -a:focus:not([href]) { - outline: none; +// +// IE likes to display an outline when focusing on an element. This +// fix removes that unwanted outline on focus. +// +*:focus { + outline: 0; } From cc73b0948e3d5e1860a529f8dc2d81bb892d39ca Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 18 Feb 2019 14:44:06 -0500 Subject: [PATCH 5/5] Fix meter when budget is 0 --- templates/portfolios/reports/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index c5456748..5c024ba6 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -33,7 +33,7 @@
- +