Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Adjust styles to defaults. Remove some user-specific content

  • Loading branch information...
dhcole committed Sep 24, 2015
1 parent 7526b96 commit 7351ab7fa3846d517ee24ed333fe5eed23fa6879
Showing with 5,046 additions and 149 deletions.
  1. +1 −0 .gitignore
  2. +24 −26 _config.yml
  3. +2 −6 _data/navbar.yml
  4. +2 −2 _includes/contact.html
  5. +1 −1 _includes/head.html
  6. +7 −7 _sass/_banners.scss
  7. +0 −3 _sass/_base.scss
  8. +1 −1 _sass/_hero.scss
  9. +1 −1 _sass/_navbar.scss
  10. +6 −0 _sass/_projects.scss
  11. +102 −0 assets/css/google-fonts.css
  12. +4 −4 assets/css/main.scss
  13. BIN assets/fonts/merriweather-bold-webfont.eot
  14. +294 −0 assets/fonts/merriweather-bold-webfont.svg
  15. BIN assets/fonts/merriweather-bold-webfont.ttf
  16. BIN assets/fonts/merriweather-bold-webfont.woff
  17. BIN assets/fonts/merriweather-bold-webfont.woff2
  18. BIN assets/fonts/merriweather-italic-webfont.eot
  19. +283 −0 assets/fonts/merriweather-italic-webfont.svg
  20. BIN assets/fonts/merriweather-italic-webfont.ttf
  21. BIN assets/fonts/merriweather-italic-webfont.woff
  22. BIN assets/fonts/merriweather-italic-webfont.woff2
  23. BIN assets/fonts/merriweather-light-webfont.eot
  24. +299 −0 assets/fonts/merriweather-light-webfont.svg
  25. BIN assets/fonts/merriweather-light-webfont.ttf
  26. BIN assets/fonts/merriweather-light-webfont.woff
  27. BIN assets/fonts/merriweather-light-webfont.woff2
  28. BIN assets/fonts/merriweather-regular-webfont.eot
  29. +294 −0 assets/fonts/merriweather-regular-webfont.svg
  30. BIN assets/fonts/merriweather-regular-webfont.ttf
  31. BIN assets/fonts/merriweather-regular-webfont.woff
  32. BIN assets/fonts/merriweather-regular-webfont.woff2
  33. BIN assets/fonts/sourcesanspro-bold-webfont.eot
  34. +965 −0 assets/fonts/sourcesanspro-bold-webfont.svg
  35. BIN assets/fonts/sourcesanspro-bold-webfont.ttf
  36. BIN assets/fonts/sourcesanspro-bold-webfont.woff
  37. BIN assets/fonts/sourcesanspro-bold-webfont.woff2
  38. BIN assets/fonts/sourcesanspro-italic-webfont.eot
  39. +853 −0 assets/fonts/sourcesanspro-italic-webfont.svg
  40. BIN assets/fonts/sourcesanspro-italic-webfont.ttf
  41. BIN assets/fonts/sourcesanspro-italic-webfont.woff
  42. BIN assets/fonts/sourcesanspro-italic-webfont.woff2
  43. BIN assets/fonts/sourcesanspro-light-webfont.eot
  44. +915 −0 assets/fonts/sourcesanspro-light-webfont.svg
  45. BIN assets/fonts/sourcesanspro-light-webfont.ttf
  46. BIN assets/fonts/sourcesanspro-light-webfont.woff
  47. BIN assets/fonts/sourcesanspro-light-webfont.woff2
  48. BIN assets/fonts/sourcesanspro-regular-webfont.eot
  49. +989 −0 assets/fonts/sourcesanspro-regular-webfont.svg
  50. BIN assets/fonts/sourcesanspro-regular-webfont.ttf
  51. BIN assets/fonts/sourcesanspro-regular-webfont.woff
  52. BIN assets/fonts/sourcesanspro-regular-webfont.woff2
  53. BIN assets/img/feature-background.jpg
  54. BIN assets/img/logo-main.gif
  55. +0 −1 google823645bd9402facd.html
  56. +0 −31 pages/2015-annual-report.md
  57. +0 −33 pages/approach.md
  58. +0 −24 pages/contact.md
  59. +1 −1 pages/home.md
  60. +2 −8 pages/work.md
@@ -1,2 +1,3 @@
_site
.sass-cache
.DS_Store
@@ -1,45 +1,44 @@
# Site settings
title: Social and Behavioral Sciences Team
description: We are a cross-agency team with backgrounds in a diversity of fields, including economics, policy, psychology, law, medicine, statistics and political science. What unifies us is our commitment to using what research tells us about how people make decisions to better serve Americans and improve government efficiency.
title: Your Site Name
description: A description of your website that will show up in search indexes and social media shares.
baseurl: "" # the subpath of your site, e.g. /blog/
url: "https://sbst.gov" # the base hostname & protocol for your site
logo: /assets/img/logos/logo-name.png
feature_image: /assets/img/potus.jpg
url: "https://example.gov" # the base hostname & protocol for your site
logo: /assets/img/logo-main.gif
feature_image: /assets/img/feature-background.jpg

