diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 90b06034..bbbfc2da 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -373,7 +373,8 @@ } .portfolio-funding { - padding: (2 * $gap) 0; + padding: 2 * $gap; + padding-top: 0; .panel { @include shadow-panel; @@ -385,10 +386,6 @@ margin-bottom: 2 * $gap; } - .portfolio-funding__header { - flex-direction: row-reverse; - } - .pending-task-order { background-color: $color-gold-lightest; diff --git a/styles/components/_sticky_cta.scss b/styles/components/_sticky_cta.scss index abaa3591..e15eadaa 100644 --- a/styles/components/_sticky_cta.scss +++ b/styles/components/_sticky_cta.scss @@ -1,12 +1,9 @@ .sticky-cta { - z-index: 100; - - @include media($small-screen) { - margin-left: -$gap * 4; - } + margin-left: -$gap * 4; @include media($medium-screen) { margin-left: -$gap * 5; + margin-right: -$gap * 3; } } @@ -23,7 +20,6 @@ border-bottom: 1px solid $color-gray-lighter; padding: 0 40px 0 40px; box-shadow: $box-shadow; - margin-bottom: 20px; } .sticky-cta-text { diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 445ab557..070fe475 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -80,7 +80,7 @@ } .task-order-summary { - margin: $gap * 4; + margin-top: $gap * 4; hr { border: 0; diff --git a/templates/portfolios/base.html b/templates/portfolios/base.html index 685c7057..eab8e7a1 100644 --- a/templates/portfolios/base.html +++ b/templates/portfolios/base.html @@ -7,6 +7,7 @@ {% block portfolio_header %} {% include "portfolios/header.html" %} {% endblock %} +
{% block portfolio_content %}{% endblock %}
diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 328c8994..bd2eb316 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -63,13 +63,12 @@ {% endmacro %} -
- {% call StickyCTA(text="Funding") %} -
- Add a new task order -
- {% endcall %} +{% call StickyCTA(text="Funding") %} + Start a new task order +{% endcall %} + +
{% if not active_task_orders and not pending_task_orders %} {{ EmptyState( diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index d2a4257e..06859758 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -1,12 +1,16 @@ -{% extends 'portfolios/base.html' %} - {% from "components/icon.html" import Icon %} {% from "components/totals_box.html" import TotalsBox %} +{% from "components/sticky_cta.html" import StickyCTA %} -{% block content %} +{% extends 'portfolios/base.html' %} + +{% block portfolio_content %} + {% call StickyCTA(text="Review Funding") %} + Edit + Submit task order + {% endcall %}
-
Portfolio Name