Skip to content

Commit 695c455

Browse files
committed
Merge pull request #394 from github/update-typography
Adds Source Sans and updates css for typography.
2 parents 869edf9 + 6823572 commit 695c455

File tree

6 files changed

+75
-45
lines changed

6 files changed

+75
-45
lines changed

_includes/header.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<link rel="shortcut icon" href="/assets/img/favicon.ico" type="image/x-icon">
1010
<link rel="stylesheet" href="/assets/css/style.css">
1111
<link rel="stylesheet" href="/assets/css/icons.css">
12+
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,700' rel='stylesheet' type='text/css'>
1213
<script src="/assets/js/jquery.min.js"></script>
1314
<!--[if lt IE 9]>
1415
<script src="/assets/js/html5shiv.js"></script>

_includes/org-table.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
{% unless include.id == "governments" %}
33
<h3 id="{{ include.id }}" class="search-section">Return to <a href="#to-top">top</a>.</h3>
44
{% endunless %}
5-
<h2>{{ include.name }}</h2>
5+
<h3>{{ include.name }}</h3>
66
<h6 class="no-matches" style="display: none;">No matches.</h6>
77
<table class="table org-table">
88
<tbody class="searchable">
99
<tr class="table-header"><th>Avatar</th><th>Account</th><th>Affiliation</th></tr>
1010
{% for type_hash in include.orgs %}
1111
<tr class="type-block" id="{{ type_hash[0] | downcase | replace: ' ','_' }}">
12-
<td><h3>{{ type_hash[0] }} ({{ type_hash[1] | size }})</h3></td><td></td><td></td>
12+
<td><h4>{{ type_hash[0] }} ({{ type_hash[1] | size }})</h4></td><td></td><td></td>
1313
</tr>
1414
{% for org in type_hash[1] %}
1515
<tr>

_layouts/support-page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div class="mini-section">
66
<h1>{{ page.title }}</h1>
7-
<h3 class="description">{{ page.description }}</h3>
7+
<h3 class="description lead-graf">{{ page.description }}</h3>
88
</div>
99
</div>
1010

assets/css/style.css