colors:
background: '#fdfdfd'
background: '#ffffff'
button:
background: '#126ca7'
hover: '#134050'
background: '#0071bc'
hover: '#3e94cf'
text: '#fff'
headers: '#126ca7'
text: '#000000'
headers: '#205493'
text: '#212121'
projects:
accent: 'rgb(249, 131, 74)'
contact:
background: '#126ca7'
accent: '#02bfe7'
banner:
background: '#112e51'
text: '#fff'
button:
background: '#f2c446'
text: '#134050'
background: '#dce4ef'
text: '#112e51'
footer:
background: '#4c4c4c'
background: '#323a45'
text: '#fff'

analytics:
google:
code: 'UA-67580537-1'
code: 'UA-48605964-32' # Change this to your GSA analytics code
dap:
agency: GSA
subagency: SBST
agency: GSA # Change this to your agency
subagency: 18F # Change this to your agency

forms:
- type: newsletter
heading: Sign up to receive updates from our team
url: https://docs.google.com/forms/d/1Tsdm_2spbxWnmTFMrH5eHxpOAN9W4LB3eaMMXJ1N0rU/formResponse
button: Subscribe
privacypolicy:
name: GSA Privacy and Security Notice
url: https://gsa.gov
privacypolicy: Your privacy and security are important to us, we'll only share your information as described in the <a href="http://www.gsa.gov/portal/content/116609">GSA Privacy and Security Notice</a>
fields:
- type: email
name: entry.1440502332
@@ -50,11 +49,10 @@ forms:

footer:
image: /assets/img/gsa-logo-dark.jpg
email: sbst@gsa.gov
email:
twitter:
- usgsa
- whitehouseostp
text: This site is run by the General Services Administration for the National Science and Technology Council's Subcommittee on the Social and Behavioral Sciences Team.
- 18f
text: This site was built using <a href="https://federalist.18f.gov/" target="_blank">Federalist, from 18F</a>. # Change to a tag line for your agency

# Build settings
markdown: kramdown
@@ -1,8 +1,4 @@
- name: About
permalink: '/about/'
- name: Approach
permalink: '/approach/'
- name: Work
permalink: '/work/'
- name: Connect
permalink: '/connect/'
- name: Projects
permalink: '/projects/'
@@ -8,7 +8,7 @@

<form id="contact" action="{{ f.url }}" method="POST">
<fieldset>
<legend>Sign up to receive updates from SBST</legend>
<legend>{{ f.heading }}</legend>
<div class="usa-width-one-half">
{% for field in f.fields %}
{% unless field.type == 'hidden' %}<label for="contact-{{ field.name }}">{{ field.label }}</label>{% endunless %}
@@ -22,7 +22,7 @@
</div>
<div class="usa-width-one-half" style="margin-top: 3rem;">
{% if f.privacypolicy %}
<p>Your privacy and security are important to us, we'll only share your information as described in the <a href="http://www.gsa.gov/portal/content/116609">{{ f.privacypolicy.name }}</a></p>
<p>{{ f.privacypolicy }}</p>
{% else %}
<p></p>
{% endif %}
@@ -16,7 +16,7 @@
<meta property="og:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<meta name="twitter:description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300">
<link rel="stylesheet" href="{{ '/assets/css/google-fonts.css' | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ '/assets/css/usfwds.css' | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl }}">

@@ -1,20 +1,20 @@
.banner.tagline {
background-color: $contact-background-color;
background-color: $banner-background-color;
}
.banner.tagline .usa-grid {
padding: 3rem;
}
.banner.tagline p {
color: $contact-text-color;
color: $banner-text-color;
margin-bottom: 75px;
}
.banner.tagline h2 {
color: $contact-text-color;
color: $banner-text-color;
margin-top: 75px;
}

.banner.contact {
background-color: $contact-background-color;
background-color: $banner-background-color;
}
.banner.contact form {
padding-top: 2em;
@@ -26,7 +26,7 @@
.banner.contact a,
.banner.contact a:hover,
.banner.contact a:visited {
color: $contact-text-color;
color: $banner-text-color;
}

.banner .usa-button,
@@ -37,6 +37,6 @@
.banner [type="button"],
.banner [type="submit"],
.banner [type="reset"] {
background-color: $contact-button-color;
color: $contact-button-text-color;
background-color: $banner-button-color;
color: $banner-button-text-color;
}
@@ -1,13 +1,10 @@
body,
p, ul, ol, li, a {
color: $text-color;
font-family: 'Lato', sans-serif;
font-weight: 300;
}
legend, label,
h1, h2, h3, h4, h5, h6 {
color: $headers-color;
font-family: 'Lato', sans-serif;
}

legend,
@@ -1,7 +1,7 @@
.hero-unit {
background-size: cover;
background-repeat: no-repeat;
background-position: 50% 20%;
background-position: 50% 50%;
min-height: 32em;
position: relative;
}
@@ -18,7 +18,7 @@
height: 80px;
}
#logo img {
width: 60%;
margin-top: 0.75rem;
}
#logo a {
border: none;
@@ -32,3 +32,9 @@ a .project--description span {
a:hover .project--description span {
border-bottom: 1px dotted;
}

@media screen and (min-width: 600px) {
.usa-grid .usa-width-one-third:last-child {
margin-right: 1px;
}
}
@@ -0,0 +1,102 @@
@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 300;
src: url('../fonts/sourcesanspro-light-webfont.eot');
src: url('../fonts/sourcesanspro-light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/sourcesanspro-light-webfont.woff2') format('woff2'),
url('../fonts/sourcesanspro-light-webfont.woff') format('woff'),
url('../fonts/sourcesanspro-light-webfont.ttf') format('truetype'),
url('../fonts/sourcesanspro-light-webfont.svg#source_sans_prolight') format('svg');
}

