diff --git a/scss/base/_typography.scss b/scss/base/_typography.scss index 29833e78..943bd060 100644 --- a/scss/base/_typography.scss +++ b/scss/base/_typography.scss @@ -11,4 +11,8 @@ h1, h2, h3, h4, h5, h6 { h1 { margin-top: 0.5em; +} + +label { + font-style: italic; } \ No newline at end of file diff --git a/templates/calculator.html.to b/templates/calculator.html.to index 2129ba27..bf19f0a5 100644 --- a/templates/calculator.html.to +++ b/templates/calculator.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Calculator

diff --git a/templates/home.html.to b/templates/home.html.to index 85e4a235..4003234c 100644 --- a/templates/home.html.to +++ b/templates/home.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Home

diff --git a/templates/login.html.to b/templates/login.html.to index 99e5ca57..9a5a67ed 100644 --- a/templates/login.html.to +++ b/templates/login.html.to @@ -11,7 +11,7 @@ -
+
Defense Digital Service Logo diff --git a/templates/reports.html.to b/templates/reports.html.to index ed20dbf5..4cfebd3e 100644 --- a/templates/reports.html.to +++ b/templates/reports.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Reports

diff --git a/templates/requests.html.to b/templates/requests.html.to index 6fb11d8c..0c5fe1cf 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Requests New Request

diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to index f5298ed9..8b3f7190 100644 --- a/templates/requests/screen-5.html.to +++ b/templates/requests/screen-5.html.to @@ -2,9 +2,201 @@ {% block form %}

Review & Submit

- +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Beatae placeat maiores illo totam consequuntur ipsum quo animi earum voluptatem, velit minus, perferendis aperiam, tenetur alias nemo ratione accusantium, ullam at!

+ + +

1. Details of Use Edit

+ + +

Applications & Environments (2)

+ + + + + + + + + + + + + + + + + + + + +
Application NameTotal UsersEstimated Cost
Code.mil235$1,000,000,000
Digital Dojo1,337$10,000
+ +
Code.mil
+ +
Application Details
+ +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero. + + +$1,000,000,000 + + +CSP Calculator + + +2020-03-02 + + +Lots of it + + +Secret + + +Army + + +IaaS and PaaS + +
Computation
+ +32 + + +128GB + +
Storage
+ +10TB + + +100TB + +
Estimated Application Storage
+ +300 + + +1,000 + + +1,000 + + +3 + + +
Digital Dojo
+ +
Application Details
+ +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero. + + +$10,000 + + +CSP Calculator + + +2020-03-02 + + +Lots of it + + +Secret + + +Army + + +IaaS and PaaS + +
Computation
+ +32 + + +128GB + +
Storage
+ +10TB + + +100TB + +
Estimated Application Storage
+ +300 + + +1,000 + + +1,000 + + +3 + + +

2. Organizational Info Edit

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sint qui rem molestiae officia vitae quas error ut, est commodi quo! Error itaque earum, facere quod dolore qui beatae repudiandae accusantium.

+

Information About Requester

+ + + +Friedrich Straat + + +fstraat@mail.gov + + +(123) 456-7890 + + +Army + + + +United States + + + +Military + + + +2018-04-12 + + +

Information About Collaborators

+ + +Pietro Quirinis + + +quirinis@mail.gov + + + +

3. Funding & Contracting Edit

+ +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse inventore non illo quibusdam tempora vero temporibus reprehenderit sapiente cumque enim quaerat fuga praesentium nemo vel, expedita numquam sequi sed iusto!

+ + + + + + + +

+ + {% end %} {% block next %} -Submit to Contracting Officer +Submit {% end %} diff --git a/templates/users.html.to b/templates/users.html.to index 11395772..ee050f69 100644 --- a/templates/users.html.to +++ b/templates/users.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Users

diff --git a/templates/workspaces.html.to b/templates/workspaces.html.to index 17167397..c768708c 100644 --- a/templates/workspaces.html.to +++ b/templates/workspaces.html.to @@ -2,7 +2,7 @@ {% block content %} -
+

Workspaces