Skip to content

Commit 8b06a59

Browse files
benbalterbenbalter
committed
Merge branch 'gh-pages' into piv
2 parents d2716ad + a668b6c commit 8b06a59

File tree

171 files changed

+16370
-17567
lines changed

Some content is hidden

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

171 files changed

+16370
-17567
lines changed

‎.bowerrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "_includes/vendor"
2+
"directory": "assets/vendor"
33
}

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
.DS_Store
22
/_site
33
Gemfile.lock
4+
assets/vendor/jquery/build
5+
assets/vendor/jquery/speed
6+
assets/vendor/jquery/src
7+
assets/vendor/jquery/test
8+
assets/vendor/octicons/svg
9+
assets/vendor/**/*.md
10+
assets/vendor/**/*.txt
11+
assets/vendor/bootstrap-sass/assets/javascripts/
12+
.sass-cache

‎_config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ exclude: ["script", "vendor", "Gemfile", "Gemfile.lock", "Rakefile", "readme.md"
1111
markdown: kramdown
1212
gems:
1313
- jekyll-sitemap
14+
- jekyll-redirect-from
1415

1516
sass:
1617
style: :compressed

‎_includes/footer.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
</div>
2020
</footer>
2121

22-
<script src="/assets/js/bootstrap.min.js"></script>
23-
<script src="/assets/js/anchor.min.js"></script>
22+
<script src="/assets/vendor/anchor-js/anchor.min.js"></script>
2423
<script>anchors.add('.org-table h4');</script>
2524
</body>
2625
</html>

‎_includes/header.html‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@
88
<meta name="viewport" content="width=device-width, initial-scale=1">
99
<link rel="shortcut icon" href="/assets/img/favicon.ico" type="image/x-icon">
1010
<link rel="stylesheet" href="/assets/css/style.css">
11-
<link rel="stylesheet" href="/assets/css/icons.css">
1211
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,300,700' rel='stylesheet' type='text/css'>
13-
<script src="/assets/js/jquery.min.js"></script>
14-
<!--[if lt IE 9]>
15-
<script src="/assets/js/html5shiv.js"></script>
16-
<script src="/assets/js/respond.min.js"></script>
17-
<![endif]-->
12+
<script src="/assets/vendor/jquery/jquery.min.js"></script>
1813
{% include analytics.html %}
1914
</head>
2015

2116
<body{% if page.id %} id="{{ page.id }}"{% endif %} class="{{ page.layout }}">
22-
<!--[if lt IE 7]>
23-
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
24-
<![endif]-->
2517

2618
<div class="full-width olives">
2719
<div class="navbar">

‎_includes/org-table.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h6 class="no-matches" style="display: none;">No matches.</h6>
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 %}
11-
<tr class="type-block" id="{{ type_hash[0] | downcase | replace: ' ','_' }}">
11+
<tr class="type-block">
1212
{% assign slug = type_hash[0] | downcase | replace: ' ','-' | replace: '.','' %}
1313
<td><h4 id="{{ slug}}">{{ type_hash[0] }} ({{ type_hash[1] | size }})</h4></td><td></td><td></td>
1414
</tr>

‎_includes/vendor/.gitignore‎

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

‎_includes/vendor/anchor-js/README.md‎

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

‎_includes/vendor/bootstrap/.bower.json‎

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

‎_includes/vendor/bootstrap/README.md‎

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

0 commit comments

Comments
 (0)