From b6b093850aca562ff757ac2d43104e7fd99cf76e Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 11 Feb 2020 10:56:16 -0500
Subject: [PATCH 1/2] Add div with col class around the div.row that contains
 the header links. Remove display:table from the .col styling

---
 styles/components/_portfolio_layout.scss |  1 -
 templates/portfolios/header.html         | 59 ++++++++++++------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 06fecf63..1fb8a9b6 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -20,7 +20,6 @@
 
   .col--grow {
     overflow: inherit;
-    display: table;
     min-height: 10rem;
   }
 
diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html
index 71d9a550..5280ee1c 100644
--- a/templates/portfolios/header.html
+++ b/templates/portfolios/header.html
@@ -17,36 +17,37 @@
       <h1>{{ portfolio.name }}</h1>
     </div>
   </div>
-  <div class='row links'>
-    {% if user_can(permissions.VIEW_PORTFOLIO_ADMIN) %}
+  <div class="col">
+    <div class='row links'>
+      {% if user_can(permissions.VIEW_PORTFOLIO_ADMIN) %}
+        {{ Link(
+          icon='cog',
+          text='navigation.portfolio_navigation.breadcrumbs.admin' | translate,
+          url=url_for("portfolios.admin", portfolio_id=portfolio.id),
+          active=request.url_rule.endpoint == "portfolios.admin",
+        ) }}
+      {% endif %}{% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %}
+        {{ Link(
+          icon='funding',
+          text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
+          url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
+          active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"],
+        ) }}
+      {% endif %}
       {{ Link(
-        icon='cog',
-        text='navigation.portfolio_navigation.breadcrumbs.admin' | translate,
-        url=url_for("portfolios.admin", portfolio_id=portfolio.id),
-        active=request.url_rule.endpoint == "portfolios.admin",
+        icon='applications',
+        text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,
+        url=url_for("applications.portfolio_applications", portfolio_id=portfolio.id),
+        active=request.url_rule.endpoint in ["applications.portfolio_applications", "applications.settings"],
       ) }}
-    {% endif %}{% if user_can(permissions.VIEW_PORTFOLIO_FUNDING) %}
-      {{ Link(
-        icon='funding',
-        text='navigation.portfolio_navigation.breadcrumbs.funding' | translate,
-        url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id),
-        active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"],
-      ) }}
-    {% endif %}
-    {{ Link(
-      icon='applications',
-      text='navigation.portfolio_navigation.breadcrumbs.applications' | translate,
-      url=url_for("applications.portfolio_applications", portfolio_id=portfolio.id),
-      active=request.url_rule.endpoint in ["applications.portfolio_applications", "applications.settings"],
-    ) }}
-    {% if user_can(permissions.VIEW_PORTFOLIO_REPORTS) %}
-      {{ Link(
-        icon='chart-pie',
-        text='navigation.portfolio_navigation.breadcrumbs.reports' | translate,
-        url=url_for("portfolios.reports", portfolio_id=portfolio.id),
-        active=request.url_rule.endpoint == "portfolios.reports",
-      ) }}
-    {% endif %}
-
+      {% if user_can(permissions.VIEW_PORTFOLIO_REPORTS) %}
+        {{ Link(
+          icon='chart-pie',
+          text='navigation.portfolio_navigation.breadcrumbs.reports' | translate,
+          url=url_for("portfolios.reports", portfolio_id=portfolio.id),
+          active=request.url_rule.endpoint == "portfolios.reports",
+        ) }}
+      {% endif %}
+    </div>
   </div>
 </div>

From 541aa965fb0a0778ccde62bce75fded199075056 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 11 Feb 2020 11:08:35 -0500
Subject: [PATCH 2/2] Center portfolio name vertically

---
 styles/components/_portfolio_layout.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 1fb8a9b6..e9af6d5e 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -20,13 +20,11 @@
 
   .col--grow {
     overflow: inherit;
-    min-height: 10rem;
+    align-self: center;
   }
 
   &__name {
     @include h1;
-    display: table-cell;
-    vertical-align: middle;
 
     h1 {
       margin: 0;