Skip to content

Commit

Permalink
Upgrade (#19)
Browse files Browse the repository at this point in the history
* Add deploy configuration with a port set option

Addressing slatedocs#463

* Note the need for an upgraded Ruby

* Add JavaScript examples

* Update rouge languages link in README

* Add PR template

* Add issue template

* Update readme

* Remove CONTRIBUTING

* Bump CHANGELOG

* Word missing on Readme.md (#592)

* make scss variables changeable

all variables should only provide a default

this would allow us to include the screen.scss and simply set the variables we want to change before that.

* Add Ruby 2.2.0 to Travis testing matrix

* fix -margin

* Add some company links to readme

* Remove unused gem middleman-gh-pages

* Update middleman-syntax

* Upgrade sprockets

* Fix another bug where disabling language tabs didn't properly hide HTML

* Update ruby version requirements in Travis and README

* Fix bug where -margin wasn't properly respected even if search was off

* Fix build, update middleman

* Exec middleman server fails with invalid flags --force-polling and -l. Removed the flags to remedy.

* Update language list link and count in README

* Add back in middleman flags to Vagrant with new flag syntax

* Fix incorrect documentation in deploy.sh

* Update pull requset template

* Cut version 1.4.0

* Fix Woocommerce link in readme

* Adding Scale to the list of companies. (#694)

* Add Ruby 2.3.3 to tested rubies

* Add multiple-tabs-per-language test

* Latest middleman - fixing startup arguments (#653)

As per middleman/middleman#1866 (comment)
Tested. It works.

* Update redcarpet gem to 3.4.0 which will solve the unicode error with (#660)

h1/h2.
See vmg/redcarpet#538

* Updated Mozilla localForage link (#665)

Old link was broken

* Add Ruby 2.4.0 to .travis.yml

* Update middleman and middleman-sprokets, run bundle update

* Update code highlighting theme from Base16::Monokai to just Monokai

* Switch theme from Monokai to the less neon MonokaiSublime

* Allow Ruby 2.4.0 to fail for now

* Update to middleman 4.2.1 for ruby 2.4 fix

* Typo Fix (#693)

* Fix Woocommerce link in readme

* Fixed _errors.md typo

* Remove multiple language example from readme, users should just check wiki for instructions

* Add version 1.5.0 changelog notes
  • Loading branch information
chriserwin authored Feb 24, 2017
1 parent efa6987 commit 043377f
Show file tree
Hide file tree
Showing 16 changed files with 171 additions and 155 deletions.
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
If this is a question or feature request, make sure to:

- [ ] The title starts with `Question:` or `Feature:`.

If this is an bug report, not a question, make sure to:

- [ ] I'm not running Windows (which is unsupported), or if I am, I can confirm this issue appears on another platform, or Vagrant.
- [ ] This issue appears in the latest `dev` branch.
- [ ] I've included my browser and Ruby version in this issue.
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
!!!!! STOP AND READ !!!!!

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.

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.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ sudo: false
language: ruby

rvm:
- 2.0.0
- 2.1.0
- 2.2.5
- 2.3.3
- 2.4.0

cache: bundler
script: bundle exec middleman build
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Changelog

## Version 1.5.0

*February 23, 2017*

- Add [multiple tabs per programming language](https://github.com/lord/slate/wiki/Multiple-language-tabs-per-programming-language) feature
- Upgrade Middleman to add Ruby 1.4.0 compatibility
- Switch default code highlighting color scheme to better highlight JSON
- Various small typo and bug fixes

## Version 1.4.0

*November 24, 2016*

- Upgrade Middleman and Rouge gems, should hopefully solve a number of bugs
- Update some links in README
- Fix broken Vagrant startup script
- Fix some problems with deploy.sh help message
- Fix bug with language tabs not hiding properly if no error
- Add `!default` to SASS variables
- Fix bug with logo margin
- Bump tested Ruby versions in .travis.yml

## Version 1.3.3

*June 11, 2016*

Documentation and example changes.

## Version 1.3.2

*February 3, 2016*
Expand Down
16 changes: 0 additions & 16 deletions CONTRIBUTING.md

This file was deleted.

11 changes: 5 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
source 'https://rubygems.org'

# Middleman
gem 'middleman', '~>4.0.0'
gem 'middleman-gh-pages', '~> 0.0.3'
gem 'middleman-syntax', '~> 2.1.0'
gem 'middleman', '~>4.2.1'
gem 'middleman-syntax', '~> 3.0.0'
gem 'middleman-autoprefixer', '~> 2.7.0'
gem "middleman-sprockets", "~> 4.0.0.rc"
gem 'rouge', '~> 1.10.1'
gem 'redcarpet', '~> 3.3.2'
gem "middleman-sprockets", "~> 4.1.0"
gem 'rouge', '~> 2.0.5'
gem 'redcarpet', '~> 3.4.0'
162 changes: 75 additions & 87 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,134 +1,122 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.5.1)
activesupport (5.0.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.4.0)
autoprefixer-rails (6.3.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
autoprefixer-rails (6.6.1)
execjs
json
backports (3.6.7)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
backports (3.6.8)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.10.0)
coffee-script-source (1.12.2)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (0.9.2)
contracts (0.12.0)
concurrent-ruby (1.0.4)
contracts (0.13.0)
dotenv (2.2.0)
erubis (2.7.0)
execjs (2.6.0)
fastimage (1.8.1)
addressable (~> 2.3, >= 2.3.5)
ffi (1.9.10)
execjs (2.7.0)
fast_blank (1.0.0)
fastimage (2.0.1)
addressable (~> 2)
ffi (1.9.17)
haml (4.0.7)
tilt
hamster (2.0.0)
concurrent-ruby (~> 0.8)
hashie (3.4.3)
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.5.1)
i18n (0.7.0)
json (1.8.3)
kramdown (1.9.0)
listen (3.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
middleman (4.0.0)
kramdown (1.13.2)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
memoist (0.15.0)
middleman (4.2.1)
coffee-script (~> 2.2)
compass-import-once (= 1.0.5)
haml (>= 4.0.5)
kramdown (~> 1.2)
middleman-cli (= 4.0.0)
middleman-core (= 4.0.0)
middleman-cli (= 4.2.1)
middleman-core (= 4.2.1)
sass (>= 3.4.0, < 4.0)
middleman-autoprefixer (2.7.0)
autoprefixer-rails (>= 6.3.1, < 7.0.0)
middleman-autoprefixer (2.7.1)
autoprefixer-rails (>= 6.5.2, < 7.0.0)
middleman-core (>= 3.3.3)
middleman-cli (4.0.0)
middleman-cli (4.2.1)
thor (>= 0.17.0, < 2.0)
middleman-core (4.0.0)
activesupport (~> 4.2)
addressable (~> 2.4.0)
middleman-core (4.2.1)
activesupport (>= 4.2, < 5.1)
addressable (~> 2.3)
backports (~> 3.6)
bundler (~> 1.1)
capybara (~> 2.5.0)
contracts (~> 0.12.0)
contracts (~> 0.13.0)
dotenv
erubis
execjs (~> 2.0)
fastimage (~> 1.8)
hamster (~> 2.0)
fast_blank
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 0.7.0)
listen (~> 3.0)
listen (~> 3.0.0)
memoist (~> 0.14)
padrino-helpers (~> 0.13.0)
rack (>= 1.4.5, < 2.0)
parallel
rack (>= 1.4.5, < 3)
sass (>= 3.4)
tilt (~> 1.4.1)
uglifier (~> 2.6)
middleman-gh-pages (0.0.3)
rake (> 0.9.3)
middleman-sprockets (4.0.0.rc.1)
middleman-core (>= 4.0.0.rc.1)
sprockets (~> 3.0)
middleman-syntax (2.1.0)
servolux
tilt (~> 2.0)
uglifier (~> 3.0)
middleman-sprockets (4.1.0)
middleman-core (~> 4.0)
sprockets (>= 3.0)
middleman-syntax (3.0.0)
middleman-core (>= 3.2)
rouge (~> 1.0)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2015.1120)
mini_portile2 (2.0.0)
minitest (5.8.4)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
padrino-helpers (0.13.1)
rouge (~> 2.0)
minitest (5.10.1)
padrino-helpers (0.13.3.3)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.1)
tilt (~> 1.4.1)
padrino-support (0.13.1)
padrino-support (= 0.13.3.3)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.3)
activesupport (>= 3.1)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rake (10.4.2)
rb-fsevent (0.9.7)
rb-inotify (0.9.5)
parallel (1.10.0)
public_suffix (2.0.5)
rack (2.0.1)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
redcarpet (3.3.4)
rouge (1.10.1)
sass (3.4.21)
sprockets (3.4.1)
redcarpet (3.4.0)
rouge (2.0.7)
sass (3.4.23)
servolux (0.12.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
thor (0.19.1)
thor (0.19.4)
thread_safe (0.3.5)
tilt (1.4.1)
tilt (2.0.6)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
xpath (2.0.0)
nokogiri (~> 1.3)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)

PLATFORMS
ruby

DEPENDENCIES
middleman (~> 4.0.0)
middleman (~> 4.2.1)
middleman-autoprefixer (~> 2.7.0)
middleman-gh-pages (~> 0.0.3)
middleman-sprockets (~> 4.0.0.rc)
middleman-syntax (~> 2.1.0)
redcarpet (~> 3.3.2)
rouge (~> 1.10.1)
middleman-sprockets (~> 4.1.0)
middleman-syntax (~> 3.0.0)
redcarpet (~> 3.4.0)
rouge (~> 2.0.5)

BUNDLED WITH
1.10.6
1.14.3
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

The Elemeno Docs site is built with [Slate](https://tripit.github.io/slate/)
The Elemeno Docs site is built with [Slate](https://lord.github.io/slate/)

Getting Started with Elemeno Docs
------------------------------
Expand All @@ -9,7 +8,7 @@ Getting Started with Elemeno Docs
You're going to need:

- **Linux or OS X** — Windows may work, but is unsupported.
- **Ruby, version 1.9.3 or newer**
- **Ruby, version 2.2.5 or newer**
- **Bundler** — If Ruby is already installed, but the `bundle` command doesn't work, just run `gem install bundler` in a terminal.

### Getting Set Up
Expand All @@ -30,6 +29,7 @@ vagrant up

You can now see the docs at http://localhost:4567. Whoa! That was fast!


Now that Slate is all set up your machine, you'll probably want to learn more about [editing Slate markdown](https://github.com/tripit/slate/wiki/Markdown-Syntax)

If you'd prefer to use Docker, instructions are available [in the wiki](https://github.com/tripit/slate/wiki/Docker).
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ Vagrant.configure(2) do |config|
echo "Starting up middleman at http://localhost:4567"
echo "If it does not come up, check the ~/middleman.log file for any error messages"
cd /vagrant
bundle exec middleman server --force-polling -l 1 &> ~/middleman.log &
bundle exec middleman server --force-polling --latency=1 &> ~/middleman.log &
SHELL
end
9 changes: 9 additions & 0 deletions config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@

# Activate the syntax highlighter
activate :syntax
ready do
require './lib/multilang.rb'
end

activate :sprockets

activate :autoprefixer do |config|
config.browsers = ['last 2 version', 'Firefox ESR']
Expand All @@ -38,3 +43,7 @@
# activate :asset_hash
# activate :gzip
end

# Deploy Configuration
# If you want Middleman to listen on a different port, you can set that below
set :port, 4567
Loading

0 comments on commit 043377f

Please sign in to comment.