From fddf3040878694f781bba00c307dccdef964e6a3 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 18 May 2015 09:58:08 +0200 Subject: [PATCH 01/20] Use HTTPS for fetch gems --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index df5651b2b81..73f7a16891c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' # Middleman gem 'middleman', '~>3.3.10' diff --git a/Gemfile.lock b/Gemfile.lock index e3931cd63af..c22d1d07291 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: activesupport (4.1.10) i18n (~> 0.6, >= 0.6.9) From 094c38223eacb9f40ac4fdb044e0b19efda4b892 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 18 May 2015 10:09:01 +0200 Subject: [PATCH 02/20] [Travis-CI] Use docker build infraestructure --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 46029affecf..035d7ebe7cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: false + rvm: - 1.9.3 - 2.0.0 From d7769c653d3cd35cfa8117a7207a0196668d7da5 Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 18 May 2015 10:11:51 +0200 Subject: [PATCH 03/20] [Travis-CI] Specify language to test is ruby --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 035d7ebe7cc..16d6207dad1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: false +language: ruby + rvm: - 1.9.3 - 2.0.0 From d0e46a3894a2180d1ecc8fad09fa15968118d74c Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 18 May 2015 10:12:57 +0200 Subject: [PATCH 04/20] [Travis-CI] Enable bundler cache --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 16d6207dad1..3280d947c9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,5 @@ language: ruby rvm: - 1.9.3 - 2.0.0 + +cache: bundler From bdebff8250193ba2c479d2819092bab6c549e05c Mon Sep 17 00:00:00 2001 From: Maks3w Date: Mon, 18 May 2015 12:45:30 +0200 Subject: [PATCH 05/20] Add "rake clobber" for to remove generated files --- Rakefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rakefile b/Rakefile index d6af6474b1d..6a952e1e914 100644 --- a/Rakefile +++ b/Rakefile @@ -1,3 +1,6 @@ require 'middleman-gh-pages' +require 'rake/clean' + +CLOBBER.include('build') task :default => [:build] From 06c1641ad1965627ad0d01f1247fd4337f079c37 Mon Sep 17 00:00:00 2001 From: MK Date: Thu, 28 May 2015 18:41:56 -0400 Subject: [PATCH 06/20] Consistency fixes as discussed on commit 84b7705fd1b510bd79c69a030a754b8d6129ad34 --- source/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/index.md b/source/index.md index ed5f6d63d0e..4c1fa8c9f7d 100644 --- a/source/index.md +++ b/source/index.md @@ -106,7 +106,7 @@ This endpoint retrieves all kittens. ### HTTP Request -`GET http://example.com/kittens` +`GET http://example.com/api/kittens` ### Query Parameters @@ -136,7 +136,7 @@ api.kittens.get(2) ``` ```shell -curl "http://example.com/api/kittens/3" +curl "http://example.com/api/kittens/2" -H "Authorization: meowmeowmeow" ``` @@ -164,5 +164,5 @@ This endpoint retrieves a specific kitten. Parameter | Description --------- | ----------- -ID | The ID of the cat to retrieve +ID | The ID of the kitten to retrieve From 3a53a3c0291cb8d189794dd5cfe3cdb17edb9734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 31 May 2015 20:20:58 +0200 Subject: [PATCH 07/20] Update rouge to version 1.9.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 73f7a16891c..755165be089 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gem 'middleman', '~>3.3.10' gem 'middleman-gh-pages', '~> 0.0.3' gem 'middleman-syntax', '~> 2.0.0' -gem 'rouge', '~> 1.8.0' +gem 'rouge', '~> 1.9.0' gem 'redcarpet', '~> 3.2.2' gem 'rake', '~> 10.4.2' diff --git a/Gemfile.lock b/Gemfile.lock index c22d1d07291..ce2594750e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -93,7 +93,7 @@ GEM ffi (>= 0.5.0) redcarpet (3.2.3) ref (1.0.5) - rouge (1.8.0) + rouge (1.9.0) sass (3.4.13) sprockets (2.12.3) hike (~> 1.2) @@ -129,5 +129,5 @@ DEPENDENCIES middleman-syntax (~> 2.0.0) rake (~> 10.4.2) redcarpet (~> 3.2.2) - rouge (~> 1.8.0) + rouge (~> 1.9.0) therubyracer (~> 0.12.1) From ab816e432a0c0356d111ce43d31148f68813e44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sun, 31 May 2015 23:33:37 +0200 Subject: [PATCH 08/20] Use Autoprefixer for vendor prefixes --- Gemfile | 1 + Gemfile.lock | 7 ++++ config.rb | 6 +++ source/stylesheets/_variables.scss | 3 -- source/stylesheets/screen.css.scss | 62 ++++++++++++------------------ 5 files changed, 39 insertions(+), 40 deletions(-) diff --git a/Gemfile b/Gemfile index 755165be089..5d8c0211b36 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ source 'https://rubygems.org' gem 'middleman', '~>3.3.10' gem 'middleman-gh-pages', '~> 0.0.3' gem 'middleman-syntax', '~> 2.0.0' +gem 'middleman-autoprefixer', '~> 2.4.4' gem 'rouge', '~> 1.9.0' gem 'redcarpet', '~> 3.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index ce2594750e3..d29c7d0046c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,6 +7,9 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + autoprefixer-rails (5.2.0) + execjs + json celluloid (0.16.0) timers (~> 4.0.0) chunky_png (1.3.4) @@ -54,6 +57,9 @@ GEM middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) + middleman-autoprefixer (2.4.4) + autoprefixer-rails (~> 5.2.0) + middleman-core (>= 3.3.3) middleman-core (3.3.11) activesupport (~> 4.1.0) bundler (~> 1.1) @@ -125,6 +131,7 @@ PLATFORMS DEPENDENCIES middleman (~> 3.3.10) + middleman-autoprefixer (~> 2.4.4) middleman-gh-pages (~> 0.0.3) middleman-syntax (~> 2.0.0) rake (~> 10.4.2) diff --git a/config.rb b/config.rb index cd9a362f6ad..43bceaa5a43 100644 --- a/config.rb +++ b/config.rb @@ -18,6 +18,12 @@ # Activate the syntax highlighter activate :syntax +activate :autoprefixer do |config| + config.browsers = ['last 2 version', 'Firefox ESR'] + config.cascade = false + config.inline = true +end + # Github pages require relative links activate :relative_assets set :relative_links, true diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss index 4c9bae05ee1..0957678427b 100644 --- a/source/stylesheets/_variables.scss +++ b/source/stylesheets/_variables.scss @@ -100,13 +100,10 @@ $search-box-border-color: #666; // These settings are probably best left alone. %break-words { - -ms-word-break: break-all; word-break: break-all; /* Non standard for webkit */ word-break: break-word; --webkit-hyphens: auto; - -moz-hyphens: auto; hyphens: auto; } diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index d64b3239574..1cbac164554 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -49,25 +49,17 @@ html, body { } @mixin embossed-bg { - @include background( - linear-gradient(top, - rgba(#000, 0.2), - rgba(#000, 0) 8px), - linear-gradient(bottom, - rgba(#000, 0.2), - rgba(#000, 0) 8px), - linear-gradient(top, - rgba($nav-embossed-border-top, 1), - rgba($nav-embossed-border-top, 0) 1.5px), - linear-gradient(bottom, - rgba($nav-embossed-border-bottom, 1), - rgba($nav-embossed-border-bottom, 0) 1.5px), - $nav-subitem-bg - ); + background: + linear-gradient(to bottom,rgba(#000, 0.2), rgba(#000, 0) 8px), + linear-gradient(to top, rgba(#000, 0.2), rgba(#000, 0) 8px), + linear-gradient(to bottom, rgba($nav-embossed-border-top, 1), rgba($nav-embossed-border-top, 0) 1.5px), + linear-gradient(to top, rgba($nav-embossed-border-bottom, 1), rgba($nav-embossed-border-bottom, 0) 1.5px), + #262626; } .tocify-wrapper { - @include transition(left ease-in-out 0.3s); + transition: left 0.3s ease-in-out; + overflow-y: auto; overflow-x: hidden; position: fixed; @@ -102,7 +94,7 @@ html, body { border-width: 0 0 1px 0; border-color: $search-box-border-color; padding: 6px 0 6px 20px; - @include box-sizing(border-box); + box-sizing: border-box; margin: $nav-v-padding $nav-padding; width: $nav-width - 30; outline: none; @@ -125,13 +117,13 @@ html, body { .search-results { margin-top: 0; - @include box-sizing(border-box); + box-sizing: border-box; height: 0; overflow-y: auto; overflow-x: hidden; - @include transition-property(height margin); - @include transition-duration(180ms); - @include transition-timing-function(ease-in-out); + transition-property: height, margin; + transition-duration: 180ms; + transition-timing-function: ease-in-out; &.visible { height: 30%; margin-bottom: 1em; @@ -175,14 +167,14 @@ html, body { li { color: $nav-text; - @include transition-property('background'); - @include transition-timing-function('linear'); - @include transition-duration(230ms); + transition-property: background; + transition-timing-function: linear; + transition-duration: 230ms; } // This is the currently selected ToC entry .tocify-focus { - @include box-shadow(0px 1px 0px $nav-active-shadow); + box-shadow: 0px 1px 0px $nav-active-shadow; background-color: $nav-active-bg; color: $nav-active-text; } @@ -235,8 +227,8 @@ html, body { $side-pad: $main-padding / 2 - 8px; padding: $side-pad $side-pad $side-pad; background-color: rgba($main-bg, 0.7); - @include transform-origin(0, 0); - @include transform(rotate(-90deg) translate(-100%, 0)); + transform-origin: 0 0; + transform: rotate(-90deg) translate(-100%, 0); border-radius: 0 0 0 5px; } padding: 0 1.5em 5em 0; // increase touch size area @@ -255,7 +247,7 @@ html, body { vertical-align: bottom; } - @include transition(left ease-in-out 0.3s); + transition: left 0.3s ease-in-out; &:hover { opacity: 1; } &.open {left: $nav-width} @@ -346,7 +338,7 @@ html, body { &>h1, &>h2, &>h3, &>h4, &>h5, &>h6, &>p, &>table, &>ul, &>ol, &>aside, &>dl { margin-right: $examples-width; padding: 0 $main-padding; - @include box-sizing(border-box); + box-sizing: border-box; display: block; @include text-shadow($main-embossed-text-shadow); @@ -371,9 +363,7 @@ html, body { margin-bottom: $h1-margin-bottom; margin-top: 2em; border-top: 1px solid #ddd; - @include background-image( - linear-gradient(top, #fff, #f9f9f9) - ); + background-image: linear-gradient(to bottom, #fff, #f9f9f9); } h1:first-child, div:first-child + h1 { @@ -389,9 +379,7 @@ html, body { border-top: 1px solid #ccc; padding-top: 1.2em; padding-bottom: 1.2em; - @include background-image( - linear-gradient(top, rgba(#fff,0.4), rgba(#fff, 0)) - ); + background-image: linear-gradient(to bottom, rgba(#fff, 0.4), rgba(#fff, 0)); } // h2s right after h1s should bump right up @@ -525,7 +513,7 @@ html, body { border-radius: 4px; border: 1px solid #F7E633; @include text-shadow(1px 1px 0 #666); - @include background(linear-gradient(bottom right, #F7E633 0%, #F1D32F 100%)); + background: linear-gradient(to top left, #F7E633 0%, #F1D32F 100%); } } @@ -546,7 +534,7 @@ html, body { float:right; clear:right; - @include box-sizing(border-box); + box-sizing: border-box; @include text-shadow(0px 1px 2px rgba(0,0,0,0.4)); @extend %right-col; From 384ffac2fd5138b95f315b4e50e07882066522b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Mon, 1 Jun 2015 00:29:57 +0200 Subject: [PATCH 09/20] Don't generate unnecessary JS files. Also exclude jquery.highlight from the nosearch version, as it's not needed there. --- source/javascripts/all.js | 6 ++++-- source/javascripts/all_nosearch.js | 7 +++---- source/javascripts/app/{lang.js => _lang.js} | 0 source/javascripts/app/{search.js => _search.js} | 2 ++ source/javascripts/app/{toc.js => _toc.js} | 2 ++ source/javascripts/lib/{energize.js => _energize.js} | 0 .../lib/{jquery.highlight.js => _jquery.highlight.js} | 0 .../lib/{jquery.tocify.js => _jquery.tocify.js} | 3 +-- source/javascripts/lib/{jquery_ui.js => _jquery_ui.js} | 0 source/javascripts/lib/{lunr.js => _lunr.js} | 0 10 files changed, 12 insertions(+), 8 deletions(-) rename source/javascripts/app/{lang.js => _lang.js} (100%) rename source/javascripts/app/{search.js => _search.js} (96%) rename source/javascripts/app/{toc.js => _toc.js} (94%) rename source/javascripts/lib/{energize.js => _energize.js} (100%) rename source/javascripts/lib/{jquery.highlight.js => _jquery.highlight.js} (100%) rename source/javascripts/lib/{jquery.tocify.js => _jquery.tocify.js} (99%) rename source/javascripts/lib/{jquery_ui.js => _jquery_ui.js} (100%) rename source/javascripts/lib/{lunr.js => _lunr.js} (100%) diff --git a/source/javascripts/all.js b/source/javascripts/all.js index 534eae93090..ffaa9b01307 100644 --- a/source/javascripts/all.js +++ b/source/javascripts/all.js @@ -1,2 +1,4 @@ -//= require_tree ./lib -//= require_tree ./app +//= require ./lib/_energize +//= require ./app/_lang +//= require ./app/_search +//= require ./app/_toc diff --git a/source/javascripts/all_nosearch.js b/source/javascripts/all_nosearch.js index 4610cabe62d..818bc4e5095 100644 --- a/source/javascripts/all_nosearch.js +++ b/source/javascripts/all_nosearch.js @@ -1,4 +1,3 @@ -//= require_tree ./lib -//= require_tree ./app -//= stub ./app/search.js -//= stub ./lib/lunr.js +//= require ./lib/_energize +//= require ./app/_lang +//= require ./app/_toc diff --git a/source/javascripts/app/lang.js b/source/javascripts/app/_lang.js similarity index 100% rename from source/javascripts/app/lang.js rename to source/javascripts/app/_lang.js diff --git a/source/javascripts/app/search.js b/source/javascripts/app/_search.js similarity index 96% rename from source/javascripts/app/search.js rename to source/javascripts/app/_search.js index 3c22f714262..550b1a30f61 100644 --- a/source/javascripts/app/search.js +++ b/source/javascripts/app/_search.js @@ -1,3 +1,5 @@ +//= require ../lib/_lunr +//= require ../lib/_jquery.highlight (function (global) { 'use strict'; diff --git a/source/javascripts/app/toc.js b/source/javascripts/app/_toc.js similarity index 94% rename from source/javascripts/app/toc.js rename to source/javascripts/app/_toc.js index c88b67f2b70..d84bf8e197a 100644 --- a/source/javascripts/app/toc.js +++ b/source/javascripts/app/_toc.js @@ -1,3 +1,5 @@ +//= require ../lib/_jquery_ui +//= require ../lib/_jquery.tocify (function (global) { 'use strict'; diff --git a/source/javascripts/lib/energize.js b/source/javascripts/lib/_energize.js similarity index 100% rename from source/javascripts/lib/energize.js rename to source/javascripts/lib/_energize.js diff --git a/source/javascripts/lib/jquery.highlight.js b/source/javascripts/lib/_jquery.highlight.js similarity index 100% rename from source/javascripts/lib/jquery.highlight.js rename to source/javascripts/lib/_jquery.highlight.js diff --git a/source/javascripts/lib/jquery.tocify.js b/source/javascripts/lib/_jquery.tocify.js similarity index 99% rename from source/javascripts/lib/jquery.tocify.js rename to source/javascripts/lib/_jquery.tocify.js index f791bf86246..91cf637913a 100644 --- a/source/javascripts/lib/jquery.tocify.js +++ b/source/javascripts/lib/_jquery.tocify.js @@ -1,4 +1,3 @@ -//= require ./jquery_ui /* jquery Tocify - v1.8.0 - 2013-09-16 * http://www.gregfranko.com/jquery.tocify.js/ * Copyright (c) 2013 Greg Franko; Licensed MIT @@ -1040,4 +1039,4 @@ }); -})); //end of plugin \ No newline at end of file +})); //end of plugin diff --git a/source/javascripts/lib/jquery_ui.js b/source/javascripts/lib/_jquery_ui.js similarity index 100% rename from source/javascripts/lib/jquery_ui.js rename to source/javascripts/lib/_jquery_ui.js diff --git a/source/javascripts/lib/lunr.js b/source/javascripts/lib/_lunr.js similarity index 100% rename from source/javascripts/lib/lunr.js rename to source/javascripts/lib/_lunr.js From d27f5c4b7d569cca6a205210ceeb467171d675ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Sat, 21 Feb 2015 00:03:29 +0100 Subject: [PATCH 10/20] Remove unused icons from the font --- font-selection.json | 148 +++++++++++++++++++++++++++++ source/fonts/icomoon.eot | Bin 2780 -> 0 bytes source/fonts/icomoon.svg | 18 ---- source/fonts/icomoon.ttf | Bin 2616 -> 0 bytes source/fonts/icomoon.woff | Bin 2816 -> 0 bytes source/fonts/slate.eot | Bin 0 -> 1876 bytes source/fonts/slate.svg | 14 +++ source/fonts/slate.ttf | Bin 0 -> 1720 bytes source/fonts/slate.woff | Bin 0 -> 1796 bytes source/stylesheets/_icon-font.scss | 30 ++---- 10 files changed, 169 insertions(+), 41 deletions(-) create mode 100755 font-selection.json delete mode 100755 source/fonts/icomoon.eot delete mode 100755 source/fonts/icomoon.svg delete mode 100755 source/fonts/icomoon.ttf delete mode 100755 source/fonts/icomoon.woff create mode 100755 source/fonts/slate.eot create mode 100755 source/fonts/slate.svg create mode 100755 source/fonts/slate.ttf create mode 100755 source/fonts/slate.woff diff --git a/font-selection.json b/font-selection.json new file mode 100755 index 00000000000..5e78f5d8621 --- /dev/null +++ b/font-selection.json @@ -0,0 +1,148 @@ +{ + "IcoMoonType": "selection", + "icons": [ + { + "icon": { + "paths": [ + "M438.857 73.143q119.429 0 220.286 58.857t159.714 159.714 58.857 220.286-58.857 220.286-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857zM512 785.714v-108.571q0-8-5.143-13.429t-12.571-5.429h-109.714q-7.429 0-13.143 5.714t-5.714 13.143v108.571q0 7.429 5.714 13.143t13.143 5.714h109.714q7.429 0 12.571-5.429t5.143-13.429zM510.857 589.143l10.286-354.857q0-6.857-5.714-10.286-5.714-4.571-13.714-4.571h-125.714q-8 0-13.714 4.571-5.714 3.429-5.714 10.286l9.714 354.857q0 5.714 5.714 10t13.714 4.286h105.714q8 0 13.429-4.286t6-10z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "exclamation-circle" + ], + "defaultCode": 61546, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 100, + "order": 4, + "prevSize": 28, + "code": 58880, + "name": "exclamation-sign", + "ligatures": "" + }, + "setIdx": 0, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M585.143 786.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-54.857v-292.571q0-8-5.143-13.143t-13.143-5.143h-182.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h54.857v182.857h-54.857q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h256q8 0 13.143-5.143t5.143-13.143zM512 274.286v-91.429q0-8-5.143-13.143t-13.143-5.143h-109.714q-8 0-13.143 5.143t-5.143 13.143v91.429q0 8 5.143 13.143t13.143 5.143h109.714q8 0 13.143-5.143t5.143-13.143zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "info-circle" + ], + "defaultCode": 61530, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 85, + "order": 3, + "name": "info-sign", + "prevSize": 28, + "code": 58882 + }, + "setIdx": 0, + "iconIdx": 2 + }, + { + "icon": { + "paths": [ + "M733.714 419.429q0-16-10.286-26.286l-52-51.429q-10.857-10.857-25.714-10.857t-25.714 10.857l-233.143 232.571-129.143-129.143q-10.857-10.857-25.714-10.857t-25.714 10.857l-52 51.429q-10.286 10.286-10.286 26.286 0 15.429 10.286 25.714l206.857 206.857q10.857 10.857 25.714 10.857 15.429 0 26.286-10.857l310.286-310.286q10.286-10.286 10.286-25.714zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z" + ], + "attrs": [], + "isMulticolor": false, + "tags": [ + "check-circle" + ], + "defaultCode": 61528, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 83, + "order": 9, + "prevSize": 28, + "code": 58886, + "name": "ok-sign" + }, + "setIdx": 0, + "iconIdx": 6 + }, + { + "icon": { + "paths": [ + "M658.286 475.429q0-105.714-75.143-180.857t-180.857-75.143-180.857 75.143-75.143 180.857 75.143 180.857 180.857 75.143 180.857-75.143 75.143-180.857zM950.857 950.857q0 29.714-21.714 51.429t-51.429 21.714q-30.857 0-51.429-21.714l-196-195.429q-102.286 70.857-228 70.857-81.714 0-156.286-31.714t-128.571-85.714-85.714-128.571-31.714-156.286 31.714-156.286 85.714-128.571 128.571-85.714 156.286-31.714 156.286 31.714 128.571 85.714 85.714 128.571 31.714 156.286q0 125.714-70.857 228l196 196q21.143 21.143 21.143 51.429z" + ], + "width": 951, + "attrs": [], + "isMulticolor": false, + "tags": [ + "search" + ], + "defaultCode": 61442, + "grid": 14 + }, + "attrs": [], + "properties": { + "id": 2, + "order": 1, + "prevSize": 28, + "code": 58887, + "name": "icon-search" + }, + "setIdx": 0, + "iconIdx": 7 + } + ], + "height": 1024, + "metadata": { + "name": "slate", + "license": "SIL OFL 1.1" + }, + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "slate", + "majorVersion": 1, + "minorVersion": 0, + "description": "Based on FontAwesome", + "license": "SIL OFL 1.1" + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showSelector": false, + "selector": "class", + "classSelector": ".icon", + "showMetrics": false, + "showMetadata": true, + "showVersion": true, + "ie7": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215 + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false + } +} diff --git a/source/fonts/icomoon.eot b/source/fonts/icomoon.eot deleted file mode 100755 index 212835a5243aabdf5b8a4d029f41b6471ac38ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2780 zcmb7GOKg)z5T5xTyT9#VC&aG=+lg#!Bb7Sf-w&cZh$juMw=f1@e6zY-yV!UfISWx3^2#b0=6(JX<3)`3udZ+1 z2zdcI%Fdy+`clmom**k>3gglB+Ko+Ehiyl#KfY00Up^MUdmrNmSYvXtesv3eqWR-W zPNqS8i)_di`4TuMoA^16&}T}oqcPm>ZgWJBBtLB6#}8o*W;ztqn7oZsD~7SIl7`8m zBfx%gAj9%B{zx|dZZyCn(B#qF_-)i`&hP{PObo4%XGQZ+6xB&@$@aRh<|$9Ie2;f1 zPOsA&M8m~cG!~77rH~?%&gb&Ea;aLWR@~uoDW7|d(^4ck9E(nIv05qTtGmodti{}! zc8keWDp_==r`%#HnM@VksjO*ORnu!#%P?7(rghXZO&hqZ7(2cy88 z=s=|c6~nYH+%XL_^A1M%lec%;|1d40NGaRTP32`imx1qN9ChJ1;z67`%C3OCSe0D; z%CUc^L8pgNC|1={P5>F^!r)*mK5{&3iJW0sX2|Cc1^oeG2ls|TO%);hKHGL28}f~w z(&%snd z51ACBJ-*&QPLx8kjt|mtkfjNR!+<%N3vu3qA`%{B>A`5Ma+Fc%fR%F9+hvIg*)8^1 z#XAH%Z8S@Cq@@0G$Vw;B%a4jiLAtWJ( zJEQ1~PJO4^dlkkvN1xbyM;!m{`;PV*=#{><{rew2jgpH`tE!w#T2+pMx@O#>s+N}@ zg1SAbD&pFlz?np)tlH8Mx9$0U+2jI>Nrmq>M368I|fR7dW3y7mRXg7NQhXf<}g)ZreV;&k76; zh*assfdeN>DTVi@$C7*4u!OxLhK7cu5bVeozwRq!!r@F|-!4A5VhhXQJ;|~3-rcDR zi-Dnl1-tgPbXW)p6Jo1#qB79B2jf58zWY&V`Z)zu5fJ^d_Q!l1H>1Sm?A3@8;2u-= zsV*AO&pK{9B_|rtNJDk)@x7OKy(*OaxOY?Z2?zO8eqwxJd~G~6Ppir319VBh30hu& z*=j-hw&?@osibEp_kwh?$u~joZ_*a%GfmpYLn_#$1xYG4X+Isn6AZ5b%Lk6KscCIf z)7qw{wM|WHo0=AwJK3D8ZFWD-`aj~jbS^K|*X#9-o;P9ld$4N)f?mdpP`wUov;};T Y#_0lW11@;)$~Rl@%4SYmiR>l*0j~m3Z~y=R diff --git a/source/fonts/icomoon.svg b/source/fonts/icomoon.svg deleted file mode 100755 index 24493587d38..00000000000 --- a/source/fonts/icomoon.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - \ No newline at end of file diff --git a/source/fonts/icomoon.ttf b/source/fonts/icomoon.ttf deleted file mode 100755 index 360b3d751620cc106382cda4c2d548656db343f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2616 zcmb7GO>7%Q6n<}iX4ZCUCyoD-+D>FQb|s42?%H0W{4_%SNvZ%+p$OCpaMLuYl*AED z)#idK#E}EyS`G+t=1^7Y1q2e;N^t5W94aC8fJ)UvdxM&9b~dpS+#=T5_cw38dGF1e zoe&dIjBb)iN8ft;i0c&p`T>^j@qVQjUPV%8eqB{lul&eRVyYz)o79|dJQ~E4#u!NjXsp^zuRrt2r>mS zw|^hD!WqE;2ou9A5uj)ru>J91$fX3`Vv`i*+U-!`T)JI1X^&&?MKdDokq@Z3T^UvRyNG1IVo zGkAQ{JRXgJd8%Md`krZW|(vR{h930 z$uUcm4a+hUk!T_wjR`xxKamJsgos9L+i`4+uk9&LP_XL?r~~`cP%7OQn-U^tSc6hJ zG8&aqI0OBIG3_Uuh(PsVl(FbOe^2Ft8g|#GOcV6ZPJQ-PDW!_jwXx=22esQTF2@+Q z=m28BphL^$G{1?>3pTz}sk=Q>ufqRJ?WDx>fU0VhNf|o&_1<}+6~aC~OeZ1MjxYiS zEz5F(D*+X$j7A4-)cs(WB|2og*)xsc5b&&BtJ(Ij?MPAcgmfTwEM84p zTD>y*Q3|haMTE>sX6d?$W~GQ&^$>?yA%OyYMjewJb50$UsbjTVfw_>Y9h=f$3*Fy3 zFSRWdscBj5m<%Y+o}Wnt6n#6z8P&ZyuZrm8<>P3h?fEv4z;B+826d z^jJAFpAphxX3UsHN>-#4v5?y=Kw!0`ID?dg9PG}bJ3IBA>g-h#-yD5nD_wc~ckEj_ zX0VsW+KKOf#57DEKCP;AN=4NW6R*h0IZlsb0!*iz%UlfcH zE*K4enyXwHD^`tqZ5l%bxWtVTKiRY+(TEir=o5w7sY8cO)e4I5FOKB*v0({&Nem1O zNFmsf&wo8oEhUqs>Va*3c*z!)!Ta(f#r@k;6&HO2F$=i%rgT^c2?(*#Jy8Md+=JPl zZ{7JYG5L&QstJgGS@~nO!^13bIR`zW25^t5`&2g#&-li8VxCo#@%GVW{XfA@6fo{Qar!Qdfhi8FzG)4}r$gCB?!@JlpG V7ikl8E&zTbTs+8Xr-;3Te*iBhKi>cV diff --git a/source/fonts/icomoon.woff b/source/fonts/icomoon.woff deleted file mode 100755 index 9a213b112669b937374d2cd9030609d6041169ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2816 zcmcImYiv|S6rS7N+fGYqLA!*9nxbfoCbm?HV9=Oaiv~zZm?VEYdGMnOxroO^Rm?S9y@IrKCwXxLr53$_KYtrnEL8raqVBW$liUm?hM zLAut^)ZPi(KIp}Q@+HQaYC8p940@(ZxtmyXZ4>;;KFXN1R#5rkuP?L&_qQXai&#_W zk`FV??`M)E@y5DfQ!v=fqzu@ek3W>`3a9)m3*vlsCF5z|3;tz(M>aCoWPWlpn&qnI3N84Zo|&f~okbb?L{PaHWu zGJb3nY-A$(74eBgJU~CnWa@@yfFdgKYLYe5bPYq-NaeIeCQOKF5b?7ln`A^H5yOZW zWODslV8E%6$=$CR*g||G$tnQ_5Wvv5oxlP;f?2H6P2xY0jJ;`)2uEa5XI_BL3LI05 z-0}rD@I}{k2%M^AQX?9GJedFbGVN3cC>B1{^KtK?t`80j9T+@dy+=E!A=I{0RU(R| z@GpZh(BXp!!Z3$F8X6j~2dyD@9 zIrX^t5H7l*qo>3lsg%4_pYV8 zy>i?u-R(Ufa(G(g@U&M8xaZchg~)j#U1H=88kVLN!>YeDVvu~@PIA|8+j`edkBoM&8%*e0K<^b86t(v@Ma&l5OO~WSq zG)uL3>rq*?!bX_Fq-cu5YqoAZBcn-NOITAC-r6QBimqTmI1;v0K3P*!BP*&dwuIe& z8f}wJ1qT4sGAxUqIWxIcwiL^?*oJBG(W5fDz#^MFzH|3Bx<8%10DU2ot=o#}InK+7 zreP5Q!iG?IJ;`o>s){Hn%&DwQSVVw|szKniM<(RKQoT_4G*Owb2vAjo!Y4>}12j{i z(DZc5Vp(Pc(eo>Z?|*Cwbmd(gcd)=K#QpIq?sLutXaLDIdF$wGuejZl$WHJLKh3qF zf4rpAK_pYb-C-qF1tq`8;_l&Z)v9V z(sEi(rKMoYFO|-~bTT$RruW!b#;+&l%dyayemE98tdE6aJTc|)Ksi-S(Rn&QH3ddf zRa8#pRaNE0^WxEhIR58z-KT^PSD4LY+_)R1dfb=mQ{Nf3g!M!J_mIRhV9t1nvCCP~ z#Uy^xMfdi`y+1n&T`2<`H##c-7qbPpG1uUmgI7ideiAFZoR$1LnS_l&X09wHe_QHL z?Qkc+Bqm{1zKa6&_chy!-pXG$!{&)282fqOAL31t`X;YRH{g?a%XrgbKNG&<_J$eq zjWm+03YI%7K@iSLr|wK1%BJ+LJob4CPhxqg?c%6BwmxO|L0*xP{gAh$WSK33=4CDu zuZfbBoWq`Ebs`7;Y*+-QCwrKl>|uJchv~^4rYC1&@7mN}53>=tLDmEcvS#)M+s)e8 ze%9z}g={5z2Cuj|YtqlKIYw56jeA%J+sA4FFn4Y}=9*pLTGo#5E>_5PvUkB>a}R$# Lb+{W9*qz5e&1UyY diff --git a/source/fonts/slate.eot b/source/fonts/slate.eot new file mode 100755 index 0000000000000000000000000000000000000000..13c4839a1975d4c92d66753d75553f922743c6ef GIT binary patch literal 1876 zcmaJ?&2Jl35TEDWeRg&sP8)xqh$Kr)Yzaiu#`dnNaHtS!Xx9i53LF}#nAmmP`Xfq= z;s{Zte*qCEK;i~h4hYFPaA-x4sD#vVrBXQ{MIaD@1Ke8kn|8tnQ^fdI9N^x@? zd<=RUJW{D`U;b-v<0kYSA}zO8E|&DaCqF0BzlPme0}$TUZbAP8`m<~GR{K~75*dg= zcCEQu4DE@ZpmS=+>&5muJwb0nf0^x#V!izR7X1vpggLV7&CM3_1j&!tPMS_)mkgrN zC!rsJe5kniow8zt{RT+zltXle=pd}!=-!|+8X9a|iyqm&z#GOh#?Z4hMmoI$K1va6 zrUYgm&_U=R+`ZrJ0!LQ9E`42ef0@uHvC8U zo}w4%B?O&MCX$JGEG)w^HIqqa()pb0xK4IFpUb457c*fwDPqaQf|z%md}h1{#>ac0 zD>_@{@&c$_-fEYWRBE3yj7U8q4MTz%hA^cOxdwei%19MlXpM(P_)+e=@Rm}B>tXap zwoqO*DogaoKF+^`!zvX>{f10 zq*F6dk@0&Ok4=k2cHR|EKKaOn+_Q3KG-~~J-9n!;&D+d{W9=SQ|IqlDm9?y2uUl{( zi(0o$Q@Cby<g+B7U zE7gMM6{=S}Ps}C~lhg72%h#4X&vB-0d)je4Z)w>(?>M%-xE~jH;l@L}Lcyy(n4O9z z65lS`w&R>XbW_^$2bKN!lz(S%N3N!tcP>R={D&-^3rjyfS-aWi!AkH>sk+00G5&qW zC1%n(1Gmpd;5$IPUF_Lw@K%&WbbxEX?LgKcF9x!K$J`8LiMQ^#KsG5yOZ=|rBS1K&l2uG4tC&hwF_o-hDp_Le zTrgI}?0+pse + + +Generated by IcoMoon + + + + + + + + + + diff --git a/source/fonts/slate.ttf b/source/fonts/slate.ttf new file mode 100755 index 0000000000000000000000000000000000000000..ace9a46a7e1ed6b6ab3de2f30ef3e27c572f88d3 GIT binary patch literal 1720 zcmaJ>-D_KA7=PaL@t*V?ZMro%kz(6pV-rwZyCyk@Q7?wb>UJv9`gO6wj7^qiCTUqB zO%X@;7dX69!8^V6LWJzXiw!F%45qgVdLa}=5xvm6E&iVKo-9$jJ@CHI_viaTf`}a2 zC!H2wcyVDVd0amU$>&(FZ8pn0bm7yth{U7dH)`ef4)6r{E^wmO*t_`0^~*QG?-S|8 zt!lYq{5ky*k?|Sy{uTt*p8hrX-@re<)$DYS^+1t{800m!H_O^}@g4X@@W-3w?hZXf zuY!M;^{sNV`qeJ|2)=?Gg`Mqo2XzAEd#oqjAaRXMBJF+c79{T|EPkbe7-PE;5S;Q~ zaGL1Q(r@%{&}khDI-bPX!~GUGz-0@x9Aaiik?BxrHq?#(PnWnI%nYaReOv*$ZSm>?)ctla|1hAG;T1^YPnfOv{N&_J8ekcvoG^Cm?MLpzb znO-8ASEU{s)D{<<&JKz%JjTWAM|EWWzjHMajT;ECdZ?bsKw&|^tZONrkvOuIkI%De zUYTtG_26}0jYK0>4*B1QgBuPLXU?}t^*TiboK|r`R>P0_HD+(cdi{Ze{FKYDLBs0R~?v6B%Rx~Edo2aasT@IJ-vtfG(iE^ z$Awv_E5l{^C4s84a|;3+->t#z!u^V-9Nj!@+Ph(RslFP9tMyA^DCS*vdNzG<@yc2l z`u?ov&H8>AuC0gXeBbj{4$|U#n6XQ^x*FE+&d;P>_lp(J^Zj%8%oMl&cI_ZN6TKO{ zkvFp2-&{yO{TDd~50<`txN&oc<4*8TskuV~pXj~g5i{t$k=GYVU^@bQTx>a5uvcK? zADE$i`dge4A3((KH9;?{zv*7K*f>Jt^humckR5yQeHf=xv0R7Ti)jP&N=%#Ng5wPM z_VCv|5z{smX^sCCV+<0Gsc02b(JH2*RZK;zn2MJ0U5I^E%r-TsOdYDyD_EDQO?BF) z7OFc*Cuk9TtZz5Uo$8RKb(q)a%}C8|gD__z_YMNoV9|<#sst6tUZ*|mXK52w&tq|_ J6Wq-M;U6NW`v(93 literal 0 HcmV?d00001 diff --git a/source/fonts/slate.woff b/source/fonts/slate.woff new file mode 100755 index 0000000000000000000000000000000000000000..1e72e0ee0018119d7c814c2097cc60c0bcd05d84 GIT binary patch literal 1796 zcmaJ>&2Jl35TCanZ=GF;-Nqj%Qj#SmwgjS~vAs(b4i$%lc7v*fuR|jhlemtH?Nqf< z5&;$c3y8RZ#0{p83^QtGf$~^ZU#vdPL3b z4fcBr_DN>rKz!G#?&4f~pM4ZRM6a}~ts1aTadwIM%N_dh>UO7#K7YRFXF@YA68l_? z@xFm7>0K?wZ&VUvut!OxMlIIQ5*<0_&Hha~Yl49Y@PK@!7+CqFG*;eClSR)#j$=Xw zNnrjF9T`VX|4zRT99<||DqHk_nzSa(NzO5voBad{L?lOWoE4r?ZbRP(V_X@TZL>{} z(3A8mk}l-3xojrwNJr*pi-lsLQVxSKC{0w##ljO}){#>poy#tYg)pcTCk9|L<3To?f*omEO$b9ODUa}gVj!a zAvUB1l6OCpmTg;7PgnO)phbF-Xik@UVo+OLa3((}zVs*;Zywi?{r}GOL=0{q1ou!q ztD%;HAbGE?Z5HC#RzAMSTXWiN9ioS*i+Usm@#fI}eK@$`F!8DQHtAj`iEnm!UKH}P zNl{d*%%o>TwzLq6ppv_9BR_a$H<|Q)z2RXkyY6k4BJlQ)o4+xU@=Bif%MA~%sib$? zbw%hV*Y96nzi0MvpHdWZeO#D>x^i4rP!XsqKRYk5@ZB2RF5E9QWp(qg81F^VmBvaG ztu(Ggk(kS7r)DyTm#?ozQ4q}d{!9==(dt@sJ_vk&`7k5ChZ~1PD=Sgs?%Z@HoBe#* z_k-a4JvVKwyWWZ=q2@1#9uk~9EfrHBtA=!8%MC` zIGu@c6SyDi7WCy Date: Sat, 21 Feb 2015 00:22:58 +0100 Subject: [PATCH 11/20] Add WOFF2 version of the icon font --- source/fonts/slate.woff2 | Bin 0 -> 796 bytes source/stylesheets/_icon-font.scss | 1 + 2 files changed, 1 insertion(+) create mode 100755 source/fonts/slate.woff2 diff --git a/source/fonts/slate.woff2 b/source/fonts/slate.woff2 new file mode 100755 index 0000000000000000000000000000000000000000..7c585a72737539240f1ec97a725eb6d7347d2bc5 GIT binary patch literal 796 zcmV+%1LOR6Pew8T0RR9100SHV3jhEB00yi800Pbc0RR9100000000000000000000 z00006U;tbZ2nvQMg+Bo{0we<<3labXAO(Um2Ot}71;`$!%XmzA7Qq8=XT3iY%ud$O zWX0S9ZjY*kHtiXmTBy7_umPvrP6Jzi{`Zd`tTPV^?c*5BT6)|dWhhwm@ z2-w*rE$c_UfviKEL=Vy>={0bo+(i5#P1q3$6VB``hVMrCzU@B6vbqKcPy}m-BtQn- zkylU>byNe6DE>18g5d9bm%bZqa|qF=7&3(|U!AY)%Yg-vOsqKIq$w0D$r*3}ks4=+ z>U6?w2xMd=B$;zQ9v)F1K7KwfQ9|)<9nl&i?6-rchs{I8LC1eK^@#(|^QwB-{VeQz zoHLn@cwG?Yo(X!F(Q8iBOqSNs${h}C*?qJYLuZAnVXqx{ww|}Ux0`ca^V#hz?c7{r z7ldYbmk!M1m3G+IYC6(!VcCzqp&pJkZ#1@kw2W<^EJMqOM;^&dq6ELC*|pK!(cC0< zbZtF%BzLsuTw5O*+eg;dX0a+hcfI=gj8a~qWYJoMamHAo)!Qq|6&~9S8`{d0T?L&% z@$R=P6H0rTp6V+-Dlb>EB67JEMQ>kk%`y}{hvBC(RNEw)*%|U|4>SL+B=3rE@y*rw zR_bLZr&~XN?C;+yx2IilcDnrb?M)}An;DsTe@^rq$9L-UWNqY_oTyWyYisN3CMIh; z*C)b12exYgK^2c4S}J#2YJ+00rUlj%+LqQ7E%lldEc`K|1Bky)iLkwF{Wltvj!{A+PBEzhE3BX) zFBgqmj@&z?N1*=OK?z54T7is8FiA(N66oe`X+cKl>`n&&000000HC;3 zk^ug-#56-JW5JAtMV6Rgj#+|9A(7;@^`+^dWy@Alt7D86w|;R>QMs>d+47HJVfKhH aD;vc&%m&dlj4($-ipx}q&#}A+00017%3vV? literal 0 HcmV?d00001 diff --git a/source/stylesheets/_icon-font.scss b/source/stylesheets/_icon-font.scss index d963b537f28..b5994839881 100644 --- a/source/stylesheets/_icon-font.scss +++ b/source/stylesheets/_icon-font.scss @@ -2,6 +2,7 @@ font-family: 'slate'; src:font-url('slate.eot?-syv14m'); src:font-url('slate.eot?#iefix-syv14m') format('embedded-opentype'), + font-url('slate.woff2?-syv14m') format('woff2'), font-url('slate.woff?-syv14m') format('woff'), font-url('slate.ttf?-syv14m') format('truetype'), font-url('slate.svg?-syv14m#slate') format('svg'); From 402f931fc90939b0440fb73a1e92a492098e888e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Mon, 1 Jun 2015 23:27:03 +0200 Subject: [PATCH 12/20] Fix minor SCSS issues introduced in ab816e432a0c0356d111ce43d31148f68813e44c. --- source/stylesheets/screen.css.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index 1cbac164554..e7f87015d09 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -50,11 +50,11 @@ html, body { @mixin embossed-bg { background: - linear-gradient(to bottom,rgba(#000, 0.2), rgba(#000, 0) 8px), + linear-gradient(to bottom, rgba(#000, 0.2), rgba(#000, 0) 8px), linear-gradient(to top, rgba(#000, 0.2), rgba(#000, 0) 8px), linear-gradient(to bottom, rgba($nav-embossed-border-top, 1), rgba($nav-embossed-border-top, 0) 1.5px), linear-gradient(to top, rgba($nav-embossed-border-bottom, 1), rgba($nav-embossed-border-bottom, 0) 1.5px), - #262626; + $nav-subitem-bg; } .tocify-wrapper { From a38011b4a53b69bb381fb908cbda30d99a4aa11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Tue, 2 Jun 2015 22:53:41 +0200 Subject: [PATCH 13/20] Remove some unused JS. --- source/javascripts/app/_lang.js | 3 +-- source/javascripts/app/_search.js | 11 ++++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index 2683ef356db..c3b48edbdb4 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -54,7 +54,6 @@ under the License. } function setupLanguages(l) { - var currentLanguage = l[0]; var defaultLanguage = localStorage.getItem("language"); languages = l; @@ -81,7 +80,7 @@ under the License. activateLanguage(language); return false; }); - window.onpopstate = function(event) { + window.onpopstate = function() { activateLanguage(window.location.search.substr(1)); }; }); diff --git a/source/javascripts/app/_search.js b/source/javascripts/app/_search.js index 550b1a30f61..91f38a04edf 100644 --- a/source/javascripts/app/_search.js +++ b/source/javascripts/app/_search.js @@ -1,10 +1,9 @@ //= require ../lib/_lunr //= require ../lib/_jquery.highlight -(function (global) { +(function () { 'use strict'; - var $global = $(global); - var content, darkBox, searchResults; + var content, searchResults; var highlightOpts = { element: 'span', className: 'search-highlight' }; var index = new lunr.Index(); @@ -31,7 +30,6 @@ function bind() { content = $('.content'); - darkBox = $('.dark-box'); searchResults = $('.search-results'); $('#input-search').on('keyup', search); @@ -58,7 +56,7 @@ highlight.call(this); } else { searchResults.html('
  • '); - $('.search-results li').text('No Results Found for "' + this.value + '"'); + $('.search-results li').text('No Results Found for "' + this.value + '"'); } } else { unhighlight(); @@ -73,5 +71,4 @@ function unhighlight() { content.unhighlight(highlightOpts); } - -})(window); +})(); From 1fe3ce6396a36650c20713f33fd8dc88a27ee353 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Fri, 19 Jun 2015 23:33:54 -0400 Subject: [PATCH 14/20] Update lord.io link to https --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21ec87edac2..582f88b2c2d 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ Just [submit a issue](https://github.com/tripit/slate/issues) to the Slate Githu Contributors -------------------- -Slate was built by [Robert Lord](http://lord.io) while at [TripIt](http://tripit.com). +Slate was built by [Robert Lord](https://lord.io) while at [TripIt](http://tripit.com). Thanks to the following people who have submitted major pull requests: From be57777a3de67cd0da83b663de82b9a6276e6ac1 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 00:05:46 -0400 Subject: [PATCH 15/20] Add chinese fonts, thanks to @JayMiao --- source/stylesheets/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/stylesheets/_variables.scss b/source/stylesheets/_variables.scss index 0957678427b..5fe64b1f302 100644 --- a/source/stylesheets/_variables.scss +++ b/source/stylesheets/_variables.scss @@ -68,7 +68,7 @@ $phone-width: $tablet-width - $nav-width; // min width before reverting to mobil // FONTS //////////////////// %default-font { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: "Helvetica Neue", Helvetica, Arial, "Microsoft Yahei","微软雅黑", STXihei, "华文细黑", sans-serif; font-size: 13px; } From 872550d0b7aa0fce48ec5c3303e5a46b11267e60 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 00:48:56 -0400 Subject: [PATCH 16/20] Update h3 fonts to work better for chinese, fixes #214 --- source/stylesheets/screen.css.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/stylesheets/screen.css.scss b/source/stylesheets/screen.css.scss index e7f87015d09..e4b3ef82b22 100644 --- a/source/stylesheets/screen.css.scss +++ b/source/stylesheets/screen.css.scss @@ -391,10 +391,9 @@ html, body { h3, h4, h5, h6 { @extend %header-font; - font-size: 12px; + font-size: 15px; margin-top: 2.5em; margin-bottom: 0.8em; - text-transform: uppercase; } h4, h5, h6 { From bb24528f851fdcb7db7016baa3a376926817dbf1 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 01:04:02 -0400 Subject: [PATCH 17/20] Update gems --- Gemfile | 2 +- Gemfile.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index 5d8c0211b36..3a2a2e01a82 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'middleman-gh-pages', '~> 0.0.3' gem 'middleman-syntax', '~> 2.0.0' gem 'middleman-autoprefixer', '~> 2.4.4' gem 'rouge', '~> 1.9.0' -gem 'redcarpet', '~> 3.2.2' +gem 'redcarpet', '~> 3.3.1' gem 'rake', '~> 10.4.2' gem 'therubyracer', '~> 0.12.1', platforms: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index d29c7d0046c..f9978492816 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.1.10) + activesupport (4.1.11) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - autoprefixer-rails (5.2.0) + autoprefixer-rails (5.2.0.1) execjs json celluloid (0.16.0) @@ -39,28 +39,28 @@ GEM hooks (0.4.0) uber (~> 0.0.4) i18n (0.7.0) - json (1.8.2) + json (1.8.3) kramdown (1.7.0) libv8 (3.16.14.7) - listen (2.10.0) + listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.11) + middleman (3.3.12) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.11) + middleman-core (= 3.3.12) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) middleman-autoprefixer (2.4.4) autoprefixer-rails (~> 5.2.0) middleman-core (>= 3.3.3) - middleman-core (3.3.11) + middleman-core (3.3.12) activesupport (~> 4.1.0) bundler (~> 1.1) erubis @@ -82,25 +82,25 @@ GEM middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - minitest (5.6.1) - multi_json (1.11.0) + minitest (5.7.0) + multi_json (1.11.1) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.5) tilt (~> 1.4.1) padrino-support (0.12.5) activesupport (>= 3.1) - rack (1.6.0) + rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) rake (10.4.2) - rb-fsevent (0.9.4) + rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.3) + redcarpet (3.3.1) ref (1.0.5) rouge (1.9.0) - sass (3.4.13) + sass (3.4.14) sprockets (2.12.3) hike (~> 1.2) multi_json (~> 1.0) @@ -135,6 +135,6 @@ DEPENDENCIES middleman-gh-pages (~> 0.0.3) middleman-syntax (~> 2.0.0) rake (~> 10.4.2) - redcarpet (~> 3.2.2) + redcarpet (~> 3.3.1) rouge (~> 1.9.0) therubyracer (~> 0.12.1) From d14fd0f70ed984c4c97e07215e5c9bdc344de4f1 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 01:49:25 -0400 Subject: [PATCH 18/20] Update language tabs to not disturb existing query strings, fixes #57 --- source/javascripts/app/_lang.js | 88 +++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index c3b48edbdb4..79d3903d2e4 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -40,6 +40,83 @@ under the License. } } + // parseURL and stringifyURL are from https://github.com/sindresorhus/query-string + // MIT licensed + // https://github.com/sindresorhus/query-string/blob/7bee64c16f2da1a326579e96977b9227bf6da9e6/license + function parseURL(str) { + if (typeof str !== 'string') { + return {}; + } + + str = str.trim().replace(/^(\?|#|&)/, ''); + + if (!str) { + return {}; + } + + return str.split('&').reduce(function (ret, param) { + var parts = param.replace(/\+/g, ' ').split('='); + var key = parts[0]; + var val = parts[1]; + + key = decodeURIComponent(key); + // missing `=` should be `null`: + // http://w3.org/TR/2012/WD-url-20120524/#collect-url-parameters + val = val === undefined ? null : decodeURIComponent(val); + + if (!ret.hasOwnProperty(key)) { + ret[key] = val; + } else if (Array.isArray(ret[key])) { + ret[key].push(val); + } else { + ret[key] = [ret[key], val]; + } + + return ret; + }, {}); + }; + + function stringifyURL(obj) { + return obj ? Object.keys(obj).sort().map(function (key) { + var val = obj[key]; + + if (Array.isArray(val)) { + return val.sort().map(function (val2) { + return encodeURIComponent(key) + '=' + encodeURIComponent(val2); + }).join('&'); + } + + return encodeURIComponent(key) + '=' + encodeURIComponent(val); + }).join('&') : ''; + }; + + // gets the language set in the query string + function getLanguageFromQueryString() { + if (location.search.length >= 1) { + var language = parseURL(location.search).language + if (language) { + return language; + } else if (jQuery.inArray(location.search.substr(1), languages) != -1) { + return location.search.substr(1); + } + } + + return false; + } + + // returns a new query string with the new language in it + function generateNewQueryString(language) { + if (location.search.length >= 1) { + var url = parseURL(location.search); + if (url.language) { + url.language = language; + return stringifyURL(url); + } else { + return language + } + } + } + // if a button is clicked, add the state to the history function pushURL(language) { if (!history) { return; } @@ -47,7 +124,7 @@ under the License. if (hash) { hash = hash.replace(/^#+/, ''); } - history.pushState({}, '', '?' + language + '#' + hash); + history.pushState({}, '', '?' + generateNewQueryString(language) + '#' + hash); // save language as next default localStorage.setItem("language", language); @@ -58,11 +135,12 @@ under the License. languages = l; - if ((location.search.substr(1) !== "") && (jQuery.inArray(location.search.substr(1), languages)) != -1) { + var presetLanguage = getLanguageFromQueryString(); + if (presetLanguage) { // the language is in the URL, so use that language! - activateLanguage(location.search.substr(1)); + activateLanguage(presetLanguage); - localStorage.setItem("language", location.search.substr(1)); + localStorage.setItem("language", presetLanguage); } else if ((defaultLanguage !== null) && (jQuery.inArray(defaultLanguage, languages) != -1)) { // the language was the last selected one saved in localstorage, so use that language! activateLanguage(defaultLanguage); @@ -81,7 +159,7 @@ under the License. return false; }); window.onpopstate = function() { - activateLanguage(window.location.search.substr(1)); + activateLanguage(getLanguageFromQueryString()); }; }); })(window); From fd5cba00f0fc064d80dee75dc1630b02a7bc38b8 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 01:53:20 -0400 Subject: [PATCH 19/20] Fix small bug with new language tabs --- source/javascripts/app/_lang.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/javascripts/app/_lang.js b/source/javascripts/app/_lang.js index 79d3903d2e4..1a124bb68ae 100644 --- a/source/javascripts/app/_lang.js +++ b/source/javascripts/app/_lang.js @@ -106,15 +106,12 @@ under the License. // returns a new query string with the new language in it function generateNewQueryString(language) { - if (location.search.length >= 1) { - var url = parseURL(location.search); - if (url.language) { - url.language = language; - return stringifyURL(url); - } else { - return language - } + var url = parseURL(location.search); + if (url.language) { + url.language = language; + return stringifyURL(url); } + return language; } // if a button is clicked, add the state to the history From 415dcf2c90d380011be9cf1ec5cc500574d64d46 Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Sat, 20 Jun 2015 01:54:06 -0400 Subject: [PATCH 20/20] Add changes to log from v1.2 --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8adca156616..59ee6a441e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## Version 1.2 + +*June 20, 2014* + +**Fixes:** + +- Remove crash on invalid languages +- Update Tocify to scroll to the highlighted header in the Table of Contents +- Fix variable leak and update search algorithms +- Update Python examples to be valid Python +- Update gems +- More misc. bugfixes of Javascript errors +- Add Dockerfile +- Remove unused gems +- Optimize images, fonts, and generated asset files +- Add chinese font support +- Remove RedCarpet header ID patch +- Update language tabs to not disturb existing query strings + ## Version 1.1 *July 27th, 2014*