Permalink
Browse files

fix HTTPS, update Bootstrap, update doc

  • Loading branch information...
1 parent ec2b5bd commit 99bbc43083fa54d125d9a7b93b1cd2939ea26b8a @mistic100 committed Mar 10, 2015
Showing with 46 additions and 24 deletions.
  1. +3 −0 .bowerrc
  2. +2 −0 .gitignore
  3. +12 −10 _config.yml
  4. +8 −7 _layouts/default.html
  5. +1 −1 assets/js/docs.min.js
  6. +8 −0 bower.json
  7. +12 −6 index.html
View
@@ -0,0 +1,3 @@
+{
+ "directory": "/dist"
+}
View
@@ -1,2 +1,4 @@
/_site
Gemfile.lock
+/dist/bootstrap
+/dist/jquery
View
@@ -1,7 +1,7 @@
# name of the software
name: Jekyll Bootstrap Doc
# current version of the software
-version: 1.0.1
+version: 1.1.0
# url of the download button
downloadUrl: https://github.com/mistic100/jekyll-bootstrap-doc
# licence of the software
@@ -26,6 +26,11 @@ header:
color2: "#673051"
trianglify: true
+# google analytics
+analytics:
+ account:
+ domain:
+
# github buttons
githubButton:
user: mistic100
@@ -43,14 +48,11 @@ facebook:
enabled: true
profileUrl:
-# google analytics
-analytics:
- account:
- domain:
-
-# DON'T MODIFY
-pygments: true
-highlight: pygments
+exclude: ['README.md', 'LICENSE', 'bower.json', 'Gemfile.lock', 'Gemfile']
-exclude: ['README.md', 'Gemfile.lock', 'Gemfile']
+gems:
+ - jekyll-mentions
+ - jemoji
+ - jekyll-redirect-from
+ - jekyll-sitemap
View
@@ -11,7 +11,7 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
- <link href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet">
+ <link href="https://netdna.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
<link href="{{site.github.url}}/assets/css/docs.min.css" rel="stylesheet">
<link href="{{site.github.url}}/assets/css/style.css" rel="stylesheet">
@@ -22,8 +22,8 @@
}
</style>
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
- <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+ <script src="https://code.jquery.com/jquery-1.11.2.min.js"></script>
+ <script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script>
<script src="{{site.github.url}}/assets/js/docs.min.js"></script>
</head>
@@ -43,7 +43,8 @@
</div>
<nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
<ul class="nav navbar-nav">
- {% for p in site.pages %}
+ {% assign sorted_pages = site.pages | sort:"name" %}
+ {% for p in sorted_pages %}
{% if p.isHome != true %}
<li {% if page.title == p.title %}class="active"{% endif %}>
<a href="{{site.github.url}}{{p.url}}">{{p.title}}</a>
@@ -169,8 +170,8 @@ <h1 class="home-title">{{site.name}}</h1>
<!-- Async scripts
=========================================== -->
{% if site.header.trianglify %}
- <script src="http://d3js.org/d3.v3.min.js"></script>
- <script src="http://cdnjs.cloudflare.com/ajax/libs/trianglify/0.1.2/trianglify.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/d3/3.4.11/d3.min.js"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/trianglify/0.1.2/trianglify.min.js"></script>
<script>trianglify('{{site.header.color1}}', '{{site.header.color2}}');</script>
{% endif %}
@@ -202,7 +203,7 @@ <h1 class="home-title">{{site.name}}</h1>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{site.analytics.account}}', '{{site.analytics.domain}}');
ga('send', 'pageview');
</script>
@@ -7,7 +7,7 @@ $(function(){
h23 = $(this).find('h2[id], h3[id]');
if (h1.length && h1[0].id) {
- html+= '<li><a href="#' + h1[0].id +'">'+ h1.text() +'</a>';
+ html+= '<li><a href="#' + h1[0].id +'">'+ h1.clone().children().remove().end().text() +'</a>';
if (h23.length) {
html+= '<ul class="nav">';
View
@@ -0,0 +1,8 @@
+{
+ "name": "jekyll-bootstrap-doc",
+ "version": "1.1.0",
+
+ "dependencies": {
+
+ }
+}
View
@@ -5,7 +5,6 @@
isHome: true
---
-<!-- intro -->
<section class="bs-docs-section">
<h1 id="overview" class="page-header">Overview</h1>
@@ -39,18 +38,18 @@ <h3 id="examples">Examples</h3>
<section class="bs-docs-section">
<h1 id="installation" class="page-header">Installation</h1>
- <h3 id="install-jekyll">Install Jekyll</h3>
+ <h2 id="install-jekyll">Install Jekyll</h2>
<p>Follow the <a href="https://help.github.com/articles/using-jekyll-with-pages">GitHub guide</a> to install Jekyll on your computer. The big steps are:</p>
{% highlight text %}
apt-get install ruby ruby-dev
gem install bundler
-git clone git@github.com:mistic100/jekyll-bootstrap-doc
+git clone git://github.com/mistic100/jekyll-bootstrap-doc
bundle install
bundle exec jekyll serve
{% endhighlight %}
- <h3 id="configuration">Configuration</h3>
+ <h2 id="configuration">Configuration</h2>
<p>Adapt the <code>_config.yml</code> file to your project.</p>
<div class="table-responsive">
@@ -102,7 +101,7 @@ <h3 id="configuration">Configuration</h3>
</table>
</div>
- <h4>Social buttons</h4>
+ <h3>Social buttons</h3>
<div class="table-responsive">
<table class="table table-bordered table-striped">
<thead>
@@ -145,6 +144,7 @@ <h3 id="configuration">Configuration</h3>
</div>
</section>
+
<section class="bs-docs-section">
<h1 id="usage" class="page-header">Usage</h1>
@@ -201,4 +201,10 @@ <h2 id="resources">Resources &amp; links</h2>
<a href="{{ "{{site.github.url" }}}}/about/index.html">About</a>
{% endhighlight %}
-</section>
+
+ <h2 id="gems">Plugins</h2>
+ <p>All available Jekyll plugins are installed by default, you can remove them by modifying the <code>gems</code> parameter in <code>_config.yml</code>. See the documentation on <a href="https://help.github.com/articles/using-jekyll-plugins-with-github-pages/">GitHub Help</a> pages.</p>
+
+ <h2 id="bower">Bower</h2>
+ <p>Fell free to use the <code>bower.json</code> to manage your front dependencies. Bower packages are added the <code>dist</code> directory and <b>MUST</b> be pushed to the repository. jQuery and Bootstrap are ignored by <code>.gitignore</code> as already loaded from a CDN.</p>
+</section>

0 comments on commit 99bbc43

Please sign in to comment.