From 2644133b765e125a91f376f9b17f5db9a35f47ba Mon Sep 17 00:00:00 2001 From: Montana Date: Mon, 3 Jun 2019 14:48:44 -0400 Subject: [PATCH] More styling and content --- styles/sections/_task_order.scss | 18 +++++- templates/portfolios/task_orders/review.html | 62 ++++++++++++++++++-- 2 files changed, 73 insertions(+), 7 deletions(-) diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss index 8b096323..6a274784 100644 --- a/styles/sections/_task_order.scss +++ b/styles/sections/_task_order.scss @@ -73,22 +73,34 @@ border: 0; border-bottom: 1px solid $color-gray-light; margin-top: $gap * 4; + margin-bottom: $gap * 4; + } + + table { + margin-top: 1rem; } .col { - margin: $gap * 4 0; flex-grow: 1; } + .h1, + .h3 { + margin-bottom: $gap * 2; + } + .h4 { margin-top: $gap * 2; } .to-sidebar { padding: $gap * 4; + padding-top: $gap * 2; flex-grow: unset; margin-left: $gap * 6; + margin-top: $gap * 3; width: 33.77%; + max-height: 45rem; background-color: $color-gray-lightest; } @@ -97,6 +109,10 @@ height: $gap * 5.5; } + .more { + margin-top: -2.5rem; + } + .panel { @include shadow-panel; } diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index dc54d0a2..f344a34d 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -12,24 +12,73 @@
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.
- More{{ Icon('caret_down') }} - Less{{ Icon('caret_up') }} + More{{ Icon('caret_down') }} + Less{{ Icon('caret_up') }}
+ +
Review your task order
+
Check to make sure the information you entered is correct. After submission, you will confirm this task order was signed by a contracting officer. Thereafter, you will be informed as soon as CCPO completes their review.
-
Review your task order
Task order number - 10 digit found in your system of record
{{task_order.number}}

Funding summary
-
CLIN 1
-
CLIN 2
+
CLIN 1: Unclassified Cloud Services 001
+
+ + + + + + + + + + + + + + + + + + + + +
AmountObligatedPoP StartPoP EndLOA
$500,000Yes9/07/199/07/2034820394
+
+ +
CLIN 2: Unclassified Cloud Services 002
+
+ + + + + + + + + + + + + + + + + + + + +
AmountObligatedPoP StartPoP EndLOA
$300,000No9/08/209/08/21q9384751934
+

@@ -40,12 +89,13 @@
Total obligated funds
$500,000
-
reprehenderit in voluptate velit
+
This is the funding allocated to cloud services. It may be 100% or a portion of the total task order budget.

Total contract amount
$800,000
+
This is the value of all funds obligated for this contract, including -- but not limited to -- funds obligated for the cloud.