Skip to content

Commit 6da2238

Browse files
xonecoxoneco
authored
Merge pull request #5 from uclapi/updated-docs
Updated docs
2 parents 1a48173 + 846d187 commit 6da2238

27 files changed

Lines changed: 646 additions & 555 deletions

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
If this is a question or feature request, make sure to:
2+
3+
- [ ] The title starts with `Question:` or `Feature:`.
4+
5+
If this is an bug report, not a question, make sure to:
6+
7+
- [ ] I'm not running Windows (which is unsupported), or if I am, I can confirm this issue appears on another platform, or Vagrant.
8+
- [ ] This issue appears in the latest `dev` branch.
9+
- [ ] I've included my browser and Ruby version in this issue.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
!!!!! STOP AND READ !!!!!
2+
3+
If the dropdown above says "base fork: lord/master", you are submitting your change to ALL USERS OF SLATE, not just your company. This is probably not what you want. Click "base fork" to change it to the right place.
4+
5+
If you're actually trying to submit a change to upstream Slate, please submit to our dev branch, PRs sent to the master branch are generally rejected.

‎.gitignore‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,28 @@ Thumbs.db
4040
#############
4141
*~
4242
*.swp
43+
44+
*.gem
45+
*.rbc
46+
.bundle
47+
.config
48+
coverage
49+
InstalledFiles
50+
lib/bundler/man
51+
pkg
52+
rdoc
53+
spec/reports
54+
test/tmp
55+
test/version_tmp
56+
tmp
57+
*.DS_STORE
58+
build/
59+
.cache
60+
.vagrant
61+
.sass-cache
62+
63+
# YARD artifacts
64+
.yardoc
65+
_yardoc
66+
doc/
67+
.idea/

‎.travis.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
sudo: false
2+
3+
language: ruby
4+
5+
rvm:
6+
- 2.2.5
7+
- 2.3.3
8+
- 2.4.0
9+
10+
cache: bundler
11+
script: bundle exec middleman build

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,26 @@
11
# Changelog
2+
=======
3+
## Version 1.5.0
4+
5+
*February 23, 2017*
6+
7+
- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature
8+
- Upgrade Middleman to add Ruby 1.4.0 compatibility
9+
- Switch default code highlighting color scheme to better highlight JSON
10+
- Various small typo and bug fixes
11+
12+
## Version 1.4.0
13+
14+
*November 24, 2016*
15+
16+
- Upgrade Middleman and Rouge gems, should hopefully solve a number of bugs
17+
- Update some links in README
18+
- Fix broken Vagrant startup script
19+
- Fix some problems with deploy.sh help message
20+
- Fix bug with language tabs not hiding properly if no error
21+
- Add `!default` to SASS variables
22+
- Fix bug with logo margin
23+
- Bump tested Ruby versions in .travis.yml
224

325
## Version 1.3.3
426

‎Gemfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
source 'https://rubygems.org'
22

33
# Middleman
4-
gem 'middleman', '~>4.1.0'
4+
gem 'middleman', '~>4.2.1'
55
gem 'middleman-syntax', '~> 3.0.0'
66
gem 'middleman-autoprefixer', '~> 2.7.0'
7-
gem "middleman-sprockets", "~> 4.0.0"
7+
gem "middleman-sprockets", "~> 4.1.0"
88
gem 'rouge', '~> 2.0.5'
9-
gem 'redcarpet', '~> 3.3.2'
9+
gem 'redcarpet', '~> 3.4.0'

‎Gemfile.lock‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ GEM
88
tzinfo (~> 1.1)
99
addressable (2.5.0)
1010
public_suffix (~> 2.0, >= 2.0.2)
11-
autoprefixer-rails (6.7.3)
11+
autoprefixer-rails (6.7.5)
1212
execjs
1313
backports (3.6.8)
1414
coffee-script (2.4.1)
@@ -23,34 +23,33 @@ GEM
2323
erubis (2.7.0)
2424
execjs (2.7.0)
2525
fast_blank (1.0.0)
26-
fastimage (2.0.1)
27-
addressable (~> 2)
26+
fastimage (2.1.0)
2827
ffi (1.9.17)
2928
haml (4.0.7)
3029
tilt
3130
hamster (3.0.0)
3231
concurrent-ruby (~> 1.0)
33-
hashie (3.5.3)
32+
hashie (3.5.5)
3433
i18n (0.7.0)
3534
kramdown (1.13.2)
3635
listen (3.0.8)
3736
rb-fsevent (~> 0.9, >= 0.9.4)
3837
rb-inotify (~> 0.9, >= 0.9.7)
3938
memoist (0.15.0)
40-
middleman (4.1.14)
39+
middleman (4.2.1)
4140
coffee-script (~> 2.2)
4241
compass-import-once (= 1.0.5)
4342
haml (>= 4.0.5)
4443
kramdown (~> 1.2)
45-
middleman-cli (= 4.1.14)
46-
middleman-core (= 4.1.14)
44+
middleman-cli (= 4.2.1)
45+
middleman-core (= 4.2.1)
4746
sass (>= 3.4.0, < 4.0)
4847
middleman-autoprefixer (2.7.1)
4948
autoprefixer-rails (>= 6.5.2, < 7.0.0)
5049
middleman-core (>= 3.3.3)
51-
middleman-cli (4.1.14)
50+
middleman-cli (4.2.1)
5251
thor (>= 0.17.0, < 2.0)
53-
middleman-core (4.1.14)
52+
middleman-core (4.2.1)
5453
activesupport (>= 4.2, < 5.1)
5554
addressable (~> 2.3)
5655
backports (~> 3.6)
@@ -73,7 +72,7 @@ GEM
7372
servolux
7473
tilt (~> 2.0)
7574
uglifier (~> 3.0)
76-
middleman-sprockets (4.0.0)
75+
middleman-sprockets (4.1.0)
7776
middleman-core (~> 4.0)
7877
sprockets (>= 3.0)
7978
middleman-syntax (3.0.0)
@@ -92,15 +91,15 @@ GEM
9291
rb-fsevent (0.9.8)
9392
rb-inotify (0.9.8)
9493
ffi (>= 0.5.0)
95-
redcarpet (3.3.4)
94+
redcarpet (3.4.0)
9695
rouge (2.0.7)
9796
sass (3.4.23)
9897
servolux (0.12.0)
9998
sprockets (3.7.1)
10099
concurrent-ruby (~> 1.0)
101100
rack (> 1, < 3)
102101
thor (0.19.4)
103-
thread_safe (0.3.5)
102+
thread_safe (0.3.6)
104103
tilt (2.0.6)
105104
tzinfo (1.2.2)
106105
thread_safe (~> 0.1)
@@ -111,11 +110,11 @@ PLATFORMS
111110
ruby
112111

113112
DEPENDENCIES
114-
middleman (~> 4.1.0)
113+
middleman (~> 4.2.1)
115114
middleman-autoprefixer (~> 2.7.0)
116-
middleman-sprockets (~> 4.0.0)
115+
middleman-sprockets (~> 4.1.0)
117116
middleman-syntax (~> 3.0.0)
118-
redcarpet (~> 3.3.2)
117+
redcarpet (~> 3.4.0)
119118
rouge (~> 2.0.5)
120119

121120
BUNDLED WITH

‎Gemfile.lock~‎

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)