@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 400;
src: url('../fonts/sourcesanspro-regular-webfont.eot');
src: url('../fonts/sourcesanspro-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/sourcesanspro-regular-webfont.woff2') format('woff2'),
url('../fonts/sourcesanspro-regular-webfont.woff') format('woff'),
url('../fonts/sourcesanspro-regular-webfont.ttf') format('truetype'),
url('../fonts/sourcesanspro-regular-webfont.svg#source_sans_proregular') format('svg');

}

@font-face {
font-family: 'Source Sans Pro';
font-style: italic;
font-weight: 400;
src: url('../fonts/sourcesanspro-italic-webfont.eot');
src: url('../fonts/sourcesanspro-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/sourcesanspro-italic-webfont.woff2') format('woff2'),
url('../fonts/sourcesanspro-italic-webfont.woff') format('woff'),
url('../fonts/sourcesanspro-italic-webfont.ttf') format('truetype'),
url('../fonts/sourcesanspro-italic-webfont.svg#source_sans_proitalic') format('svg');

}

@font-face {
font-family: 'Source Sans Pro';
font-style: normal;
font-weight: 700;
src: url('../fonts/sourcesanspro-bold-webfont.eot');
src: url('../fonts/sourcesanspro-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/sourcesanspro-bold-webfont.woff2') format('woff2'),
url('../fonts/sourcesanspro-bold-webfont.woff') format('woff'),
url('../fonts/sourcesanspro-bold-webfont.ttf') format('truetype'),
url('../fonts/sourcesanspro-bold-webfont.svg#source_sans_probold') format('svg');

}

@font-face {
font-family: 'Merriweather';
font-style: normal;
font-weight: 300;
src: url('../fonts/merriweather-light-webfont.eot');
src: url('../fonts/merriweather-light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/merriweather-light-webfont.woff2') format('woff2'),
url('../fonts/merriweather-light-webfont.woff') format('woff'),
url('../fonts/merriweather-light-webfont.ttf') format('truetype'),
url('../fonts/merriweather-light-webfont.svg#source_sans_proregular') format('svg');

}

@font-face {
font-family: 'Merriweather';
font-style: normal;
font-weight: 400;
src: url('../fonts/merriweather-regular-webfont.eot');
src: url('../fonts/merriweather-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/merriweather-regular-webfont.woff2') format('woff2'),
url('../fonts/merriweather-regular-webfont.woff') format('woff'),
url('../fonts/merriweather-regular-webfont.ttf') format('truetype'),
url('../fonts/merriweather-regular-webfont.svg#source_sans_proitalic') format('svg');

}

@font-face {
font-family: 'Merriweather';
font-style: italic;
font-weight: 400;
src: url('../fonts/merriweather-italic-webfont.eot');
src: url('../fonts/merriweather-italic-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/merriweather-italic-webfont.woff2') format('woff2'),
url('../fonts/merriweather-italic-webfont.woff') format('woff'),
url('../fonts/merriweather-italic-webfont.ttf') format('truetype'),
url('../fonts/merriweather-italic-webfont.svg#source_sans_proitalic') format('svg');

}

@font-face {
font-family: 'Merriweather';
font-style: normal;
font-weight: 700;
src: url('../fonts/merriweather-bold-webfont.eot');
src: url('../fonts/merriweather-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/merriweather-bold-webfont.woff2') format('woff2'),
url('../fonts/merriweather-bold-webfont.woff') format('woff'),
url('../fonts/merriweather-bold-webfont.ttf') format('truetype'),
url('../fonts/merriweather-bold-webfont.svg#source_sans_probold') format('svg');

}
@@ -22,10 +22,10 @@ $button-text-color: {{ site.colors.button.text }};

$project-accent-color: {{ site.colors.projects.accent }};

$contact-background-color: {{ site.colors.contact.background }};
$contact-text-color: {{ site.colors.contact.text }};
$contact-button-color: {{ site.colors.contact.button.background }};
$contact-button-text-color: {{ site.colors.contact.button.text }};
$banner-background-color: {{ site.colors.banner.background }};
$banner-text-color: {{ site.colors.banner.text }};
$banner-button-color: {{ site.colors.banner.button.background }};
$banner-button-text-color: {{ site.colors.banner.button.text }};

$footer-background-color: {{ site.colors.footer.background }};
$footer-text-color: {{ site.colors.footer.text }};
Binary file not shown.
Oops, something went wrong.

0 comments on commit 7351ab7

Please sign in to comment.
You can’t perform that action at this time.