Skip to content

Commit 4420397

Browse files
committed
Merge remote-tracking branch 'origin/gh-pages' into i18n
* origin/gh-pages: Clean up js Add link to notices in footer Update notices.md Little typo fix. rm non-code terms add drupal example
2 parents 1cbf0e2 + 20416b9 commit 4420397

File tree

21 files changed

+43
-505
lines changed

21 files changed

+43
-505
lines changed

_articles/en-US/how-to-contribute.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Not to worry! There are all sorts of ways to get involved with an open source pr
6060

6161
### You don't have to contribute code
6262

63-
A common misconception about contributing to open source is that you need to contribute code. In fact, it's often the non-code parts of a project that are [most neglected or overlooked](https://github.com/blog/2195-the-shape-of-open-source). You'll do the project a _huge_ favor by offering to pitch in with non-code contributions!
63+
A common misconception about contributing to open source is that you need to contribute code. In fact, it's often the other parts of a project that are [most neglected or overlooked](https://github.com/blog/2195-the-shape-of-open-source). You'll do the project a _huge_ favor by offering to pitch in with these types of contributions!
6464

6565
<aside markdown="1" class="pquote">
6666
<img src="https://avatars1.githubusercontent.com/u/49038?v=3&s=460" class="pquote-avatar" alt="avatar">
@@ -70,7 +70,7 @@ A common misconception about contributing to open source is that you need to con
7070
</p>
7171
</aside>
7272

73-
Even if you are a developer, non-code contributions are a great way to get involved with a project and meet other community members. Building those relationships will give you opportunities to work on other parts of the project.
73+
Even if you like to write code, other types of contributions are a great way to get involved with a project and meet other community members. Building those relationships will give you opportunities to work on other parts of the project.
7474

7575
<aside markdown="1" class="pquote">
7676
<img src="https://avatars3.githubusercontent.com/u/54418?v=3&s=460" class="pquote-avatar" alt="avatar">
@@ -89,7 +89,7 @@ Even if you are a developer, non-code contributions are a great way to get invol
8989
### Do you like to design?
9090

9191
* Restructure layouts to improve the project's usability
92-
* Conduct user research to reorganize and refine the project's navigation or menus
92+
* Conduct user research to reorganize and refine the project's navigation or menus, [like Drupal suggests](https://www.drupal.org/community-initiatives/drupal-core/usability)
9393
* Put together a style guide to help the project have a consistent visual design
9494
* Create art for t-shirts or a new logo, [like hapi.js's contributors did](https://github.com/hapijs/contrib/issues/68)
9595

@@ -443,7 +443,7 @@ If you can't find your idea elsewhere, you're ready to make a move. If the proje
443443

444444
Before you open an issue or pull request, check the project's contributing docs (usually a file called CONTRIBUTING, or in the README), to see whether you need to include anything specific. For example, they may ask that you follow a template, or require that you use tests.
445445

446-
If you want to make a substantial contribution, open an issue to ask before working on it. It's helpful to watch the project for awhile (on GitHub, [you can click "Watch"](https://help.github.com/articles/watching-repositories/) to be notified of all conversations), and get to know community members, before doing work that might not get accepted.
446+
If you want to make a substantial contribution, open an issue to ask before working on it. It's helpful to watch the project for a while (on GitHub, [you can click "Watch"](https://help.github.com/articles/watching-repositories/) to be notified of all conversations), and get to know community members, before doing work that might not get accepted.
447447

448448
<aside markdown="1" class="pquote">
449449
<img src="https://avatars2.githubusercontent.com/u/810438?v=3&s=400" class="pquote-avatar" alt="avatar">

_includes/footer.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ <h3 class="alt-h3 mb-3">{{ site.data.locale[site.locale].footer.subscribe.headin
3535
</div>
3636
</form>
3737
</div>
38-
<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
3938
</div>
4039
</div>
4140
</div>
4241

4342
<div class="border-top text-gray py-5">
43+
<p class="float-md-right"><a class="text-gray-light text-small" href="{{ "/notices/" | relative_url }}">fine print</a></p>
44+
4445
<div>
4546
{% capture code %}
4647
{% assign code_label = site.data.locale[site.locale].footer.byline.code_label %}

_includes/head.html

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,8 @@
11
<head>
22
<meta charset="utf-8">
33
<meta name="viewport" content="width=device-width, initial-scale=1">
4+
<link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
45
<link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,700,700i" rel="stylesheet">
56
<link href="{{ "/assets/css/index.css" | relative_url }}" rel="stylesheet">
6-
<link rel="icon" type="image/x-icon" href="https://assets-cdn.github.com/favicon.ico">
7-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
8-
<script src="{{ "/js/script.js" | relative_url }}"></script>
9-
<script src="{{ "/js/locale.js" | relative_url }}"></script>
10-
<script>
11-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
12-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
13-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
14-
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
15-
16-
ga('create', 'UA-3769691-72', 'auto');
17-
ga('send', 'pageview');
18-
19-
</script>
207
{% seo %}
218
</head>

_layouts/default.html

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,9 @@
77
{{ content }}
88
</div>
99
</main>
10-
<script src="{{ "/js/vendor/anchor-js/anchor.min.js" | relative_url }}"></script>
11-
<script>
12-
var selector = '#content h2, #content h3, #content h4, #content h5';
1310

14-
anchors.options = {
15-
//visible: 'always',
16-
placement: 'left'
17-
};
18-
anchors.add(selector);
19-
20-
$(selector).wrapInner('<span/>');
21-
</script>
11+
<script src="{{ "/assets/js/index.js" | relative_url }}"></script>
12+
<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
13+
<script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
2214
</body>
2315
</html>

_layouts/landing.html

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

assets/js/ga.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
2+
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
3+
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
4+
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
5+
6+
ga('create', 'UA-3769691-72', 'auto');
7+
ga('send', 'pageview');

assets/js/index.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
---
3+
4+
{% include_relative jquery.min.js %}
5+
{% include_relative anchor.min.js %}
6+
{% include_relative ga.js %}
7+
{% include_relative toc.js %}
8+
{% include_relative locale.js %}
9+
10+
(function() {
11+
var selector = '.article-body h2, .article-body h3, .article-body h4, .article-body h5';
12+
anchors.options = {
13+
placement: 'left'
14+
};
15+
anchors.add(selector);
16+
17+
$(selector).wrapInner('<span/>');
18+
})();

assets/js/jquery.min.js

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/locale.js renamed to assets/js/locale.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
---
2-
---
3-
41
$(document).ready(function() {
52
var currentLocale = $('html').attr('lang');
63

0 commit comments

Comments
 (0)