Design overhaul to use US Web Design Standards (#235) · ap713741-svg/https@dccaf3e · GitHub
Skip to content

Commit dccaf3e

Browse files
konklonekonklone
authored
Design overhaul to use US Web Design Standards (GSA#235)
* design and theme overhaul to match cyber.dhs.gov and IT Mod * restore an Edit This Page link * move banner color to what it has been
1 parent b207fe9 commit dccaf3e

145 files changed

Lines changed: 627 additions & 6877 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 1 deletion

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6.2.2

‎.travis.yml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Gemfile‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
source "https://rubygems.org"
22

33
gem 'jekyll'
4+
5+
# TODO: remove
46
gem 'redcarpet'
57
gem 'rouge'
6-
7-
gem 'bourbon'
8-
gem 'sass'
9-
gem 'neat'
10-
11-
gem 'travis'

‎Gemfile.lock‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.4.0)
5-
backports (3.6.8)
64
blankslate (2.1.2.4)
7-
bourbon (4.2.1)
8-
sass (~> 3.4)
9-
thor
105
celluloid (0.16.0)
116
timers (~> 4.0.0)
127
classifier-reborn (2.0.3)
@@ -16,23 +11,9 @@ GEM
1611
execjs
1712
coffee-script-source (1.9.1)
1813
colorator (0.1)
19-
ethon (0.9.1)
20-
ffi (>= 1.3.0)
2114
execjs (2.4.0)
22-
faraday (0.10.0)
23-
multipart-post (>= 1.2, < 3)
24-
faraday_middleware (0.10.1)
25-
faraday (>= 0.7.4, < 1.0)
2615
fast-stemmer (1.0.2)
2716
ffi (1.9.8)
28-
gh (0.15.0)
29-
addressable (~> 2.4.0)
30-
backports
31-
faraday (~> 0.8)
32-
multi_json (~> 1.0)
33-
net-http-persistent (~> 2.9)
34-
net-http-pipeline
35-
highline (1.7.8)
3617
hitimes (1.2.2)
3718
jekyll (2.5.3)
3819
classifier-reborn (~> 2.0)
@@ -57,29 +38,16 @@ GEM
5738
sass (~> 3.2)
5839
jekyll-watch (1.2.1)
5940
listen (~> 2.7)
60-
json (1.8.3)
6141
kramdown (1.6.0)
62-
launchy (2.4.3)
63-
addressable (~> 2.3)
6442
liquid (2.6.2)
6543
listen (2.9.0)
6644
celluloid (>= 0.15.2)
6745
rb-fsevent (>= 0.9.3)
6846
rb-inotify (>= 0.9)
6947
mercenary (0.3.5)
70-
multi_json (1.12.1)
71-
multipart-post (2.0.0)
72-
neat (1.7.2)
73-
bourbon (>= 4.0)
74-
sass (>= 3.3)
75-
net-http-persistent (2.9.4)
76-
net-http-pipeline (1.0.1)
7748
parslet (1.5.0)
7849
blankslate (~> 2.0)
7950
posix-spawn (0.3.10)
80-
pusher-client (0.6.2)
81-
json
82-
websocket (~> 1.0)
8351
pygments.rb (0.6.2)
8452
posix-spawn (~> 0.3.6)
8553
yajl-ruby (~> 1.2.0)
@@ -90,37 +58,19 @@ GEM
9058
rouge (1.8.0)
9159
safe_yaml (1.0.4)
9260
sass (3.4.13)
93-
thor (0.19.1)
9461
timers (4.0.1)
9562
hitimes
9663
toml (0.1.2)
9764
parslet (~> 1.5.0)
98-
travis (1.8.4)
99-
backports
100-
faraday (~> 0.9)
101-
faraday_middleware (~> 0.9, >= 0.9.1)
102-
gh (~> 0.13)
103-
highline (~> 1.6)
104-
launchy (~> 2.1)
105-
net-http-persistent (~> 2.9)
106-
pusher-client (~> 0.4)
107-
typhoeus (~> 0.6, >= 0.6.8)
108-
typhoeus (0.8.0)
109-
ethon (>= 0.8.0)
110-
websocket (1.2.3)
11165
yajl-ruby (1.2.1)
11266

11367
PLATFORMS
11468
ruby
11569

11670
DEPENDENCIES
117-
bourbon
11871
jekyll
119-
neat
12072
redcarpet
12173
rouge
122-
sass
123-
travis
12474

12575
BUNDLED WITH
126-
1.13.6
76+
1.14.6

‎Makefile‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎README.md‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,28 @@ The homepage of this site is the final policy. The other pages on [https.cio.gov
1818

1919
### Developing on the site locally
2020

21-
This site uses [Jekyll](http://jekyllrb.com), [Sass](http://sass-lang.com), [Bourbon](http://bourbon.io), [Neat](http://neat.bourbon.io), and requires **Ruby 2.x**.
21+
If you're using this repository to run the site locally, instructions follow below.
2222

23-
Install dependencies with Bundler:
23+
Dependencies:
2424

25-
```
26-
bundle install
27-
```
25+
* **Node 6+** to install USWDS and dependencies
26+
* **Ruby** and **bundler** to install / run Jekyll
2827

29-
Start up a Sass watcher to keep assets auto-compiled:
28+
##### First-time setup
3029

31-
```
32-
make watch
33-
```
30+
1. `npm install` to install the USWDS, and Gulp dependencies.
31+
2. `npm install -g gulp` to let you use the `gulp` CLI directly.
32+
3. `bundle install` to install Jekyll.
3433

35-
And run the site with Jekyll:
34+
##### Running the app
3635

37-
```
38-
bundle exec jekyll serve --watch
39-
```
36+
If you'll be editing the Sass/CSS:
4037

41-
If all goes well, visit the site at `http://localhost:4000`.
38+
* `gulp watch`
39+
40+
To run the app:
41+
42+
* `bundle exec jekyll serve`
4243

4344
### Public domain
4445

‎_config.yml‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
# markdown
1+
# Site metadata
2+
title: The HTTPS-Only Standard
3+
description: "Resources, best practices, and case studies for deploying HTTPS in the federal government."
4+
url: https://https.cio.gov
5+
6+
# DAP, GA, and GitHub
7+
dap_agency: GSA
8+
google_analytics_ua: UA-48605964-20
9+
repo: https://github.com/GSA/https
10+
11+
# Standard
12+
uswds_path: assets/vendor/uswds
13+
14+
# TODO: get rid of this
215
highlighter: rouge
316
markdown: redcarpet
417
redcarpet:
@@ -7,53 +20,17 @@ redcarpet:
720
- with_toc_data
821

922
exclude:
23+
- compliance
24+
- resources
1025
- ".ruby-version"
1126
- ".jekyll-metadata"
1227
- ".gitignore"
13-
- ".travis.yml"
1428
- todo.txt
15-
- resources
29+
- Staticfile
1630
- Gemfile
1731
- Gemfile.lock
18-
- Makefile
1932
- vendor
2033
- README.md
2134
- CONTRIBUTING.md
2235
- LICENSE.md
23-
- compliance
24-
25-
# Site metadata
26-
name: The HTTPS-Only Standard
27-
description: "Resources, best practices, and case studies for deploying HTTPS in the federal government."
28-
url: https://https.cio.gov
29-
30-
# GitHub information
31-
org_name: GSA
32-
repo_name: https
33-
branch: master
34-
35-
# Navigation
36-
# List links that should appear in the site sidebar here
37-
navigation:
38-
- text: Home
39-
url: /
40-
- text: Why Everything?
41-
url: /everything/
42-
- text: Compliance Guide
43-
url: /guide/
44-
- text: Introduction to HTTPS
45-
url: /faq/
46-
- text: Certificates
47-
url: /certificates/
48-
- text: HTTP Strict Transport Security
49-
url: /hsts/
50-
- text: Migrating APIs
51-
url: /apis/
52-
- text: Server Name Indication
53-
url: /sni/
54-
- text: Technical Guidelines
55-
url: /technical-guidelines/
56-
- text: Mixed Content
57-
url: /mixed-content/
58-
- text: Resources
59-
url: /resources/
36+
- .nvmrc

‎_data/navigation.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
2+
primary:
3+
- text: Home
4+
href: /
5+
- text: Why Everything?
6+
href: /everything/
7+
- text: Compliance Guide
8+
href: /guide/
9+
- text: Introduction to HTTPS
10+
href: /faq/
11+
- text: Certificates
12+
href: /certificates/
13+
- text: HTTP Strict Transport Security
14+
href: /hsts/
15+
- text: Migrating APIs
16+
href: /apis/
17+
- text: Server Name Indication
18+
href: /sni/
19+
- text: Technical Guidelines
20+
href: /technical-guidelines/
21+
- text: Mixed Content
22+
href: /mixed-content/
23+
- text: Resources
24+
href: /resources/
25+
26+
mobile:
27+
- text: Home
28+
href: /
29+
- text: Why Everything?
30+
href: /everything/
31+
- text: Compliance Guide
32+
href: /guide/
33+
- text: Introduction to HTTPS
34+
href: /faq/
35+
- text: Certificates
36+
href: /certificates/
37+
- text: HTTP Strict Transport Security
38+
href: /hsts/
39+
- text: Migrating APIs
40+
href: /apis/
41+
- text: Server Name Indication
42+
href: /sni/
43+
- text: Technical Guidelines
44+
href: /technical-guidelines/
45+
- text: Mixed Content
46+
href: /mixed-content/
47+
- text: Resources
48+
href: /resources/

‎_includes/banner.html‎

Lines changed: 10 additions & 0 deletions

0 commit comments

Comments
 (0)