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

move WDS to a vendor folder instead for easier updating

  • Loading branch information
hbillings committed May 24, 2017
1 parent 88f03c6 commit 5e1dc53dcd078f6361baa6711c21980d390b8eba
Showing with 1,926 additions and 2,124 deletions.
  1. +2 −2 README.md
  2. +1 −1 _config.yml
  3. +1 −2 _includes/head.html
  4. +4 −4 _includes/header.html
  5. +2 −2 _includes/javascript.html
  6. +4 −0 _sass/_banners.scss
  7. +0 −102 assets/css/google-fonts.css
  8. +0 −2,006 assets/css/usfwds.css
  9. +0 −5 assets/js/lib/jquery-1.11.3.min.js
  10. +4 −0 assets/vendor/jquery-3.2.1.min.js
  11. +145 −0 assets/vendor/uswds-1.1.0/CONTRIBUTING.md
  12. +63 −0 assets/vendor/uswds-1.1.0/LICENSE.md
  13. +254 −0 assets/vendor/uswds-1.1.0/README.md
  14. 0 assets/{css/uswds.v1.1.0.css → vendor/uswds-1.1.0/css/uswds.css}
  15. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.eot
  16. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.ttf
  17. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.woff
  18. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-bold-webfont.woff2
  19. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.eot
  20. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.ttf
  21. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.woff
  22. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-italic-webfont.woff2
  23. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.eot
  24. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.ttf
  25. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.woff
  26. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-light-webfont.woff2
  27. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.eot
  28. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.ttf
  29. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.woff
  30. BIN assets/vendor/uswds-1.1.0/fonts/merriweather-regular-webfont.woff2
  31. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.eot
  32. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.ttf
  33. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.woff
  34. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-bold-webfont.woff2
  35. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.eot
  36. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.ttf
  37. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.woff
  38. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-italic-webfont.woff2
  39. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.eot
  40. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.ttf
  41. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.woff
  42. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-light-webfont.woff2
  43. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.eot
  44. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.ttf
  45. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.woff
  46. BIN assets/vendor/uswds-1.1.0/fonts/sourcesanspro-regular-webfont.woff2
  47. BIN assets/{ → vendor/uswds-1.1.0}/img/alerts/error.png
  48. 0 assets/{ → vendor/uswds-1.1.0}/img/alerts/error.svg
  49. BIN assets/{ → vendor/uswds-1.1.0}/img/alerts/info.png
  50. 0 assets/{ → vendor/uswds-1.1.0}/img/alerts/info.svg
  51. BIN assets/{ → vendor/uswds-1.1.0}/img/alerts/success.png
  52. 0 assets/{ → vendor/uswds-1.1.0}/img/alerts/success.svg
  53. BIN assets/{ → vendor/uswds-1.1.0}/img/alerts/warning.png
  54. 0 assets/{ → vendor/uswds-1.1.0}/img/alerts/warning.svg
  55. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-hover.png
  56. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-hover.svg
  57. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-primary-hover.png
  58. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-primary-hover.svg
  59. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-primary.png
  60. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down-primary.svg
  61. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down.png
  62. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-down.svg
  63. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-up-primary-hover.png
  64. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-up-primary-hover.svg
  65. BIN assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-up-primary.png
  66. 0 assets/{ → vendor/uswds-1.1.0}/img/angle-arrow-up-primary.svg
  67. BIN assets/{ → vendor/uswds-1.1.0}/img/arrow-down.png
  68. 0 assets/{ → vendor/uswds-1.1.0}/img/arrow-down.svg
  69. BIN assets/{ → vendor/uswds-1.1.0}/img/arrow-right.png
  70. 0 assets/{ → vendor/uswds-1.1.0}/img/arrow-right.svg
  71. BIN assets/{ → vendor/uswds-1.1.0}/img/circle-124.png
  72. BIN assets/{ → vendor/uswds-1.1.0}/img/close.png
  73. 0 assets/{ → vendor/uswds-1.1.0}/img/close.svg
  74. BIN assets/{ → vendor/uswds-1.1.0}/img/correct8.png
  75. 0 assets/{ → vendor/uswds-1.1.0}/img/correct8.svg
  76. BIN assets/{ → vendor/uswds-1.1.0}/img/correct9.png
  77. 0 assets/{ → vendor/uswds-1.1.0}/img/correct9.svg
  78. BIN assets/{ → vendor/uswds-1.1.0}/img/external-link-alt-hover.png
  79. 0 assets/{ → vendor/uswds-1.1.0}/img/external-link-alt-hover.svg
  80. BIN assets/{ → vendor/uswds-1.1.0}/img/external-link-alt.png
  81. 0 assets/{ → vendor/uswds-1.1.0}/img/external-link-alt.svg
  82. BIN assets/{ → vendor/uswds-1.1.0}/img/external-link-hover.png
  83. 0 assets/{ → vendor/uswds-1.1.0}/img/external-link-hover.svg
  84. BIN assets/{ → vendor/uswds-1.1.0}/img/external-link.png
  85. 0 assets/{ → vendor/uswds-1.1.0}/img/external-link.svg
  86. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-114.png
  87. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-144.png
  88. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-16.png
  89. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-192.png
  90. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-40.png
  91. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-57.png
  92. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon-72.png
  93. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon.ico
  94. BIN assets/{ → vendor/uswds-1.1.0}/img/favicons/favicon.png
  95. BIN assets/{ → vendor/uswds-1.1.0}/img/hero.png
  96. 0 assets/{ → vendor/uswds-1.1.0}/img/icon-dot-gov.svg
  97. 0 assets/{ → vendor/uswds-1.1.0}/img/icon-https.svg
  98. BIN assets/{ → vendor/uswds-1.1.0}/img/logo-img.png
  99. BIN assets/{ → vendor/uswds-1.1.0}/img/minus-alt.png
  100. 0 assets/{ → vendor/uswds-1.1.0}/img/minus-alt.svg
  101. BIN assets/{ → vendor/uswds-1.1.0}/img/minus.png
  102. 0 assets/{ → vendor/uswds-1.1.0}/img/minus.svg
  103. BIN assets/{ → vendor/uswds-1.1.0}/img/plus-alt.png
  104. 0 assets/{ → vendor/uswds-1.1.0}/img/plus-alt.svg
  105. BIN assets/{ → vendor/uswds-1.1.0}/img/plus.png
  106. 0 assets/{ → vendor/uswds-1.1.0}/img/plus.svg
  107. BIN assets/{ → vendor/uswds-1.1.0}/img/search-alt.png
  108. 0 assets/{ → vendor/uswds-1.1.0}/img/search-alt.svg
  109. BIN assets/{ → vendor/uswds-1.1.0}/img/search.png
  110. 0 assets/{ → vendor/uswds-1.1.0}/img/search.svg
  111. BIN assets/{ → vendor/uswds-1.1.0}/img/social-icons/png/facebook25.png
  112. BIN assets/{ → vendor/uswds-1.1.0}/img/social-icons/png/rss25.png
  113. BIN assets/{ → vendor/uswds-1.1.0}/img/social-icons/png/twitter16.png
  114. BIN assets/{ → vendor/uswds-1.1.0}/img/social-icons/png/youtube15.png
  115. 0 assets/{ → vendor/uswds-1.1.0}/img/social-icons/svg/facebook25.svg
  116. 0 assets/{ → vendor/uswds-1.1.0}/img/social-icons/svg/rss25.svg
  117. 0 assets/{ → vendor/uswds-1.1.0}/img/social-icons/svg/twitter16.svg
  118. 0 assets/{ → vendor/uswds-1.1.0}/img/social-icons/svg/youtube15.svg
  119. BIN assets/{ → vendor/uswds-1.1.0}/img/us_flag_small.png
  120. +1,445 −0 assets/vendor/uswds-1.1.0/js/uswds.js
  121. 0 assets/{js/lib/uswds.v1.1.0.min.js → vendor/uswds-1.1.0/js/uswds.min.js}
  122. +1 −0 assets/vendor/uswds-1.1.0/js/uswds.min.js.map