Lines changed: 51 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,44 +15,69 @@ li img {
1515
/* begin overriding */
1616

1717
body {
18-
font: 300 14px/20px "Helvetica Neue", Helvetica, Arial, sans-serif;
18+
font: 400 16px/1.5 'Source Sans Pro','Helvetica Neue', Helvetica, Arial, sans-serif;
1919
color: #333;
2020
}
2121

2222
.container {
2323
max-width: 995px;
2424
}
2525

26+
p {
27+
font-size: 16px;
28+
font-weight: 400;
29+
line-height: 1.5;
30+
}
31+
2632
/* headings */
2733

2834
h1, h2, h3, h4, h5, h6 {
2935
color: #333;
3036
}
3137

3238
h1 {
33-
font-size: 42px;
39+
font-size: 54px;
3440
font-weight: 300;
35-
margin: 20px 0;
36-
line-height: 66px;
41+
line-height: 1.1;
42+
letter-spacing: -.02em;
43+
margin-bottom: .5em;
3744
}
3845

3946
h2 {
40-
font-size: 26px;
47+
font-size: 36px;
48+
font-weight: 400;
49+
line-height: 1.5;
4150
}
4251

4352
h3 {
44-
font-size: 20px;
45-
font-weight: normal;
46-
line-height: 30px;
53+
font-size: 24px;
54+
font-weight: 700;
55+
line-height: 1.2;
4756
}
4857

4958
h4 {
50-
font-size: 13px;
59+
font-size: 16px;
60+
font-weight: 700;
61+
line-height: 1.5;
62+
margin-bottom: 0;
5163
}
5264

5365
h6 {
5466
font-size: 13px;
5567
font-weight: normal;
68+
line-height: 1.5;
69+
}
70+
71+
.lead-graf {
72+
font-size: 24px;
73+
font-weight: 400;
74+
line-height: 1.5;
75+
}
76+
77+
.micro {
78+
font-size: 12px;
79+
font-weight: 400;
80+
line-height: 1.5;
5681
}
5782

5883
/* link styles */
@@ -128,7 +153,6 @@ li {
128153

129154
.navbar ul li a {
130155
color: #fff;
131-
font-weight: bold;
132156
}
133157

134158
/* Splash */
@@ -141,22 +165,21 @@ li {
141165
}
142166

143167
.splash h1 {
144-
font-size: 45px;
145-
text-shadow: 0px 1px 1px rgba(0,0,0,0.2);
168+
font-size: 54px;
169+
/*text-shadow: 0px 1px 1px rgba(0,0,0,0.2);*/
146170
color: #fff;
147171
border: none;
148172
padding: 0;
149173
margin: 0;
150-
font-weight: 300;
174+
margin-bottom: .5em;
151175
}
152176

153177
.splash h2 {
154-
font-weight: 300;
155-
font-size: 23px;
156178
color: #fff;
157179
padding: 0;
158180
margin: 0;
159-
text-shadow: 0px 1px 1px rgba(0,0,0,0.2);
181+
/*text-shadow: 0px 1px 1px rgba(0,0,0,0.2);*/
182+
opacity: .65;
160183
}
161184

162185
/* section */
@@ -243,17 +266,21 @@ li {
243266
.features .feature {
244267
/*color: #fff;*/
245268
margin-bottom: 50px;
246-
text-align: center;
269+
text-align: left;
247270
}
248271

249272
.features .feature h3 {
250273
/*color: #fff;*/
251-
font-weight: 700;
274+
/*font-weight: 700;*/
252275
/*text-align: left;*/
253-
font-size: 16px;
276+
/*font-size: 16px;*/
277+
font-weight: 400;
254278
}
255279

256280
.features .feature .mega-octicon {
281+
float: left;
282+
margin-right: 8px;
283+
margin-top: 8px;
257284
color: #2D86FB;
258285
}
259286

@@ -289,6 +316,7 @@ li {
289316

290317
.table-header th {
291318
border-bottom: 1px solid #ddd;
319+
font-weight: 300;
292320
}
293321

294322
.table td, .table th {
@@ -327,6 +355,10 @@ code {
327355

328356
.org-table tr { height: 57px; }
329357

358+
td h4 {
359+
margin: .5em 0;
360+
}
361+
330362
/* Animations */
331363
/* -------------------------------------------------------------------------- */
332364

community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ permalink: /community/
66
---
77
<div id="to-top" class="container">
88

9-
<h3><input id="filter" type="text" class="form-control" placeholder="Type to search..."> or jump to the <a href="#civic-hackers">civic hackers</a> or <a href="#research">research</a> lists.</h3></div>
9+
<h4><input id="filter" type="text" class="form-control" placeholder="Type to search..."> or jump to the <a href="#civic-hackers">civic hackers</a> or <a href="#research">research</a> lists.</h4></div>
1010

1111
{% include org-table.html orgs=site.data.governments id="governments" name="Governments" %}
1212

index.html

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,37 @@
88
<div class="mini-section">
99
<div class="section container features">
1010
<div class="row-fluid">
11-
<div class="span4 feature">
11+
<div class="span6 feature">
1212
<span class="mega-octicon octicon-terminal"></span>
1313
<h3>Upgrade your IT workflow</h3>
1414
<p><a href="http://git-scm.com/">Git</a> is an open-source version control system that tracks who made what change when across software projects.</p>
1515
</div>
16-
<div class="span4 feature">
16+
<div class="span6 feature">
1717
<span class="mega-octicon octicon-organization"></span>
1818
<h3>Public engagement, private collaboration</h3>
1919
<p>Publish open source software on <a href="https://github.com">GitHub.com</a> or collaborate privately and securely behind your agency's firewall.</p>
2020
</div>
21-
<div class="span4 feature">
21+
</div>
22+
<div class="row-fluid">
23+
<div class="span6 feature">
2224
<span class="mega-octicon octicon-git-pull-request"></span>
2325
<h3>Communicate more, manage less</h3>
2426
<p>GitHub's issue tracking tools give you day-to-day visibility into your project's success, without the need for lengthy meetings.</p>
2527
</div>
26-
</div>
2728

28-
<div class="row-fluid">
29-
<div class="span4 feature">
29+
<div class="span6 feature">
3030
<span class="mega-octicon octicon-lock"></span>
3131
<h3>Enterprise controls, startup speed</h3>
3232
<p>Collaborate openly while still limiting access to a team, to select stakeholders, or to an entire organization.</p>
3333
</div>
34-
35-
36-
<div class="span4 feature">
34+
</div>
35+
<div class="row-fluid">
36+
<div class="span6 feature">
3737
<span class="mega-octicon octicon-server"></span>
3838
<h3>In your datacenter or in the cloud</h3>
3939
<p>Run <a href="https://enterprise.github.com/">GitHub Enterprise</a> in your data center as a virtual appliance, on <a href="https://github.com/blog/2002-github-enterprise-now-on-aws-govcloud">AWS GovCloud</a> or <a href="https://enterprise.github.com/microsoft">Azure</a>, or let us host the code for you on <a href="https://github.com">GitHub.com</a>.</p>
4040
</div>
41-
42-
<div class="span4 feature">
41+
<div class="span6 feature">
4342
<span class="mega-octicon octicon-podium"></span>
4443
<h3>IT without the paperwork</h3>
4544
<p>GitHub.com's <a href="https://help.github.com/articles/amendment-to-github-terms-of-service-applicable-to-government-users">terms of service</a> are approved for government use by the <abbr title="General Services Administration">GSA</abbr>, and <a href="https://github.com/pricing">most plans</a> fall below the micro-purchase threshold.</p>
@@ -54,27 +53,27 @@ <h3>IT without the paperwork</h3>
5453
<div class="mini-section more-than">
5554
<div class="container">
5655
<h1 id="more-than-just-code">More than just code.</h1>
57-
<h3>Agencies use GitHub to engage developers and collaborate with the public on open source, open data and open government efforts. GitHub even renders common formats like <a href="https://github.com/blog/1784-rendered-prose-diffs" target="_blank">text</a>, <a href="https://help.github.com/articles/rendering-csv-and-tsv-data" target="_blank">CSV</a>, and <a href="https://help.github.com/articles/mapping-geojson-files-on-github" target="_blank">geospatial data</a>.</h3>
56+
<h3 class="lead-graf">Agencies use GitHub to engage developers and collaborate with the public on open source, open data and open government efforts. GitHub even renders common formats like <a href="https://github.com/blog/1784-rendered-prose-diffs" target="_blank">text</a>, <a href="https://help.github.com/articles/rendering-csv-and-tsv-data" target="_blank">CSV</a>, and <a href="https://help.github.com/articles/mapping-geojson-files-on-github" target="_blank">geospatial data</a>.</h3>
5857

5958
<div class="row-fluid section source-data-code">
6059
<div class="span4 animate-out">
61-
<h2>Open Source</h2>
60+
<h3>Open Source</h3>
6261
<p><a href="https://github.com/showcases/government" target="_blank">
6362
<img src="assets/img/open-source.png" alt="Pull request launching gov.uk"/></a>
6463
</p>
6564
<small>The UK Government launches its new site with a pull request.</small>
6665
</div>
6766

6867
<div class="span4 animate-out">
69-
<h2>Open Data</h2>
68+
<h3>Open Data</h3>
7069
<p><a href="https://github.com/showcases/open-data" target="_blank">
7170
<img src="assets/img/open-data.png" alt="GeoJSON diff of Illinois 4th Congressional District"/></a>
7271
</p>
7372
<small>The City of Chicago release geographic city data.</small>
7473
</div>
7574

7675
<div class="span4 animate-out">
77-
<h2>Open Government</h2>
76+
<h3>Open Government</h3>
7877
<p><a href="https://github.com/showcases/policies" target="_blank">
7978
<img src="assets/img/open-gov.png" alt="Project Open Data"/></a>
8079
</p>
@@ -96,7 +95,7 @@ <h1 id="join-the-revolution">Join the Revolution.</h1>
9695
{% assign count = count | plus:1 %}
9796
{% endfor %}
9897
{% endfor %}
99-
<h3>Join the <strong>{{ count }}+</strong> government organizations around the world who collaborate on code, data, policy, and more. See the rest of the GitHub <a href="/community">government community</a>.</h3>
98+
<h3 class="lead-graf">Join the <strong>{{ count }}+ government organizations</strong> around the world who collaborate on code, data, policy, and more. See the rest of the GitHub <a href="/community">government community</a>.</h3>
10099
</div>
101100

102101
<div class="full-screen featured-orgs">
@@ -109,28 +108,26 @@ <h3>Join the <strong>{{ count }}+</strong> government organizations around the w
109108
<div id="get-started" class="mini-section">
110109
<div class="container">
111110
<h1>Get started today.</h1>
112-
<h3>Create a free account and check out the resources for getting started with GitHub. Need something you can hand to someone? Download our <a href="/assets/img/govandgithub.pdf">government and GitHub</a> one pager.</h3>
111+
<h3 class="lead-graf">Create a free account and check out the resources for getting started with GitHub. Need something you can hand to someone? Download our <a href="/assets/img/govandgithub.pdf">government and GitHub</a> one pager.</h3>
113112

114113
<div class="row-fluid section">
115114
<div class="span4">
116-
<h2>Signup for an account</h2>
115+
<h3>Signup for an account</h3>
117116
<p>If you don't already have one, <a href="https://github.com/signup/free" target="_blank">sign up</a> for an individual GitHub account that's specific to you.</p>
118117
<p>If you've already got a personal GitHub account, simply <a href="https://government-community.githubapp.com/">add and confirm</a> your government email.</p>
119118
</div>
120119

121120
<div class="span4">
122-
<h2>Create an organization</h2>
121+
<h3>Create an organization</h3>
123122
<p>An organization is your official presence on GitHub. Once logged in, <a href="https://github.com/organizations/new">create a free organization</a>. You can always upgrade later.</p>
124123
<p>Prefer to host your own GitHub instance? <a href="http://enterprise.github.com">Request a free trial</a> to get started.
125124
</div>
126125

127126
<div class="span4">
128-
<h2>Join the Peer Group</h2>
127+
<h3>Join the Peer Group</h3>
129128
<p>There's a <a href="https://government-community.githubapp.com/">semi-private group</a> of government employees using GitHub to share best practices for software collaboration within government.</p>
130129
<p>If the government email associated with your account is verified, you should <a href="https://government-community.githubapp.com/">have access</a>.
131130
</div>
132-
133-
134131
</div>
135132

136133
</div>

0 commit comments

Comments
 (0)