Skip to content

Commit 81efc28

Browse files
committed
Merge branch 'master' of github.com:maxiperezc/graphoid
2 parents 6441861 + 063c763 commit 81efc28

26 files changed

+43
-9775
lines changed

Gemfile

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ gemspec
77

88
gem 'graphql'
99

10+
gem "nokogiri", ">= 1.10.4"
11+
1012
group :development, :test do
1113
gem 'byebug'
1214
gem 'simplecov', require: false

Gemfile.lock

+4-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ GEM
7373
mimemagic (~> 0.3.2)
7474
method_source (0.9.2)
7575
mimemagic (0.3.3)
76-
mini_mime (1.0.1)
76+
mini_mime (1.0.2)
7777
mini_portile2 (2.4.0)
7878
minitest (5.11.3)
7979
mongo (2.8.0)
@@ -89,8 +89,8 @@ GEM
8989
mongoid (>= 3.1)
9090
mongoid-compatibility (>= 0.5.1)
9191
rspec (~> 3.3)
92-
nio4r (2.3.1)
93-
nokogiri (1.10.3)
92+
nio4r (2.4.0)
93+
nokogiri (1.10.4)
9494
mini_portile2 (~> 2.4.0)
9595
rack (2.0.7)
9696
rack-test (1.1.0)
@@ -171,6 +171,7 @@ DEPENDENCIES
171171
graphql
172172
mongoid
173173
mongoid-rspec
174+
nokogiri (>= 1.10.4)
174175
rspec
175176
rspec-rails
176177
simplecov

docs/assets/js/main.js

+6-17
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,12 @@ $(document).ready(function() {
22

33
/* Activate scrollspy menu */
44
$('body').scrollspy({target: '#doc-menu', offset: 100});
5-
6-
/* Smooth scrolling */
5+
6+
/* Smooth scrolling */
77
$('a.scrollto').on('click', function(e){
8-
//store hash
9-
var target = this.hash;
10-
e.preventDefault();
8+
//store hash
9+
var target = this.hash;
10+
e.preventDefault();
1111
$('body').scrollTo(target, 800, {offset: 0, 'axis':'y'});
12-
1312
});
14-
15-
/* Bootstrap lightbox */
16-
/* Ref: http://ashleydw.github.io/lightbox/ */
17-
18-
$(document).delegate('*[data-toggle="lightbox"]', 'click', function(e) {
19-
e.preventDefault();
20-
$(this).ekkoLightbox();
21-
});
22-
23-
24-
});
13+
});

docs/assets/plugins/lightbox/.gitignore

-6
This file was deleted.

docs/assets/plugins/lightbox/Gruntfile.js

-85
This file was deleted.

docs/assets/plugins/lightbox/ISSUE_TEMPLATE.md

-9
This file was deleted.

docs/assets/plugins/lightbox/LICENSE

-21
This file was deleted.

docs/assets/plugins/lightbox/README.md

-15
This file was deleted.

docs/assets/plugins/lightbox/bower.json

-29
This file was deleted.

docs/assets/plugins/lightbox/dist/ekko-lightbox.css

-2
This file was deleted.

0 commit comments

Comments
 (0)