From 4ab0975b13d644bfcd1deb365c5f2420069d766d Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 12 Jun 2019 10:50:12 -0400 Subject: [PATCH 1/2] Updates to SemiCollapsibleText component. The more/less toggles should be inline with the text. The caller should pass in the first and second halves of the content to be displayed. --- styles/core/_util.scss | 23 ++++++++++++------ .../components/semi_collapsible_text.html | 24 +++++++++++++++---- templates/home.html | 11 ++------- templates/portfolios/task_orders/review.html | 4 +--- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/styles/core/_util.scss b/styles/core/_util.scss index 80b1339c..2a6a0ba7 100644 --- a/styles/core/_util.scss +++ b/styles/core/_util.scss @@ -47,17 +47,26 @@ } } -.semi-collapsed { - overflow: hidden; - height: 5.1rem; +.section-description { + font-size: $lead-font-size; } .more { - margin-top: -4.4rem; - padding-left: 1.25rem; - background-color: $color-offwhite; - position: relative; cursor: pointer; + margin-left: 1rem; + + .icon { + width: 1rem; + margin: 0 0 0 0.5rem; + + svg * { + fill: $color-blue; + } + + svg > path { + transform: translate(0,5px); + } + } } .green { diff --git a/templates/components/semi_collapsible_text.html b/templates/components/semi_collapsible_text.html index 2a7d7482..5f6f18e4 100644 --- a/templates/components/semi_collapsible_text.html +++ b/templates/components/semi_collapsible_text.html @@ -1,14 +1,28 @@ {% from "components/icon.html" import Icon %} -{% macro SemiCollapsibleText(paragraph) -%} +{% macro SemiCollapsibleText(first_half=None, second_half=None) -%}
-

- {{ paragraph }} + {% if first_half is none %} + {% set first_half="Aenean lacinia bibendum nulla sed consectetur. Sed posuere consectetur est at lobortis. Fusce dapibus an, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo." %} + {% endif %} + {% if second_half is none %} + {% set second_half="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." %} + {% endif %} +

+ {{ first_half }} + {{ second_half }} + + Less{{ Icon('caret_up') }} + +

+

+ {{ first_half }} + + More{{ Icon('caret_down') }} +

- More{{ Icon('caret_down') }} - Less{{ Icon('caret_up') }}
diff --git a/templates/home.html b/templates/home.html index dcd561b2..b1139dca 100644 --- a/templates/home.html +++ b/templates/home.html @@ -2,6 +2,7 @@ {% from "components/sticky_cta.html" import StickyCTA %} {% from "components/icon.html" import Icon %} +{% from "components/semi_collapsible_text.html" import SemiCollapsibleText %} {% block content %} @@ -23,15 +24,7 @@

{{ "home.head" | translate }}

- -
-

- 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') }} -
-
+ {{ SemiCollapsibleText() }}

{{ "home.your_project" | translate }}

diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index e52d1704..25ba4dd5 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -28,9 +28,7 @@
- {% set description = "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." %} - - {{ SemiCollapsibleText(paragraph=description) }} + {{ SemiCollapsibleText() }}
From 7cc5bfce7fbbf2cfad4f684423e4b958a5e4b128 Mon Sep 17 00:00:00 2001 From: dandds Date: Wed, 12 Jun 2019 11:06:47 -0400 Subject: [PATCH 2/2] set flex position of home screen icons --- styles/core/_util.scss | 2 +- styles/sections/_home.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/styles/core/_util.scss b/styles/core/_util.scss index 2a6a0ba7..cbcf8e8a 100644 --- a/styles/core/_util.scss +++ b/styles/core/_util.scss @@ -64,7 +64,7 @@ } svg > path { - transform: translate(0,5px); + transform: translate(0, 5px); } } } diff --git a/styles/sections/_home.scss b/styles/sections/_home.scss index e7b023af..8a1dc49a 100644 --- a/styles/sections/_home.scss +++ b/styles/sections/_home.scss @@ -28,7 +28,7 @@ } .links { - justify-content: normal; + justify-content: flex-start; .icon-link:first-child { padding-left: 0;