From 21d0581f4e7b4311a7f056cfed295d88a5f39328 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH 1/7] Update requests table and add temp nav link --- scss/elements/_inputs.scss | 7 ++ scss/elements/_panels.scss | 9 ++ scss/elements/_tables.scss | 7 +- .../navigation/global_navigation.html.to | 1 + templates/requests.html.to | 88 +++++++++++-------- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..00823f4e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -28,3 +28,10 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + // width: 45%; + // float: left; + // padding: $gap * 2; + margin-right: $gap; +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 5b0c1220..d5ecbfae 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -44,3 +44,12 @@ } } } + +.panel__actions { + display: flex; + padding: $gap; + + // &__search { + // float: left; + // } +} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..a7fabfc5 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { + table { @include panel-margin; min-width: 100%; @@ -16,6 +16,11 @@ table { th { @include block-list-header; + + &:first-child { + padding: $gap * 2 !important; // This overrides USWDS's no padding + } + } td { diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..f5acc5a3 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -5,6 +5,7 @@ {% end %} {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} + {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %} diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..b8a52553 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,50 +3,62 @@ {% block content %} - -
- -
- -
-

Requests New Request

+
+
+
+ + + +
+
+
+
- - - - - - - - - - - - - - {% for r in requests %} - - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New - {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
- - -
+ + + +
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+
{% end %} From 3bc5c984c1eced7bcd61b7c9a0a5dd9109768cd0 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH 2/7] Update requests table and add temp nav link --- scss/elements/_inputs.scss | 7 ++ scss/elements/_panels.scss | 9 ++ scss/elements/_tables.scss | 7 +- .../navigation/global_navigation.html.to | 1 + templates/requests.html.to | 88 +++++++++++-------- 5 files changed, 73 insertions(+), 39 deletions(-) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..00823f4e 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -28,3 +28,10 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + // width: 45%; + // float: left; + // padding: $gap * 2; + margin-right: $gap; +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 5b0c1220..d5ecbfae 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -44,3 +44,12 @@ } } } + +.panel__actions { + display: flex; + padding: $gap; + + // &__search { + // float: left; + // } +} \ No newline at end of file diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..a7fabfc5 100644 --- a/scss/elements/_tables.scss +++ b/scss/elements/_tables.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_table.scss */ -table { + table { @include panel-margin; min-width: 100%; @@ -16,6 +16,11 @@ table { th { @include block-list-header; + + &:first-child { + padding: $gap * 2 !important; // This overrides USWDS's no padding + } + } td { diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..f5acc5a3 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -5,6 +5,7 @@ {% end %} {% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %} + {% module SidenavItem("+ New Request", href="/requests/new", icon="", active=matchesPath('/requests/new')) %} {% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..b8a52553 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,50 +3,62 @@ {% block content %} - -
- -
- -
-

Requests New Request

+
+
+
+ + + +
+
+
+
- - - - - - - - - - - - - - {% for r in requests %} - - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New - {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
- - -
+ + + +
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+
{% end %} From d5e6fae7ba151aedd21129a33be1e719b9273764 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:23:59 -0400 Subject: [PATCH 3/7] Add panel actions styleguide --- scss/atat.scss | 1 + scss/elements/_inputs.scss | 9 +-------- scss/elements/_panel_actions.scss | 20 ++++++++++++++++++++ scss/elements/_panels.scss | 9 --------- 4 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 scss/elements/_panel_actions.scss diff --git a/scss/atat.scss b/scss/atat.scss index 082fbab2..1589b971 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -8,6 +8,7 @@ @import 'elements/inputs'; @import 'elements/buttons'; @import 'elements/panels'; +@import 'elements/panel_actions'; @import 'elements/block_lists'; @import 'elements/tables'; @import 'elements/icons'; diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index 00823f4e..8d47dfe8 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,7 +4,7 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ -from { + from { margin-bottom: 3rem; } @@ -27,11 +27,4 @@ select { label:first-child { padding-bottom: 0.5rem; } -} - -.usa-search { - // width: 45%; - // float: left; - // padding: $gap * 2; - margin-right: $gap; } \ No newline at end of file diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss new file mode 100644 index 00000000..bf797a06 --- /dev/null +++ b/scss/elements/_panel_actions.scss @@ -0,0 +1,20 @@ +// Panels Actions +// Form inputs and other actions for panels + +.panel__actions { + display: flex; + padding: $gap; + + .usa-search { + padding-top: 2px; + input[type=search] { + height: 4.4rem; + font-size: 14px; + color: $color-black; + + } + button { + min-height: 4.4rem; + } + } +} \ No newline at end of file diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index d5ecbfae..e45ee1ec 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -43,13 +43,4 @@ padding: 0 ($gap * 4); } } -} - -.panel__actions { - display: flex; - padding: $gap; - - // &__search { - // float: left; - // } } \ No newline at end of file From e578005a14950516131c412821e9d0dc6b33ec95 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:40:23 -0400 Subject: [PATCH 4/7] Adjust size for serach bar and filter dropdown --- scss/elements/_panel_actions.scss | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bf797a06..bc42274c 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -1,20 +1,31 @@ -// Panels Actions -// Form inputs and other actions for panels +/* + * Panels Actions + * Form inputs and other actions for panels + */ -.panel__actions { + .panel__actions { display: flex; padding: $gap; + &--filter { + width: 50%; + } + + &--search { + width: 50%; + } + .usa-search { padding-top: 2px; + margin-right: 2rem; + input[type=search] { height: 4.4rem; - font-size: 14px; - color: $color-black; - } + button { min-height: 4.4rem; } + } } \ No newline at end of file From 313d7f6fd1cf1729fd71ef2d2134fc974827a0a3 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:45:06 -0400 Subject: [PATCH 5/7] Add alert module for information --- templates/requests.html.to | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/requests.html.to b/templates/requests.html.to index b8a52553..85b2097c 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,6 +3,10 @@ {% block content %} +{% module Alert('Pending Financial Verification', + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" +) %} +
From a1efbb27a1e650cbc97af65319d3db16388f885f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:02:30 -0400 Subject: [PATCH 6/7] Increase search bar font size --- scss/elements/_panel_actions.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scss/elements/_panel_actions.scss b/scss/elements/_panel_actions.scss index bc42274c..702c5cc1 100644 --- a/scss/elements/_panel_actions.scss +++ b/scss/elements/_panel_actions.scss @@ -21,6 +21,8 @@ input[type=search] { height: 4.4rem; + font-size: 1.7rem; + color: $color-black; } button { From a9e3cb5d8e859cbe76e6f21c05a31d50aca87646 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 12:52:17 -0400 Subject: [PATCH 7/7] Fix typo --- templates/requests.html.to | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/requests.html.to b/templates/requests.html.to index 85b2097c..52ab1ea6 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -4,7 +4,7 @@ {% module Alert('Pending Financial Verification', - message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a COntracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" + message="

Your next step is to create a Task Order (T.O.) associated with JEDI Cloud. Please consult a Contracting Officer (KO) or Contracting Officer Representative (COR) to help with this step.

" ) %}