Skip to content

Commit 0eb4caa

Browse files
author
Tariq Islam
committed
Merge pull request ringcentral#49 from tripit/dev
Search, bug fixes, new features, and more
2 parents 26eef2f + 938a056 commit 0eb4caa

24 files changed

+2538
-282
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ build/
1919
.yardoc
2020
_yardoc
2121
doc/
22+
.idea/

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Contributing to Slate
2+
3+
Thanks for contributing to Slate! Please point your pull requests at the `dev` branch, and keep your commit messages clear and informative. Also, please make sure your contributions work in the most recent version of Chrome, Firefox, and IE. Thanks!

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ platforms :mri_18 do
2323
gem "ruby18_source_location"
2424
end
2525

26-
gem "rake", "~> 10.2.0"
26+
gem "rake", "~> 10.3.0"
2727

2828
gem 'therubyracer', :platforms => :ruby

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GEM
1212
coffee-script-source
1313
execjs
1414
coffee-script-source (1.7.0)
15-
compass (0.12.5)
15+
compass (0.12.6)
1616
chunky_png (~> 1.2)
1717
fssm (>= 0.2.7)
1818
sass (~> 3.2.19)
@@ -69,11 +69,11 @@ GEM
6969
em-websocket (~> 0.5.0)
7070
middleman-core (~> 3.2)
7171
rack-livereload (~> 0.3.15)
72-
middleman-sprockets (3.3.2)
72+
middleman-sprockets (3.3.3)
7373
middleman-core (>= 3.2)
7474
sprockets (~> 2.2)
7575
sprockets-helpers (~> 1.1.0)
76-
sprockets-sass (~> 1.0.0)
76+
sprockets-sass (~> 1.1.0)
7777
middleman-syntax (2.0.0)
7878
middleman-core (~> 3.2)
7979
rouge (~> 1.0)
@@ -90,7 +90,7 @@ GEM
9090
rack
9191
rack-test (0.6.2)
9292
rack (>= 1.0)
93-
rake (10.2.2)
93+
rake (10.3.1)
9494
rb-fsevent (0.9.4)
9595
rb-inotify (0.9.3)
9696
ffi (>= 0.5.0)
@@ -101,14 +101,14 @@ GEM
101101
rouge (1.3.3)
102102
ruby18_source_location (0.2)
103103
sass (3.2.19)
104-
sprockets (2.12.0)
104+
sprockets (2.12.1)
105105
hike (~> 1.2)
106106
multi_json (~> 1.0)
107107
rack (~> 1.0)
108108
tilt (~> 1.1, != 1.3.0)
109109
sprockets-helpers (1.1.0)
110110
sprockets (~> 2.0)
111-
sprockets-sass (1.0.3)
111+
sprockets-sass (1.1.0)
112112
sprockets (~> 2.0)
113113
tilt (~> 1.1)
114114
therubyracer (0.12.1)
@@ -131,7 +131,7 @@ DEPENDENCIES
131131
middleman-gh-pages
132132
middleman-livereload (~> 3.3.0)
133133
middleman-syntax
134-
rake (~> 10.2.0)
134+
rake (~> 10.3.0)
135135
redcarpet (~> 3.1.1)
136136
ruby18_source_location
137137
therubyracer

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Slate
22
========
33

4-
[![Build Status](https://travis-ci.org/tripit/slate.png?branch=master)](https://travis-ci.org/tripit/slate) [![Dependency Status](https://gemnasium.com/tripit/slate.png)](https://gemnasium.com/tripit/slate)
4+
[![Build Status](https://travis-ci.org/tripit/slate.svg?branch=master)](https://travis-ci.org/tripit/slate) [![Dependency Status](https://gemnasium.com/tripit/slate.png)](https://gemnasium.com/tripit/slate)
55

66
Slate helps you create beautiful single-page API documentation. Think of it as an intelligent, modern documentation template for your API.
77

@@ -75,3 +75,11 @@ Special Thanks
7575
- [middleman-syntax](https://github.com/middleman/middleman-syntax)
7676
- [middleman-gh-pages](https://github.com/neo/middleman-gh-pages)
7777
- [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
78+
79+
Contributors
80+
--------------------
81+
82+
Thanks to the following people who have submitted pull requests:
83+
84+
- [@chrissrogers](https://github.com/chrissrogers)
85+
- [@bootstraponline](https://github.com/bootstraponline)

source/fonts/icomoon.eot

100644100755
300 Bytes
Binary file not shown.

source/fonts/icomoon.svg

100644100755
Lines changed: 12 additions & 11 deletions
Loading

source/fonts/icomoon.ttf

100644100755
300 Bytes
Binary file not shown.

source/fonts/icomoon.woff

100644100755
424 Bytes
Binary file not shown.

source/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ toc_footers:
1313
includes:
1414
- errors
1515

16+
search: true
1617
---
1718

1819
# Introduction

0 commit comments

Comments
 (0)