From 5545445d1d63612236c07cb18602ce049fb1cf8c Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 16:58:02 -0500 Subject: [PATCH 01/20] Some fixes for users with no portfolios --- styles/elements/_sidenav.scss | 7 ++++++- templates/navigation/global_sidenav.html | 16 ++++++++++------ templates/portfolios/blank_slate.html | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/styles/elements/_sidenav.scss b/styles/elements/_sidenav.scss index 57e4d1f1..ccd11dc5 100644 --- a/styles/elements/_sidenav.scss +++ b/styles/elements/_sidenav.scss @@ -60,6 +60,12 @@ margin-bottom: $gap; } + .sidenav__text { + margin: 2 * $gap; + color: $color-gray; + font-style: italic; + } + .sidenav__link { display: block; padding: $gap ($gap * 2); @@ -131,7 +137,6 @@ } + ul { - // padding-bottom: $gap / 2; li { .sidenav__link { diff --git a/templates/navigation/global_sidenav.html b/templates/navigation/global_sidenav.html index 98248ea9..c3f51657 100644 --- a/templates/navigation/global_sidenav.html +++ b/templates/navigation/global_sidenav.html @@ -18,12 +18,16 @@
Portfolios
diff --git a/templates/portfolios/blank_slate.html b/templates/portfolios/blank_slate.html index 3b45b92c..1c178f0a 100644 --- a/templates/portfolios/blank_slate.html +++ b/templates/portfolios/blank_slate.html @@ -9,7 +9,7 @@ {% block content %} {{ EmptyState( - action_href=url_for("task_orders.new", screen=1), + action_href=url_for("task_orders.get_started"), action_label=("portfolios.index.empty.start_button" | translate), icon="cloud", message=("portfolios.index.empty.title" | translate), From 0e72810ac8ac93dddf0afe408893322e3520d37c Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:02:03 -0500 Subject: [PATCH 02/20] Touch up styles on TO get started page --- styles/sections/_task_order.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index adf7ad6d..47eadcfb 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -2,6 +2,11 @@ text-align: center; padding: 4rem 6rem; + .panel { + @include shadow-panel; + margin-bottom: 6 * $gap; + } + .task-order-get-started__list { ul { list-style: none; From d61a87d0c67c90522c14497fce1a418a3573a82f Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:03:42 -0500 Subject: [PATCH 03/20] Underline all links --- styles/components/_portfolio_layout.scss | 3 +++ styles/elements/_accordians.scss | 1 + styles/elements/_icon_link.scss | 2 ++ styles/elements/_sidenav.scss | 2 +- templates/portfolios/breadcrumbs.html | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 7d57ed03..c611122a 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -47,6 +47,9 @@ .icon-link { color: $color-gray-medium; pointer-events: none; + &.icon-link--disabled { + opacity: 1; + } } } } diff --git a/styles/elements/_accordians.scss b/styles/elements/_accordians.scss index 4db50c9f..84b19e1d 100644 --- a/styles/elements/_accordians.scss +++ b/styles/elements/_accordians.scss @@ -40,6 +40,7 @@ margin: 0; display: block; padding: 0 $gap; + text-decoration: none; } } diff --git a/styles/elements/_icon_link.scss b/styles/elements/_icon_link.scss index 1c13e558..23b694e9 100644 --- a/styles/elements/_icon_link.scss +++ b/styles/elements/_icon_link.scss @@ -47,6 +47,7 @@ .icon-link { @include icon-link; @include icon-link-color($color-primary); + text-decoration: underline; &.icon-link--vertical { @include icon-link-vertical; @@ -67,6 +68,7 @@ &.icon-link--disabled { opacity: 0.3; pointer-events: none; + text-decoration: none; } &.icon-link--left { diff --git a/styles/elements/_sidenav.scss b/styles/elements/_sidenav.scss index ccd11dc5..79d44799 100644 --- a/styles/elements/_sidenav.scss +++ b/styles/elements/_sidenav.scss @@ -70,7 +70,7 @@ display: block; padding: $gap ($gap * 2); color: $color-black; - text-decoration: none; + text-decoration: underline; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; diff --git a/templates/portfolios/breadcrumbs.html b/templates/portfolios/breadcrumbs.html index ef946c32..6029b31e 100644 --- a/templates/portfolios/breadcrumbs.html +++ b/templates/portfolios/breadcrumbs.html @@ -10,7 +10,7 @@
{% if secondary_breadcrumb %} {{ Icon("caret_right", classes="icon--tiny") }} -
+
{{ secondary_breadcrumb }}
{% endif %} From 70617f9f2d2e11b6be432259d348d594e328aa0f Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:11:04 -0500 Subject: [PATCH 04/20] Add some spacing between applications on portfolio index page --- styles/components/_portfolio_layout.scss | 2 +- styles/elements/_accordians.scss | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index c611122a..1bb7d93c 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -245,6 +245,7 @@ .application-list-item { border-radius: 5px; box-shadow: 0 4px 8px 1px rgba(230,230,230,0.5), -4px 4px 8px 1px rgba(230,230,230,0.5); + margin-bottom: 6 * $gap; .col { max-width: 95%; @@ -372,7 +373,6 @@ &.funded .to-expiration-alert { color: $color-blue; - .icon { @include icon-color($color-blue); } diff --git a/styles/elements/_accordians.scss b/styles/elements/_accordians.scss index 84b19e1d..61ef3c68 100644 --- a/styles/elements/_accordians.scss +++ b/styles/elements/_accordians.scss @@ -2,6 +2,7 @@ @include block-list; box-shadow: 0 4px 10px 0 rgba(193,193,193,0.5); + margin-bottom: 6 * $gap; .icon-link { margin: -$gap 0; @@ -71,6 +72,7 @@ .separator { border: 1px solid $color-gray-medium; opacity: 0.75; + margin: 0 .5 * $gap; } } From 80c9fbe34eb58449dc67ee73d7320e47b788a2bd Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:11:31 -0500 Subject: [PATCH 05/20] Bigger icons on in-portfolio nav --- styles/components/_portfolio_layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 1bb7d93c..6748f842 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -98,7 +98,7 @@ } .icon { - @include icon-size(20); + @include icon-size(30); } } } From d407141a2d220e1675aecc9ea8f5471b3cfba4d7 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:12:21 -0500 Subject: [PATCH 06/20] Make funded through text black instead of blue --- styles/components/_portfolio_layout.scss | 7 ------- 1 file changed, 7 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 6748f842..3e8b7084 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -125,13 +125,6 @@ font-weight: bold; } - .funded { - color: $color-blue; - .icon { - @include icon-color($color-blue); - } - } - .unfunded { color: $color-red; .icon { From 0aff0ac3458bace818af181ea6cf8d10a1010cc8 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:16:04 -0500 Subject: [PATCH 07/20] Add some space below subheadings --- styles/components/_portfolio_layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 3e8b7084..76565ecd 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -140,6 +140,7 @@ opacity: 0.54; font-size: $small-font-size; font-weight: bold; + margin-bottom: 3 * $gap; } .portfolio-content { @@ -211,7 +212,6 @@ .portfolio-applications { .portfolio-applications__header { - margin-bottom: 4 * $gap; .portfolio-applications__header--title { @include subheading; @@ -266,7 +266,7 @@ .subheading { @include subheading; margin-top: 6 * $gap; - margin-bottom: $gap; + margin-bottom: 2 * $gap; } .portfolio-funding__header { From 8ba04fb90a06eec5497e5d9c0e2a2069e52c5425 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:21:11 -0500 Subject: [PATCH 08/20] Move add member link to the right --- styles/components/_portfolio_layout.scss | 4 ++++ templates/portfolios/applications/members.html | 2 +- templates/portfolios/members/index.html | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 76565ecd..05502b3a 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -170,6 +170,10 @@ td { border-bottom: 1px solid $color-gray-lightest; } + + .add-member-link { + text-align: right; + } } } diff --git a/templates/portfolios/applications/members.html b/templates/portfolios/applications/members.html index 6b05e799..5a9fc845 100644 --- a/templates/portfolios/applications/members.html +++ b/templates/portfolios/applications/members.html @@ -62,7 +62,7 @@ - + Add A New Member {{ Icon('plus') }} diff --git a/templates/portfolios/members/index.html b/templates/portfolios/members/index.html index 028045d5..bf79bd8b 100644 --- a/templates/portfolios/members/index.html +++ b/templates/portfolios/members/index.html @@ -95,7 +95,7 @@ - + Add A New Member {{ Icon('plus') }} From 4db08859c9c50ef1e49fb5f65cdd57db543585fa Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:23:03 -0500 Subject: [PATCH 09/20] Make "remaining days" black instead of red --- styles/sections/_reports.scss | 2 -- templates/portfolios/reports/index.html | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/styles/sections/_reports.scss b/styles/sections/_reports.scss index 576a7bda..c2a78321 100644 --- a/styles/sections/_reports.scss +++ b/styles/sections/_reports.scss @@ -175,13 +175,11 @@ } dd.ending-soon { - color: $color-red-dark; font-size: $h2-font-size; white-space: nowrap; .icon { @include icon-size(28); - @include icon-color($color-red-dark); } } } diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index e124dc93..632377be 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -80,7 +80,7 @@
Remaining Days
-
+
{% if remaining_days is not none %} {{ Icon('arrow-down') }} {{ remaining_days }} From 10f84d57c3bb771b24ffdb77e3cad0e9ae6bff52 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:28:35 -0500 Subject: [PATCH 10/20] Change alignment of remaining days relative to expiration date --- styles/sections/_reports.scss | 1 + templates/portfolios/reports/index.html | 58 ++++++++++++++----------- 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/styles/sections/_reports.scss b/styles/sections/_reports.scss index c2a78321..e9b33c3a 100644 --- a/styles/sections/_reports.scss +++ b/styles/sections/_reports.scss @@ -162,6 +162,7 @@ dl { text-align: right; + margin-top: -2 * $gap; dd, dt { display: inline; diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index 632377be..7a881ae8 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -59,36 +59,42 @@
-
-
+
+

Expiration Date

-
- {% if expiration_date %} - - - {% else %} - - - {% endif %} -
- - {{ Icon('cog') }} - Manage Task Order -
-
-
-
Remaining Days
-
- {% if remaining_days is not none %} - {{ Icon('arrow-down') }} - {{ remaining_days }} +
+ +
+
+ {% if expiration_date %} + + {% else %} - - + - {% endif %} -
-
+
+ + {{ Icon('cog') }} + Manage Task Order + +
+
+
+
Remaining Days
+
+ {% if remaining_days is not none %} + {{ Icon('arrow-down') }} + {{ remaining_days }} + {% else %} + - + {% endif %} +
+
+
+
From d6ff9d1b3ba372bdbef18583df0d56f570192753 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:31:31 -0500 Subject: [PATCH 11/20] More space between panels on reports page --- styles/components/_portfolio_layout.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 05502b3a..943b58c0 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -403,9 +403,8 @@ } .panel { - box-shadow: 0 6px 18px 0 rgba(144,164,183,0.3); - border-top: none; - border-bottom: none; + @include shadow-panel; + margin-bottom: 4 * $gap; } } From 33b0fe27e325895eb1c926f1f78e139ffb121367 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:33:31 -0500 Subject: [PATCH 12/20] Fix link url and padding issue on reporting page --- styles/sections/_reports.scss | 1 - templates/portfolios/reports/index.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/styles/sections/_reports.scss b/styles/sections/_reports.scss index e9b33c3a..b881cbad 100644 --- a/styles/sections/_reports.scss +++ b/styles/sections/_reports.scss @@ -64,7 +64,6 @@ } .spend-summary__budget { - margin: 0 0 0 $gap; @include ie-only { margin: $gap 0 0 0; diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index 7a881ae8..c5456748 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -76,7 +76,7 @@ - {% endif %}
- + {{ Icon('cog') }} Manage Task Order From a2128012f0f2bb76bcc5c7cc54f54d1e674b4dc3 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:35:12 -0500 Subject: [PATCH 13/20] Snuggle icon tooltip up to text its helping --- styles/components/_portfolio_layout.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 943b58c0..bdb6d8ac 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -70,6 +70,10 @@ font-size: $small-font-size; align-items: center; + .icon-tooltip { + margin-left: -$gap / 2; + } + button { margin: 0; padding: 0; From 2ed0b1b06bf14b474b6ddc655d6b8b0c09479433 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:37:55 -0500 Subject: [PATCH 14/20] Prevent dollars and cents from wrapping in header --- styles/components/_portfolio_layout.scss | 6 +++++- templates/portfolios/header.html | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index bdb6d8ac..5ed8a143 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -116,7 +116,11 @@ margin-left: -.4rem; } - .cents { + .portfolio-header__budget--amount { + white-space: nowrap; + } + + .portfolio-header__budget--cents { font-size: 2rem; margin-top: .75rem; margin-left: -.7rem; diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 18674b5e..b64e00b5 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -21,11 +21,11 @@ {{ Icon('info') }}
-
+
{{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justDollars }} - + .{{ portfolio.task_orders | selectattr('is_active') | sum(attribute='budget') | justCents }}
From d6ee4775279052678d307ea8304071ad1fc36bbd Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:44:32 -0500 Subject: [PATCH 15/20] Update style of edit portfolio name input to match TO portfolio name input --- styles/components/_portfolio_layout.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 5ed8a143..29ceb921 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -425,9 +425,12 @@ margin-bottom: 0; .form-col { - .usa-input { + .usa-input--validation--portfolioName { input { - max-width: 45em; + max-width: 30em; + } + .icon-validation { + left: 30em; } } } From 8da39f712592f8fe418e45182ca2343243e98164 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:53:42 -0500 Subject: [PATCH 16/20] Update pagination links on portfolio activity log --- atst/routes/portfolios/index.py | 2 +- templates/portfolios/admin.html | 2 +- templates/portfolios/header.html | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atst/routes/portfolios/index.py b/atst/routes/portfolios/index.py index 8929cc06..6be58772 100644 --- a/atst/routes/portfolios/index.py +++ b/atst/routes/portfolios/index.py @@ -23,7 +23,7 @@ def portfolios(): @portfolios_bp.route("/portfolios//admin") -def portfolio(portfolio_id): +def portfolio_admin(portfolio_id): portfolio = Portfolios.get_for_update_information(g.current_user, portfolio_id) form = PortfolioForm(data={"name": portfolio.name}) pagination_opts = Paginator.get_pagination_opts(http_request) diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html index f8e9dcc5..a39c3194 100644 --- a/templates/portfolios/admin.html +++ b/templates/portfolios/admin.html @@ -28,6 +28,6 @@ {% include "fragments/audit_events_log.html" %} - {{ Pagination(audit_events, 'portfolios.portfolio_activity', portfolio_id=portfolio_id) }} + {{ Pagination(audit_events, 'portfolios.portfolio_admin', portfolio_id=portfolio.id) }}
{% endblock %} diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index b64e00b5..7809f8a0 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -70,8 +70,8 @@ {{ Link( icon='cog', text='navigation.portfolio_navigation.breadcrumbs.admin' | translate, - url=url_for("portfolios.portfolio", portfolio_id=portfolio.id), - active=request.url_rule.endpoint == "portfolios.portfolio", + url=url_for("portfolios.portfolio_admin", portfolio_id=portfolio.id), + active=request.url_rule.endpoint == "portfolios.portfolio_admin", ) }} {% endif %}
From 121bec197baadae07f84788bca4052e5a6ba085a Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:55:11 -0500 Subject: [PATCH 17/20] Align portfolio header nav with content --- styles/components/_portfolio_layout.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 29ceb921..a4641ce1 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -60,7 +60,7 @@ flex-direction: row; } - margin: 2 * $gap 0; + margin: 2 * $gap; .portfolio-header__name { @include h1; From 8606b639bf2f515e6259e095dc824cc6b7b83fa7 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 17:56:13 -0500 Subject: [PATCH 18/20] Move portfolio content away from sidenav a bit more --- styles/components/_portfolio_layout.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index a4641ce1..9328c239 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -3,6 +3,8 @@ @include grid-row; } + margin-left: 2 * $gap; + .line { box-sizing: border-box; height: 2px; From 449d1cf599300d1ecf583a679af5a21b19966f22 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 18:02:21 -0500 Subject: [PATCH 19/20] Make global background a subtle off-white color --- styles/components/_global_layout.scss | 2 +- styles/core/_variables.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/styles/components/_global_layout.scss b/styles/components/_global_layout.scss index b46526b5..e8e8825d 100644 --- a/styles/components/_global_layout.scss +++ b/styles/components/_global_layout.scss @@ -1,5 +1,5 @@ #app-root { - background-color: $color-white; + background-color: $color-offwhite; display: flex; flex-direction: column; justify-content: flex-start; diff --git a/styles/core/_variables.scss b/styles/core/_variables.scss index 3917fa5e..19335b2a 100644 --- a/styles/core/_variables.scss +++ b/styles/core/_variables.scss @@ -58,6 +58,7 @@ $color-red-light: #e59393; $color-red-lightest: #f9dede; $color-white: #ffffff; +$color-offwhite: #fbfbfd; $color-black: #000000; $color-black-light: #212121; From 982c928faf3a30bb8c33671ebb587dca7ad49b73 Mon Sep 17 00:00:00 2001 From: Patrick Smith Date: Tue, 12 Feb 2019 18:20:23 -0500 Subject: [PATCH 20/20] Add `icon--circle` class to emulate plus-in-circle icon --- styles/elements/_icons.scss | 9 +++++++++ templates/navigation/global_sidenav.html | 2 +- templates/portfolios/applications/index.html | 2 +- templates/portfolios/applications/members.html | 2 +- templates/portfolios/members/index.html | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/styles/elements/_icons.scss b/styles/elements/_icons.scss index fa3f54f6..a3c60c74 100644 --- a/styles/elements/_icons.scss +++ b/styles/elements/_icons.scss @@ -78,4 +78,13 @@ &.icon--gold { @include icon-color($color-gold-dark); } + + &.icon--circle { + svg { + border-radius: 100%; + border-style: solid; + border-width: 1px; + padding: 2px; + } + } } diff --git a/templates/navigation/global_sidenav.html b/templates/navigation/global_sidenav.html index c3f51657..7844f6c2 100644 --- a/templates/navigation/global_sidenav.html +++ b/templates/navigation/global_sidenav.html @@ -32,7 +32,7 @@
Fund a New Portfolio - {{ Icon("plus", classes="sidenav__link-icon") }} + {{ Icon("plus", classes="sidenav__link-icon icon--circle") }} diff --git a/templates/portfolios/applications/index.html b/templates/portfolios/applications/index.html index 803e5074..64e1f412 100644 --- a/templates/portfolios/applications/index.html +++ b/templates/portfolios/applications/index.html @@ -14,7 +14,7 @@ {% if can_create_applications %} {{ 'portfolios.applications.add_application_text' | translate }} - {{ Icon("plus", classes="sidenav__link-icon") }} + {{ Icon("plus", classes="sidenav__link-icon icon--circle") }} {% endif %} diff --git a/templates/portfolios/applications/members.html b/templates/portfolios/applications/members.html index 5a9fc845..fbb02cf4 100644 --- a/templates/portfolios/applications/members.html +++ b/templates/portfolios/applications/members.html @@ -65,7 +65,7 @@ Add A New Member - {{ Icon('plus') }} + {{ Icon('plus', classes='icon--circle') }} diff --git a/templates/portfolios/members/index.html b/templates/portfolios/members/index.html index bf79bd8b..976cffc0 100644 --- a/templates/portfolios/members/index.html +++ b/templates/portfolios/members/index.html @@ -98,7 +98,7 @@ Add A New Member - {{ Icon('plus') }} + {{ Icon('plus', classes='icon--circle') }}