@@ -4,9 +4,9 @@ This is a Jekyll site. It is a simple site to showcase the work of an organizati

This particular site is made for use with the [Federalist](https://github.com/18f/federalist) in mind.

This template uses the CSS and JavaScript from [U.S. Web Design System](https://standards.18f.gov). To update the version of the system, [download the code](https://standards.usa.gov/getting-started/download/), then copy the CSS file to `assets/css/`. The file must include the version number, like this: `uswds.v1.1.0.css`. Copy the minified JavaScript file to `assets/js/lib/`. Again, rename the file to use the version number, so it looks like: `uswds.v1.1.0.min.js`.
This template uses the CSS and JavaScript from [U.S. Web Design System](https://standards.18f.gov). To update the version of the system, [download the code](https://standards.usa.gov/getting-started/download/) from the website. Unzip the download and drop the entire folder (which should be named something like `uswds-1.1.0`) into `assets/vendor`.

In your `_config.yml`, update the `wds_version` value to the new version number. This should match the number following the `v` in the filenames you just created. In the case of our example, it would look like this: `wds_version: 1.1.0`. You'll need to restart your Jekyll server to see the new code take effect.
In your `_config.yml`, update the `wds-version` value to the new version number. This should match the version number in the name of the folder you just downloaded. In the case of our example, it would look like this: `wds-version: 1.1.0`. You'll need to restart your Jekyll server to see the new code take effect.

## 18F Open Source Policy

@@ -102,4 +102,4 @@ collections:
team:
output: true

wds_version: 1.1.0
wds-version: 1.1.0
@@ -16,8 +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="{{ '/assets/css/google-fonts.css' | prepend: site.baseurl }}">
<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/uswds.v{{site.wds_version}}.css">
<link rel="stylesheet" href="{{ site.baseurl }}/assets/vendor/uswds-{{site.wds-version}}/css/uswds.css">
<link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl }}">

<link rel="shortcut icon" type="image/x-icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl }}" />
@@ -6,7 +6,7 @@
<div class="usa-accordion">
<header class="usa-banner-header">
<div class="usa-grid usa-banner-inner">
<img src="{{ site.baseurl }}/assets/img/us_flag_small.png" alt="U.S. flag">
<img src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/us_flag_small.png" alt="U.S. flag">
<p>An official website of the United States government</p>
<button class="usa-accordion-button usa-banner-button"
aria-expanded="false" aria-controls="gov-banner">
@@ -16,7 +16,7 @@
</header>
<div class="usa-banner-content usa-grid usa-accordion-content" id="gov-banner">
<div class="usa-banner-guidance-gov usa-width-one-half">
<img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/img/icon-dot-gov.svg" alt="Dot gov">
<img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/icon-dot-gov.svg" alt="Dot gov">
<div class="usa-media_block-body">
<p>
<strong>The .gov means it’s official.</strong>
@@ -26,7 +26,7 @@
</div>
</div>
<div class="usa-banner-guidance-ssl usa-width-one-half">
<img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/img/icon-https.svg" alt="SSL">
<img class="usa-banner-icon usa-media_block-img" src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/icon-https.svg" alt="SSL">
<div class="usa-media_block-body">
<p>This site is also protected by an SSL (Secure Sockets Layer) certificate that’s been signed by the U.S. government. The <strong>https://</strong> means all transmitted data is encrypted — in other words, any information or browsing history that you provide is transmitted securely.</p>
</div>
@@ -53,7 +53,7 @@ <h1 class="usa-header-title">{{ site.title }}</h1>
</div>
<nav role="navigation" class="usa-nav">
<button class="usa-nav-close">
<img src="/assets/img/close.svg" alt="close">
<img src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/img/close.svg" alt="close">
</button>
<ul class="usa-nav-primary usa-accordion">
{% assign navs = site.data.navbar.assigned %}
@@ -1,5 +1,5 @@
<script src="{{ '/assets/js/lib/jquery-1.11.3.min.js' | prepend: site.baseurl }}"></script>
<script src="{{ site.baseurl }}/assets/js/lib/uswds.v{{ site.wds_version }}.min.js"></script>
<script src="{{ site.baseurl }}/assets/vendor/jquery-3.2.1.min.js"></script>
<script src="{{ site.baseurl }}/assets/vendor/uswds-{{ site.wds-version }}/js/uswds.min.js"></script>
<script src="{{ '/assets/js/index.js' | prepend: site.baseurl }}"></script>

<!--
@@ -1,3 +1,7 @@
.usa-banner-header .usa-banner-inner > img {
padding-top: 3px;
}

.banner.tagline {
background-color: $banner-background-color;
}

This file was deleted.

0 comments on commit 5e1dc53

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