Skip to content

Commit 7f873ca

Browse files
author
Tariq Islam
committed
Merge pull request #281 from tripit/dev
Slate v1.2 holy moly that's a lot of changes! 👍
2 parents 203bc79 + 415dcf2 commit 7f873ca

31 files changed

+359
-129
lines changed

‎.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
sudo: false
2+
3+
language: ruby
4+
15
rvm:
26
- 1.9.3
37
- 2.0.0
8+
9+
cache: bundler

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog
22

3+
## Version 1.2
4+
5+
*June 20, 2014*
6+
7+
**Fixes:**
8+
9+
- Remove crash on invalid languages
10+
- Update Tocify to scroll to the highlighted header in the Table of Contents
11+
- Fix variable leak and update search algorithms
12+
- Update Python examples to be valid Python
13+
- Update gems
14+
- More misc. bugfixes of Javascript errors
15+
- Add Dockerfile
16+
- Remove unused gems
17+
- Optimize images, fonts, and generated asset files
18+
- Add chinese font support
19+
- Remove RedCarpet header ID patch
20+
- Update language tabs to not disturb existing query strings
21+
322
## Version 1.1
423

524
*July 27th, 2014*

‎Gemfile

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

33
# Middleman
44
gem 'middleman', '~>3.3.10'
55
gem 'middleman-gh-pages', '~> 0.0.3'
66
gem 'middleman-syntax', '~> 2.0.0'
7-
gem 'rouge', '~> 1.8.0'
8-
gem 'redcarpet', '~> 3.2.2'
7+
gem 'middleman-autoprefixer', '~> 2.4.4'
8+
gem 'rouge', '~> 1.9.0'
9+
gem 'redcarpet', '~> 3.3.1'
910

1011
gem 'rake', '~> 10.4.2'
1112
gem 'therubyracer', '~> 0.12.1', platforms: :ruby

‎Gemfile.lock

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
GEM
2-
remote: http://rubygems.org/
2+
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.1.10)
4+
activesupport (4.1.11)
55
i18n (~> 0.6, >= 0.6.9)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.1)
99
tzinfo (~> 1.1)
10+
autoprefixer-rails (5.2.0.1)
11+
execjs
12+
json
1013
celluloid (0.16.0)
1114
timers (~> 4.0.0)
1215
chunky_png (1.3.4)
@@ -36,25 +39,28 @@ GEM
3639
hooks (0.4.0)
3740
uber (~> 0.0.4)
3841
i18n (0.7.0)
39-
json (1.8.2)
42+
json (1.8.3)
4043
kramdown (1.7.0)
4144
libv8 (3.16.14.7)
42-
listen (2.10.0)
45+
listen (2.10.1)
4346
celluloid (~> 0.16.0)
4447
rb-fsevent (>= 0.9.3)
4548
rb-inotify (>= 0.9)
46-
middleman (3.3.11)
49+
middleman (3.3.12)
4750
coffee-script (~> 2.2)
4851
compass (>= 1.0.0, < 2.0.0)
4952
compass-import-once (= 1.0.5)
5053
execjs (~> 2.0)
5154
haml (>= 4.0.5)
5255
kramdown (~> 1.2)
53-
middleman-core (= 3.3.11)
56+
middleman-core (= 3.3.12)
5457
middleman-sprockets (>= 3.1.2)
5558
sass (>= 3.4.0, < 4.0)
5659
uglifier (~> 2.5)
57-
middleman-core (3.3.11)
60+
middleman-autoprefixer (2.4.4)
61+
autoprefixer-rails (~> 5.2.0)
62+
middleman-core (>= 3.3.3)
63+
middleman-core (3.3.12)
5864
activesupport (~> 4.1.0)
5965
bundler (~> 1.1)
6066
erubis
@@ -76,25 +82,25 @@ GEM
7682
middleman-syntax (2.0.0)
7783
middleman-core (~> 3.2)
7884
rouge (~> 1.0)
79-
minitest (5.6.1)
80-
multi_json (1.11.0)
85+
minitest (5.7.0)
86+
multi_json (1.11.1)
8187
padrino-helpers (0.12.5)
8288
i18n (~> 0.6, >= 0.6.7)
8389
padrino-support (= 0.12.5)
8490
tilt (~> 1.4.1)
8591
padrino-support (0.12.5)
8692
activesupport (>= 3.1)
87-
rack (1.6.0)
93+
rack (1.6.4)
8894
rack-test (0.6.3)
8995
rack (>= 1.0)
9096
rake (10.4.2)
91-
rb-fsevent (0.9.4)
97+
rb-fsevent (0.9.5)
9298
rb-inotify (0.9.5)
9399
ffi (>= 0.5.0)
94-
redcarpet (3.2.3)
100+
redcarpet (3.3.1)
95101
ref (1.0.5)
96-
rouge (1.8.0)
97-
sass (3.4.13)
102+
rouge (1.9.0)
103+
sass (3.4.14)
98104
sprockets (2.12.3)
99105
hike (~> 1.2)
100106
multi_json (~> 1.0)
@@ -125,9 +131,10 @@ PLATFORMS
125131

