Skip to content
This repository has been archived by the owner on Dec 8, 2017. It is now read-only.

Commit

Permalink
Merge pull request #76 from 18F/admin-login-page
Browse files Browse the repository at this point in the history
Admin login page
  • Loading branch information
stvnrlly committed Mar 23, 2016
2 parents 1ed4376 + d0a049a commit aef4d5e
Show file tree
Hide file tree
Showing 12 changed files with 199 additions and 144 deletions.
2 changes: 1 addition & 1 deletion forecast-admin/forecast/opportunities/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block content %}
<section class="error-page usa-grid-full">
<h1 class="error-page-header">404</h1>
<h1 class="error-page-hero">404</h1>
<h2 class="error-page-header">:/</h2>
<p>The page you are looking for appears to be moved, deleted, or does not exist.</p>
<a href="/">Return to all contract opportunities <icon class="fa fa-angle-right"></icon></a>
Expand Down
2 changes: 1 addition & 1 deletion forecast-admin/forecast/opportunities/templates/500.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block content %}
<section class="error-page usa-grid-full">
<h1 class="error-page-header">500</h1>
<h1 class="error-page-hero">500</h1>
<h2 class="error-page-header">This is a bit awkward</h2>
<p>Something went wrong on our end. Try refreshing the page or you can view <a href="/">all contract opportunities <icon class="fa fa-angle-right"></icon></a></p>
</section>
Expand Down
2 changes: 1 addition & 1 deletion forecast-admin/forecast/opportunities/templates/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div id="results">
<section class="usa-grid-full">
<div class="button-download_wrapper usa-width-one-fourth">
<a href="api/opportunities/?format=csv">
<a download="gsaforecast.csv" href="api/opportunities/?format=csv">
<button class="usa-button usa-button-outline button-download"
style="-webkit-appearance: button">
<icon class="button-download_icon fa fa-download"></icon>
Expand Down
78 changes: 63 additions & 15 deletions forecast-admin/forecast/static/admin/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,48 @@ Pale – #F0F8FF

@import url(fonts.css);


/* LAYOUT */

html {
height: 100%;
}

body {
margin: 0;
padding: 0;
font-size: 14px;
font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;
color: #333;
background: #fff;
margin: 0;
padding: 0;
font-size: 14px;
font-family: 'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;
color: #333;
background: #fff;
}

#container,
body {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
height: 100%;
}

#content {
-webkit-box-flex: 1;
-webkit-flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
}

footer {
-webkit-box-flex: 0;
-webkit-flex: none;
-ms-flex: none;
flex: none;
}

/* GRID */
Expand Down Expand Up @@ -1201,7 +1236,7 @@ table#change-history tbody th {
}

#content {
padding: 20px 40px;
padding: 20px 40px;
}

.dashboard #content {
Expand All @@ -1220,12 +1255,6 @@ table#change-history tbody th {
margin-right: -300px;
}


#footer {
clear: both;
padding: 10px;
}

/* COLUMN TYPES */

.colMS {
Expand Down Expand Up @@ -1538,6 +1567,23 @@ footer .usa-grid {
padding: 1.25em;
}

.usa-footer .usa-grid {
max-width: inherit;
padding-left: 40px;
padding-right: 40px;
}

.usa-footer .usa-footer-contact-heading {
margin-top: 0.5rem;
}

@media screen and (min-width: 600px) {
.usa-footer .usa-footer-contact-heading {
margin-top: 1.2rem;
padding-bottom: 0;
}
}

.usa-footer .usa-unstyled-list {
display: block;
}
Expand Down Expand Up @@ -1805,7 +1851,7 @@ li.usa-footer-primary-content:last-child {
}

.usa-footer-logo {
margin-bottom: 1.25em;
margin-bottom: 2.5em;
}

@media screen and (min-width: 600px) {
Expand Down Expand Up @@ -1876,4 +1922,6 @@ li.usa-footer-primary-content:last-child {
}
}


#login-form {
padding-bottom: 3rem;
}
1 change: 1 addition & 0 deletions forecast-admin/forecast/static/admin/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -511,3 +511,4 @@ form .related-widget-wrapper ul {
.clearable-file-input input {
margin-top: 0;
}

Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
.error-page {
text-align: center;
text-align: center;
}

.error-page .error-page-header {
margin: 0;
.error-page .error-page-header,
.error-page .error-page-hero {
margin: 0;
}

.error-page .error-page-hero {
font-size: rem(70px);
font-weight: $font-normal;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
footer {
-webkit-box-flex: 0;
-webkit-flex: none;
-ms-flex: none;
flex: none;
}

.usa-footer {
.usa-unstyled-list {
display: block;
Expand Down
10 changes: 10 additions & 0 deletions forecast-admin/forecast/static/assets/_scss/core/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ html {

body {
background-color: #ffffff;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
height: 100%;
}

.lt-ie9 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,10 @@ footer .usa-grid {

.content-wrapper {
padding-top: ($base-padding * 2);
min-height: rem(500px);
-webkit-box-flex: 1;
-webkit-flex: 1 0 auto;
-ms-flex: 1 0 auto;
flex: 1 0 auto;
}


30 changes: 27 additions & 3 deletions forecast-admin/forecast/static/assets/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion forecast-admin/forecast/static/assets/css/main.css.map

Large diffs are not rendered by default.

Loading

0 comments on commit aef4d5e

Please sign in to comment.