defaults

18F · Feb 24, 2016 · cdd8cf3 · cdd8cf3
1 parent 9991fd5
commit cdd8cf3
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 171 deletions.
diff --git a/forecast-admin/forecast/opportunities/templates/detail.html b/forecast-admin/forecast/opportunities/templates/detail.html
@@ -7,8 +7,9 @@
 {% block content %}
   <a href="/">< Back to all opportunities</a>
 
-  <h6>{{ o.funding_agency}} | {{o.office|last}}</h6>
+  <h5>{{ o.funding_agency}} | {{o.office|first}}</h5>
   <h2>Details</h2>
+  <p></p>
   <table class="usa-table-borderless table-detail">
     <tbody>
       <tr>
@@ -17,73 +18,72 @@ <h2>Details</h2>
       </tr>
       <tr>
         <td scope="row">Region</td>
-        <td></td>
+        <td>{{o.office.1|default:"–"}}</td>
       </tr>
       <tr>
         <td scope="row">Award Status</td>
-        <td>{{ o.award_status }}</td>
+        <td>{{ o.award_status|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Primary NIACS Code</td>
-        <td>{{ o.niacs }}</td>
+        <td>{{ o.niacs|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Socioeconomic Category</td>
-        <td>{{ o.socioeconomic }}</td>
+        <td>{{ o.socioeconomic|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Contract Type</td>
-        <td>{{ o.contract_type }}</td>
+        <td>{{ o.contract_type|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Procurement Method</td>
-        <td>{{ o.procurement_method }}</td>
+        <td>{{ o.procurement_method|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Competition Strategy</td>
-        <td>{{ o.competition_strategy }}</td>
+        <td>{{ o.competition_strategy|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Estimated Value</td>
-        <td>${{ o.dollar_value_min|floatformat:0|intcomma }} – {{ o.dollar_value_min|floatformat:0|intcomma }}</td>
+        <td>>= ${{ o.dollar_value_min|floatformat:0|intcomma }} and < ${{ o.dollar_value_min|floatformat:0|intcomma }}</td>
       </tr>
       <tr>
         <td scope="row">Delivery Order Value</td>
-        <td>{{ o.delivery_order_value }}</td>
+        <td>{{ o.delivery_order_value|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Incumbent Contractor Name<br />(if applicable)</td>
-        <td>{{ o.incumbent_name }}</td>
+        <td>{{ o.incumbent_name|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Contract Order Number</td>
-        <td>{{ o.delivery_order_value }}</td>
+        <td>{{ o.delivery_order_value|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">New Requirement or Exercise of Option or Recompete</td>
-        <td>{{ o.new_requirement }}</td>
+        <td>{{ o.new_requirement|default:"–" }}</td>
       </tr>
       <tr>
         <td scope="row">Estimated Award Fiscal Year and Quarter</td>
-        <td>{{ o.estimated_fiscal_year }}–{{ o.estimated_fiscal_year_quarter }}</td>
+        <td>{{ o.estimated_fiscal_year }}–{{ o.estimated_fiscal_year_quarter }} Quarter</td>
       </tr>
       <tr>
         <td scope="row">Link to Solicitation in FedBizOpps</td>
-        <td><a href="fedbizopps_link">{{ o.fedbizopps_link }}</a></td>
+        <td>
+          {% if o.fedbizopps_link %}
+            <a href="{{ o.fedbizopps_link }}">{{ o.fedbizopps_link }}</a>
+          {% else %}
+            –
+          {% endif %}
+        </td>
       </tr>
 
-      {% for key, value in o.items %}
-      <tr>
-        <td scope="row">{{ key }}</td>
-        <td>{{ value }}</td>
-      </tr>
-      {% endfor %}
-
 
     </tbody>
   </table>
   <h2>Contact Information</h2>
-  <table class="usa-table-borderless">
+  <table class="usa-table-borderless table-detail">
     <tr>
       <td scope="row">Point of Contact<br />(Name)</td>
       <td>{{ o.point_of_contact_name }}</td>
@@ -94,11 +94,11 @@ <h2>Contact Information</h2>
     </tr>
     <tr>
       <td scope="row">Small Business Technical Advisor<br />(SBTA)</td>
-      <td>{{ o.osbu_advisor|first }}</td>
-    </tr>
-    <tr>
-      <td scope="row">Additional Information</td>
-      <td>{{ o.additional_information }}</td>
+      <td>{{ o.osbu_advisor.0 }}, {{ o.osbu_advisor.1 }}, {{ o.osbu_advisor.2 }}</td>
     </tr>
+      <tr>
+        <td scope="row">Additional Information</td>
+        <td>{{ o.additional_information|default:"–" }}</td>
+      </tr>
   </table>
 {% endblock %}
diff --git a/forecast-admin/forecast/static/assets/_scss/components/_header.scss b/forecast-admin/forecast/static/assets/_scss/components/_header.scss
@@ -1,3 +1,5 @@
+$logo-width: 60px;
+
 
 .header {
   padding-bottom: $base-padding-lite;
@@ -13,8 +15,8 @@
 
 .header-logo,
 .header-logo_link {
-  width: 50px;
-  height: 50px;
+  width: $logo-width;
+  height: $logo-width;
   display: inline-block;
 }
 
@@ -41,118 +43,4 @@
   vertical-align: text-bottom;
 }
 
-.usa-grid {
-  padding-top: $grid-margins;
-}
-
-
-// $width-nav-sidebar:  250px;
-// $color-grid-dark:    #727272;
-// $color-grid-light:   #e3e4e5;
-// $site-top:           124px;
-
-// .usa-site-header {
-//   // @include position(fixed, 0 null null 0);
-//   background-color: $color-white;
-//   border-bottom: 1px solid $color-gray-light;
-//   width: 100%;
-//   z-index: 1;
-
-//   a {
-//     border-bottom: none;
-//   }
-// }
-
-// .usa-site-header .usa-site-navbar {
-//   @include media($medium-screen + $width-nav-sidebar) {
-//     @include margin(2.7rem 0 1rem);
-//     height: 6rem;
-//   }
-
-//   margin-top: 4px;
-
-//   .logo {
-//     @include media($medium-screen + $width-nav-sidebar) {
-//       @include padding(0 null null $site-margins);
-//       text-align: left;
-//       width: auto;
-//     }
-
-//     float: left;
-//     text-align: center;
-//     padding-top: 1.3rem;
-//     width: 70%;
-
-//     a {
-//       color: $color-gray;
-
-//       &:hover {
-//         color: $color-gray-dark;
-//         text-decoration: none;
-//       }
-//     }
-//   }
-
-//   h1 {
-//     @include media($medium-screen + $width-nav-sidebar) {
-//       display: block;
-//       font-size: $h3-font-size;
-//       margin-top: .9rem;
-//     }
-
-//     margin: 0;
-//     font-size: $h5-font-size;
-//   }
-
-//   .usa-button-list {
-//     @include media($medium-screen + $width-nav-sidebar) {
-//       display: block;
-//       padding-right: $site-margins;
-//     }
-
-//     float: right;
-//     display: none;
-//     margin-top: -5px;
-
-//     li {
-//       display: inline;
-//       font-family: $font-sans;
-
-//       &:last-child .usa-button {
-//         margin-right: 0;
-//       }
-//     }
-//   }
-// }
-
-
-// .usa-site-header .disclaimer {
-//   padding: .5rem 2rem;
-//   color: white;
-//   text-align: center;
-//   font-size: $base-font-size / 1.25;
-//   border-bottom: 1px solid #616161;
-//   font-weight: 100;
-
-//   .us-official {
-//     margin: 0;
-//   }
-
-//   .stage {
-//     a { text-decoration: underline; }
-//     float: none;
-//     display: block;
-//     padding-top: 5px;
-//   }
-
-//   @include media($medium-screen + $width-nav-sidebar) {
-//     .us-official {
-//       margin-left: 177px;
-//     }
 
-//     .stage {
-//       float: right;
-//       padding: 0;
-//     }
-//   }
-// }
diff --git a/forecast-admin/forecast/static/assets/_scss/core/_variables.scss b/forecast-admin/forecast/static/assets/_scss/core/_variables.scss
@@ -17,6 +17,7 @@ $lead-line-height:    1.7;
 $font-sans:           'Source Sans Pro', 'Helvetica', 'Arial', sans-serif;
 $font-serif:          'Merriweather', 'Georgia', 'Times New Roman', serif;
 
+$font-light:          200;
 $font-normal:         400;
 $font-bold:           700;
 

diff --git a/forecast-admin/forecast/static/assets/_scss/elements/_table.scss b/forecast-admin/forecast/static/assets/_scss/elements/_table.scss
@@ -39,10 +39,17 @@ table {
 }
 
 .table-detail {
+  font-family: $font-sans;
+
   tr {
 
   }
 
+  td {
+    border: none;
+    vertical-align: top;
+  }
+
   td:first-of-type {
     font-weight: 600;
   }

diff --git a/forecast-admin/forecast/static/assets/_scss/elements/_typography.scss b/forecast-admin/forecast/static/assets/_scss/elements/_typography.scss
@@ -19,7 +19,7 @@ a {
   color: $color-primary;
   text-decoration: none;
 
-  &:hover, 
+  &:hover,
   &:active {
     color: $color-primary-darker;
     text-decoration: underline;
@@ -37,15 +37,15 @@ a {
 
 h1, h2, h3, h4, h5, h6 {
   clear: both;
-  font-family: $font-serif;
+  font-family: $font-sans;
   line-height: $heading-line-height;
   margin: {
     top: 1.5em;
     bottom: .5em;
   }
 }
 
-// Create heading mixins 
+// Create heading mixins
 
 @mixin title {
   font-size: $title-font-size;
@@ -74,7 +74,7 @@ h1, h2, h3, h4, h5, h6 {
 
 @mixin h5 {
   font-size: $h5-font-size;
-  font-weight: $font-bold;
+  font-weight: $font-normal;
 }
 
 @mixin h6 {
@@ -105,14 +105,14 @@ h5 {
 }
 
 h6 {
-  @include h6(); 
+  @include h6();
 }
 
 // Remove user agent styles
 
-cite, 
-var, 
-address, 
+cite,
+var,
+address,
 dfn {
  font-style: normal;
 }
@@ -122,33 +122,33 @@ dfn {
 .usa-content {
   p {
     max-width: $text-max-width;
-  }  
+  }
 }
 
 .usa-content-list {
   max-width: $text-max-width;
 }
 
-p, 
+p,
 .usa-content-list {
   a {
     text-decoration: underline;
   }
 }
 
 .usa-sans {
-  p, 
-  a, 
-  li, 
+  p,
+  a,
+  li,
   span {
     font-family: $font-sans;
   }
 }
 
 .usa-serif {
-  p, 
-  a, 
-  li, 
+  p,
+  a,
+  li,
   span {
     font-family: $font-serif;
   }
@@ -207,7 +207,7 @@ p,
 
   a {
     color: $color-gray-lighter;
-    
+
     &:hover {
       color: $color-white;
     }