From a13716e7edceb44f65d049620d0ddb6aa980f6f5 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 17 Feb 2020 13:57:56 -0500 Subject: [PATCH 1/2] update copy --- translations.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations.yaml b/translations.yaml index adee11af..af76c602 100644 --- a/translations.yaml +++ b/translations.yaml @@ -506,12 +506,12 @@ portfolios: archive_button: Delete member reports: days_remaining: - header: Days Remaining + header: Days remaining toolip: Days remaining are the days of funding remaining in the portfolio. duration: - header: Funding Duration + header: Funding duration tooltip: Funding duration is the period of time that there is a valid task order funding the portfolio. - estimate_warning: Reports displayed in JEDI are estimates and not a system of record. + estimate_warning: Reports displayed in JEDI are estimates and not a system of record. To manage your costs, go to Azure by selecting the Login to Azure button above. total_value: header: Total Portfolio Value tooltip: Total portfolio value is all obligated funds for current and upcoming task orders in this portfolio. From 40be760fa08fb8df4ede66ca65156eae86e6f34d Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 17 Feb 2020 14:08:28 -0500 Subject: [PATCH 2/2] Update optional tag --- styles/elements/_inputs.scss | 6 ++++++ templates/components/multi_checkbox_input.html | 2 +- templates/components/options_input.html | 2 +- templates/components/text_input.html | 2 +- translations.yaml | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss index 9e74ff50..c424b723 100644 --- a/styles/elements/_inputs.scss +++ b/styles/elements/_inputs.scss @@ -60,6 +60,12 @@ margin: ($gap * 2) 0; max-width: 75rem; + &-label-helper { + font-size: $small-font-size; + margin-left: $gap; + margin-right: $gap; + } + label { padding: 0 0 ($gap / 2) 0; margin: 0; diff --git a/templates/components/multi_checkbox_input.html b/templates/components/multi_checkbox_input.html index bfda1fa2..820efe3b 100644 --- a/templates/components/multi_checkbox_input.html +++ b/templates/components/multi_checkbox_input.html @@ -26,7 +26,7 @@
{{ field.label | striptags }} {% if optional %} - (optional) + {{ "common.optional" | translate }} {% endif %} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %} {% if not field.description %} diff --git a/templates/components/options_input.html b/templates/components/options_input.html index 405e7f23..47d21097 100644 --- a/templates/components/options_input.html +++ b/templates/components/options_input.html @@ -27,7 +27,7 @@
{{ field.label | striptags}} {% if optional %} - (optional) + {{ "common.optional" | translate }} {% endif %} {% if tooltip %}{{ Tooltip(tooltip) }}{% endif %}
diff --git a/templates/components/text_input.html b/templates/components/text_input.html index 5bc24568..daad6514 100644 --- a/templates/components/text_input.html +++ b/templates/components/text_input.html @@ -40,7 +40,7 @@
{{ label }} {% if optional and showOptional %} - (optional) + {{ "common.optional" | translate }} {% endif %} {% if tooltip and not disabled %} {{ Tooltip(tooltip, tooltip_title) }} diff --git a/translations.yaml b/translations.yaml index af76c602..4bb463cc 100644 --- a/translations.yaml +++ b/translations.yaml @@ -51,6 +51,7 @@ common: lorem: Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. name: Name next: Next + optional: Optional previous: Previous save: Save save_changes: Save Changes