126132
DEPENDENCIES
127133
middleman (~> 3.3.10)
134+
middleman-autoprefixer (~> 2.4.4)
128135
middleman-gh-pages (~> 0.0.3)
129136
middleman-syntax (~> 2.0.0)
130137
rake (~> 10.4.2)
131-
redcarpet (~> 3.2.2)
132-
rouge (~> 1.8.0)
138+
redcarpet (~> 3.3.1)
139+
rouge (~> 1.9.0)
133140
therubyracer (~> 0.12.1)

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Just [submit a issue](https://github.com/tripit/slate/issues) to the Slate Githu
102102
Contributors
103103
--------------------
104104

105-
Slate was built by [Robert Lord](http://lord.io) while at [TripIt](http://tripit.com).
105+
Slate was built by [Robert Lord](https://lord.io) while at [TripIt](http://tripit.com).
106106

107107
Thanks to the following people who have submitted major pull requests:
108108

‎Rakefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
require 'middleman-gh-pages'
2+
require 'rake/clean'
3+
4+
CLOBBER.include('build')
25

36
task :default => [:build]

‎config.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
# Activate the syntax highlighter
1919
activate :syntax
2020

21+
activate :autoprefixer do |config|
22+
config.browsers = ['last 2 version', 'Firefox ESR']
23+
config.cascade = false
24+
config.inline = true
25+
end
26+
2127
# Github pages require relative links
2228
activate :relative_assets
2329
set :relative_links, true

‎font-selection.json

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
{
2+
"IcoMoonType": "selection",
3+
"icons": [
4+
{
5+
"icon": {
6+
"paths": [
7+
"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"
8+
],
9+
"attrs": [],
10+
"isMulticolor": false,
11+
"tags": [
12+
"exclamation-circle"
13+
],
14+
"defaultCode": 61546,
15+
"grid": 14
16+
},
17+
"attrs": [],
18+
"properties": {
19+
"id": 100,
20+
"order": 4,
21+
"prevSize": 28,
22+
"code": 58880,
23+
"name": "exclamation-sign",
24+
"ligatures": ""
25+
},
26+
"setIdx": 0,
27+
"iconIdx": 0
28+
},
29+
{
30+
"icon": {
31+
"paths": [
32+
"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"
33+
],
34+
"attrs": [],
35+
"isMulticolor": false,
36+
"tags": [
37+
"info-circle"
38+
],
39+
"defaultCode": 61530,
40+
"grid": 14
41+
},
42+
"attrs": [],
43+
"properties": {
44+
"id": 85,
45+
"order": 3,
46+
"name": "info-sign",
47+
"prevSize": 28,
48+
"code": 58882
49+
},
50+
"setIdx": 0,
51+
"iconIdx": 2
52+
},
53+
{
54+
"icon": {
55+
"paths": [
56+
"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"
57+
],
58+
"attrs": [],
59+
"isMulticolor": false,
60+
"tags": [
61+
"check-circle"
62+
],
63+
"defaultCode": 61528,
64+
"grid": 14
65+
},
66+
"attrs": [],
67+
"properties": {
68+
"id": 83,
69+
"order": 9,
70+
"prevSize": 28,
71+
"code": 58886,
72+
"name": "ok-sign"
73+
},
74+
"setIdx": 0,
75+
"iconIdx": 6
76+
},
77+
{
78+
"icon": {
79+
"paths": [
80+
"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"
81+
],
82+
"width": 951,
83+
"attrs": [],
84+
"isMulticolor": false,
85+
"tags": [
86+
"search"
87+
],
88+
"defaultCode": 61442,
89+
"grid": 14
90+
},
91+
"attrs": [],
92+
"properties": {
93+
"id": 2,
94+
"order": 1,
95+
"prevSize": 28,
96+
"code": 58887,
97+
"name": "icon-search"
98+
},
99+
"setIdx": 0,
100+
"iconIdx": 7
101+
}
102+
],
103+
"height": 1024,
104+
"metadata": {
105+
"name": "slate",
106+
"license": "SIL OFL 1.1"
107+
},
108+
"preferences": {
109+
"showGlyphs": true,
110+
"showQuickUse": true,
111+
"showQuickUse2": true,
112+
"showSVGs": true,
113+
"fontPref": {
114+
"prefix": "icon-",
115+
"metadata": {
116+
"fontFamily": "slate",
117+
"majorVersion": 1,
118+
"minorVersion": 0,
119+
"description": "Based on FontAwesome",
120+
"license": "SIL OFL 1.1"
121+
},
122+
"metrics": {
123+
"emSize": 1024,
124+
"baseline": 6.25,
125+
"whitespace": 50
126+
},
127+
"resetPoint": 58880,
128+
"showSelector": false,
129+
"selector": "class",
130+
"classSelector": ".icon",
131+
"showMetrics": false,
132+
"showMetadata": true,
133+
"showVersion": true,
134+
"ie7": false
135+
},
136+
"imagePref": {
137+
"prefix": "icon-",
138+
"png": true,
139+
"useClassSelector": true,
140+
"color": 4473924,
141+
"bgColor": 16777215
142+
},
143+
"historySize": 100,
144+
"showCodes": true,
145+
"gridSize": 16,
146+
"showLiga": false
147+
}
148+
}

‎source/fonts/icomoon.eot

-2.71 KB
Binary file not shown.

‎source/fonts/icomoon.svg

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

0 commit comments

Comments
 (0)