kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Port #17729 to v4: Add SRI hashes to CDN links in docs 

[skip sauce]
This commit is contained in:
Chris Rebert 2015-10-23 22:35:22 -07:00
parent a30a5bb9b5
commit 3bc5fb947d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_config.yml
View File

@ -36,6 +36,9 @@ expo: http://expo.getbootstrap.com
themes: http://themes.getbootstrap.com
cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/css/bootstrap.css
css_hash: "sha384-XXXXXXXX"
js: https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js
js_hash: "sha384-XXXXXXXX"
jquery: https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js

8
docs/getting-started/introduction.md
View File

@ -21,14 +21,14 @@ Looking to quickly add Bootstrap to your project? Use the Bootstrap CDN, provide
Copy-paste the stylesheet `<link>` into your `<head>` before all other stylesheets to load our CSS.
{% highlight html %}
<link rel="stylesheet" href="{{ site.cdn.css }}">
<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
{% endhighlight %}
Add our JavaScript plugins and jQuery near the end of your pages, right before the closing `</body>` tag. Be sure to place jQuery first as our code depends on it.
{% highlight html %}
<script src="{{ site.cdn.jquery }}"></script>
<script src="{{ site.cdn.js }}"></script>
<script src="{{ site.cdn.js }}" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script>
{% endhighlight %}
And that's it—you're on your way to a fully Bootstrapped site. If you're at all unsure about the general page structure, keep reading for an example page template.
@ -53,14 +53,14 @@ Put it all together and your pages should look like this:
<meta http-equiv="x-ua-compatible" content="ie=edge">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="{{ site.cdn.css }}">
<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
</head>
<body>
<h1>Hello, world!</h1>
<!-- jQuery first, then Bootstrap JS. -->
<script src="{{ site.cdn.jquery }}"></script>
<script src="{{ site.cdn.js }}"></script>
<script src="{{ site.cdn.js }}" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script>
</body>
</html>
{% endhighlight %}

4
docs/index.html
View File

@ -33,8 +33,8 @@ title: Bootstrap &middot; The world's most popular mobile-first and responsive f
<p>When you just need to include Bootstrap's compiled CSS and JS, use the Bootstrap CDN, free from the Max CDN folks.</p>
{% comment %}
{% highlight html %}
<link rel="stylesheet" href="{{ site.cdn.css }}">
<script src="{{ site.cdn.js }}"></script>
<link rel="stylesheet" href="{{ site.cdn.css }}" integrity="{{ site.cdn.css_hash }}" crossorigin="anonymous">
<script src="{{ site.cdn.js }}" integrity="{{ site.cdn.js_hash }}" crossorigin="anonymous"></script>
{% endhighlight %}
{% endcomment %}
<p class="text-muted">Not yet available, but hopefully soon!</p>