From 1916461d6e2ad6aaa0eabdf43bc27854d6adc77c Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 23 Jul 2018 10:05:29 -0400 Subject: [PATCH] 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 %}