dan/api_docs
1
0
Fork 0
mirror of https://github.com/danbulant/api_docs synced 2026-05-24 12:27:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #292 from tripit/dev

Browse source 
Slate 1.2.1
@lord my fault, I seemed to have totally missed the emails sent!
This commit is contained in:
Tariq Islam 2015-07-27 12:33:43 -07:00
commit adeb496a88
5 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,7 +2,7 @@
## Version 1.2 ## Version 1.2
*June 20, 2014* *June 20, 2015*
**Fixes:** **Fixes:**

2
Gemfile
View file

@ -6,7 +6,7 @@ gem 'middleman-gh-pages', '~> 0.0.3'
gem 'middleman-syntax', '~> 2.0.0' gem 'middleman-syntax', '~> 2.0.0'
gem 'middleman-autoprefixer', '~> 2.4.4' gem 'middleman-autoprefixer', '~> 2.4.4'
gem 'rouge', '~> 1.9.0' gem 'rouge', '~> 1.9.0'
gem 'redcarpet', '~> 3.3.1' gem 'redcarpet', '~> 3.3.2'
gem 'rake', '~> 10.4.2' gem 'rake', '~> 10.4.2'
gem 'therubyracer', '~> 0.12.1', platforms: :ruby gem 'therubyracer', '~> 0.12.1', platforms: :ruby

4
Gemfile.lock
View file

@ -97,7 +97,7 @@ GEM
rb-fsevent (0.9.5) rb-fsevent (0.9.5)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.3.1) redcarpet (3.3.2)
ref (1.0.5) ref (1.0.5)
rouge (1.9.0) rouge (1.9.0)
sass (3.4.14) sass (3.4.14)
@ -135,6 +135,6 @@ DEPENDENCIES
middleman-gh-pages (~> 0.0.3) middleman-gh-pages (~> 0.0.3)
middleman-syntax (~> 2.0.0) middleman-syntax (~> 2.0.0)
rake (~> 10.4.2) rake (~> 10.4.2)
redcarpet (~> 3.3.1) redcarpet (~> 3.3.2)
rouge (~> 1.9.0) rouge (~> 1.9.0)
therubyracer (~> 0.12.1) therubyracer (~> 0.12.1)

11
source/javascripts/app/_toc.js
View file

@ -1,5 +1,6 @@
//= require ../lib/_jquery_ui //= require ../lib/_jquery_ui
//= require ../lib/_jquery.tocify //= require ../lib/_jquery.tocify
//= require ../lib/_imagesloaded.min
(function (global) { (function (global) {
'use strict'; 'use strict';
@ -43,8 +44,12 @@
}, 50); }, 50);
} }
$(makeToc); $(function() {
$(animate); makeToc();
animate();
$('.content').imagesLoaded( function() {
global.toc.calculateHeights();
});
});
})(window); })(window);

7
source/javascripts/lib/_imagesloaded.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long