Skip to content

Commit f1284ea

Browse files
olga-microsoftolga-microsoft
committed
Merge branch 'master' into msft/head-height
2 parents bb747ff + 6d73b7d commit f1284ea

File tree

109 files changed

+13041
-11408
lines changed

Some content is hidden

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

109 files changed

+13041
-11408
lines changed

‎CONTRIBUTING.md‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If you catch a typo or error in the documentation, we'd greatly appreciate a
6868
pull request.
6969

7070
1. Go to the bottom of the documentation page on `aframe.io` you wish to update.
71-
2. Click the button to suggest edits on GitHub.
71+
2. Click *Edit Page* GitHub button.
7272
3. Edit the documentation through GitHub's text editor.
7373
4. Prepend the commit message with `[docs]`.
7474
5. We will merge the pull request and cherry-pick it onto documentation
@@ -77,6 +77,20 @@ branches for older versions if necessary.
7777
You can also do `npm run docs` within the A-Frame project to start a local live
7878
server for watching and serving documentation.
7979

80+
## Add Glitch Examples to Documentation
81+
82+
We like to have simple and interesting [Glitch](https://glitch.com/~aframe)
83+
examples listed on relevant documentation pages. Glitch lets people remix/fork
84+
examples and code right in the browser with live updates. If you have a Glitch
85+
that might be useful in the documentation, request to add it!
86+
87+
1. Go to the bottom of the documentation page on `aframe.io` you wish to update.
88+
2. Click *Edit Page* GitHub button.
89+
3. Add Glitch examples to the `examples` piece in the header, with `title` and `src`. [See example](https://github.com/aframevr/aframe/commit/1472ab23b957e6345c7fc242242f505927463122).
90+
91+
If a Glitch example needs to be updated for whatever reason, remix the Glitch,
92+
and then update the `src` URL.
93+
8094
# Help Your Fellow A-Framers
8195

8296
## On Slack

‎dist/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ script below from the [rawgit CDN](https://rawgit.com/):
88
```html
99
<html>
1010
<head>
11-
<script src="https://rawgit.com/aframevr/aframe/edb43c7/dist/aframe-master.min.js"></script>
11+
<script src="https://rawgit.com/aframevr/aframe/ba7d108/dist/aframe-master.min.js"></script>
1212
</head>
1313
<body>
1414
<a-scene>

0 commit comments

Comments
 (0)