diff --git a/atst/ui_modules.py b/atst/ui_modules.py index 78f9e5ca..0ced7fad 100644 --- a/atst/ui_modules.py +++ b/atst/ui_modules.py @@ -16,10 +16,11 @@ class Icon(UIModule): "components/icon.html.to", svg=svg.read(), name=name, classes=classes) class SidenavItem(UIModule): - def render(self, label, href, active=False, icon=None): + def render(self, label, href, active=False, icon=None, subnav=None): return self.render_string( "navigation/_sidenav_item.html.to", label=label, href=href, active=active, - icon=icon) + icon=icon, + subnav=subnav) diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss index bcff6c79..b3151653 100644 --- a/scss/elements/_inputs.scss +++ b/scss/elements/_inputs.scss @@ -4,10 +4,6 @@ * @source https://github.com/uswds/uswds/blob/develop/src/stylesheets/elements/_inputs.scss */ -from { - margin-bottom: 3rem; -} - select { border-radius: 0; -webkit-appearance: none; @@ -28,3 +24,19 @@ select { padding-bottom: 0.5rem; } } + +.usa-search { + padding-top: 2px; + margin-right: 2rem; + + input[type=search] { + height: 4.4rem; + font-size: 1.7rem; + 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 5b0c1220..e45ee1ec 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -43,4 +43,4 @@ padding: 0 ($gap * 4); } } -} +} \ No newline at end of file diff --git a/scss/elements/_sidenav.scss b/scss/elements/_sidenav.scss index 6f94f6ca..d4c67366 100644 --- a/scss/elements/_sidenav.scss +++ b/scss/elements/_sidenav.scss @@ -44,6 +44,7 @@ &--active { @include h5; color: $color-primary; + box-shadow: none; } } } @@ -55,9 +56,21 @@ li { .sidenav__link { @include h5; - padding: ($gap * .75) ($gap * 3); + padding: $gap * .75; + padding-left: 4.5rem; border: 0; font-weight: normal; + + .sidenav__link-icon { + @include icon-size(12); + flex-shrink: 0; + margin-right: 1.5rem; + margin-left: -3rem + } + + .sidenav__link-label { + padding-left: 0; + } } } } diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss index 678770d6..9c917286 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%; diff --git a/static/icons/plus.svg b/static/icons/plus.svg new file mode 100644 index 00000000..c43ad77a --- /dev/null +++ b/static/icons/plus.svg @@ -0,0 +1 @@ + diff --git a/templates/navigation/_sidenav_item.html.to b/templates/navigation/_sidenav_item.html.to index a41b7726..888245bc 100644 --- a/templates/navigation/_sidenav_item.html.to +++ b/templates/navigation/_sidenav_item.html.to @@ -6,4 +6,19 @@ {{label}} + + {% if subnav and active %} + + {% end %} diff --git a/templates/navigation/global_navigation.html.to b/templates/navigation/global_navigation.html.to index 17e8bf01..60991d47 100644 --- a/templates/navigation/global_navigation.html.to +++ b/templates/navigation/global_navigation.html.to @@ -1,10 +1,24 @@ diff --git a/templates/requests.html.to b/templates/requests.html.to index 653c01b3..1d107967 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -3,49 +3,63 @@ {% 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.

" +) %}
+
+
+
+ +
+
+ +
+
+
+
-
- -
-

Requests New Request

-
- - - - - - - - - - - - - - {% for r in requests %} - - - {% 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 %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New +
- - - -
+ {{ r['date'] }} + {{ r['full_name'] }} + {{ r['app_count'] }} + {{ r['status'] }} + Download + + {% end %} + +