Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of git://github.com/imathis/octopress

Conflicts:
	Gemfile.lock
  • Loading branch information...
commit c187e54525904d849715eaca9632988d42e0c8df 2 parents 09ec5b8 + f5b6df5
Mark Sim authored
5 .powrc
... ... @@ -0,0 +1,5 @@
  1 +if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ] ; then
  2 + source "$rvm_path/scripts/rvm"
  3 + source ".rvmrc"
  4 +fi
  5 +
2  .themes/classic/source/_includes/head.html
@@ -16,7 +16,7 @@
16 16 <meta name="MobileOptimized" content="320">
17 17 <meta name="viewport" content="width=device-width, initial-scale=1">
18 18
19   - {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
  19 + {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
20 20 <link rel="canonical" href="{{ canonical }}">
21 21 <link href="{{ root_url }}/favicon.png" rel="icon">
22 22 <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
26 Gemfile
... ... @@ -1,18 +1,18 @@
1 1 source "http://rubygems.org"
2 2
3 3 group :development do
4   - gem 'rake'
5   - gem 'rack'
6   - gem 'jekyll'
7   - gem 'rdiscount'
8   - gem 'pygments.rb'
9   - gem 'RedCloth'
10   - gem 'haml', '>= 3.1'
11   - gem 'compass', '>= 0.11'
12   - gem 'rubypants'
13   - gem 'rb-fsevent'
14   - gem 'stringex'
15   - gem 'liquid', '2.2.2'
  4 + gem 'rake', '~> 0.9.2'
  5 + gem 'rack', '~> 1.4.1'
  6 + gem 'jekyll', '~> 0.11.2'
  7 + gem 'rdiscount', '~> 1.6.8'
  8 + gem 'pygments.rb', '~> 0.2.12'
  9 + gem 'RedCloth', '~> 4.2.9'
  10 + gem 'haml', '~> 3.1.6'
  11 + gem 'compass', '~> 0.12.1'
  12 + gem 'rubypants', '~> 0.2.0'
  13 + gem 'rb-fsevent', '~> 0.9'
  14 + gem 'stringex', '~> 1.4.0'
  15 + gem 'liquid', '~> 2.3.0'
16 16 end
17 17
18   -gem 'sinatra', '1.2.6'
  18 +gem 'sinatra', '~> 1.3.2'
59 Gemfile.lock
@@ -8,7 +8,7 @@ GEM
8 8 chunky_png (1.2.5)
9 9 classifier (1.3.3)
10 10 fast-stemmer (>= 1.0.0)
11   - compass (0.12.1)
  11 + compass (0.12.2)
12 12 chunky_png (~> 1.2)
13 13 fssm (>= 0.2.7)
14 14 sass (~> 3.1)
@@ -17,21 +17,23 @@ GEM
17 17 ffi (1.0.11)
18 18 fssm (0.2.9)
19 19 haml (3.1.6)
20   - jekyll (0.11.0)
21   - albino (>= 1.3.2)
22   - classifier (>= 1.3.1)
23   - directory_watcher (>= 1.1.1)
24   - kramdown (>= 0.13.2)
25   - liquid (>= 1.9.0)
26   - maruku (>= 0.5.9)
27   - kramdown (0.13.6)
28   - liquid (2.2.2)
  20 + jekyll (0.11.2)
  21 + albino (~> 1.3)
  22 + classifier (~> 1.3)
  23 + directory_watcher (~> 1.1)
  24 + kramdown (~> 0.13)
  25 + liquid (~> 2.3)
  26 + maruku (~> 0.5)
  27 + kramdown (0.13.7)
  28 + liquid (2.3.0)
29 29 maruku (0.6.0)
30 30 syntax (>= 1.0.0)
31 31 posix-spawn (0.3.6)
32   - pygments.rb (0.2.12)
  32 + pygments.rb (0.2.13)
33 33 rubypython (~> 0.5.3)
34 34 rack (1.4.1)
  35 + rack-protection (1.2.0)
  36 + rack
35 37 rake (0.9.2.2)
36 38 rb-fsevent (0.9.1)
37 39 rdiscount (1.6.8)
@@ -39,10 +41,11 @@ GEM
39 41 rubypython (0.5.3)
40 42 blankslate (>= 2.1.2.3)
41 43 ffi (~> 1.0.7)
42   - sass (3.1.18)
43   - sinatra (1.2.6)
44   - rack (~> 1.1)
45   - tilt (>= 1.2.2, < 2.0)
  44 + sass (3.1.20)
  45 + sinatra (1.3.2)
  46 + rack (~> 1.3, >= 1.3.6)
  47 + rack-protection (~> 1.2)
  48 + tilt (~> 1.3, >= 1.3.3)
46 49 stringex (1.4.0)
47 50 syntax (1.0.0)
48 51 tilt (1.3.3)
@@ -51,16 +54,16 @@ PLATFORMS
51 54 ruby
52 55
53 56 DEPENDENCIES
54   - RedCloth
55   - compass (>= 0.11)
56   - haml (>= 3.1)
57   - jekyll
58   - liquid (= 2.2.2)
59   - pygments.rb
60   - rack
61   - rake
62   - rb-fsevent
63   - rdiscount
64   - rubypants
65   - sinatra (= 1.2.6)
66   - stringex
  57 + RedCloth (~> 4.2.9)
  58 + compass (~> 0.12.1)
  59 + haml (~> 3.1.6)
  60 + jekyll (~> 0.11.2)
  61 + liquid (~> 2.3.0)
  62 + pygments.rb (~> 0.2.12)
  63 + rack (~> 1.4.1)
  64 + rake (~> 0.9.2)
  65 + rb-fsevent (~> 0.9)
  66 + rdiscount (~> 1.6.8)
  67 + rubypants (~> 0.2.0)
  68 + sinatra (~> 1.3.2)
  69 + stringex (~> 1.4.0)
4 plugins/blockquote.rb
@@ -46,7 +46,7 @@ def initialize(tag_name, markup, tokens)
46 46 end
47 47
48 48 def render(context)
49   - quote = paragraphize(super.map(&:strip).join)
  49 + quote = paragraphize(super)
50 50 author = "<strong>#{@by.strip}</strong>" if @by
51 51 if @source
52 52 url = @source.match(/https?:\/\/(.+)/)[1].split('/')
@@ -75,7 +75,7 @@ def render(context)
75 75 end
76 76
77 77 def paragraphize(input)
78   - "<p>#{input.gsub(/\n\n/, '</p><p>').gsub(/\n/, '<br/>')}</p>"
  78 + "<p>#{input.lstrip.rstrip.gsub(/\n\n/, '</p><p>').gsub(/\n/, '<br/>')}</p>"
79 79 end
80 80 end
81 81 end
2  plugins/code_block.rb
@@ -79,7 +79,7 @@ def initialize(tag_name, markup, tokens)
79 79
80 80 def render(context)
81 81 output = super
82   - code = super.join
  82 + code = super
83 83 source = "<figure class='code'>"
84 84 source += @caption if @caption
85 85 if @filetype
6 plugins/pullquote.rb
@@ -32,11 +32,9 @@ def initialize(tag_name, markup, tokens)
32 32
33 33 def render(context)
34 34 output = super
35   - if output.join =~ /\{"\s*(.+)\s*"\}/
36   - #@quote = $1
  35 + if output =~ /\{"\s*(.+?)\s*"\}/m
37 36 @quote = RubyPants.new($1).to_html
38   - #@quote = CGI.escape($1)
39   - "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
  37 + "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.gsub(/\{"\s*|\s*"\}/, '')}</span>"
40 38 else
41 39 return "Surround your pullquote like this {\" text to be quoted \"}"
42 40 end
8 sass/base/_layout.scss
@@ -127,16 +127,17 @@ body.sidebar-footer {
127 127 @media only screen and (min-width: 750px) {
128 128 aside.sidebar { @include collapse-sidebar; }
129 129 }
  130 +#main, #content, .sidebar {
  131 + @extend .group;
  132 +}
130 133 @media only screen and (min-width: 768px) {
131 134 body { -webkit-text-size-adjust: auto; }
132 135 body > header { font-size: $header-font-size * 1.2; }
133 136 #main {
134   - @extend .group;
135 137 padding: 0;
136 138 margin: 0 auto;
137 139 }
138 140 #content {
139   - @extend .group;
140 141 overflow: visible;
141 142 margin-right: $sidebar-width-medium;
142 143 position: relative;
@@ -149,7 +150,6 @@ body.sidebar-footer {
149 150 }
150 151 }
151 152 aside.sidebar {
152   - @extend .group;
153 153 width: $sidebar-width-medium - $sidebar-pad-medium*2;
154 154 padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
155 155 background: none;
@@ -180,7 +180,6 @@ body.sidebar-footer {
180 180 padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
181 181 .collapse-sidebar & {
182 182 padding: { left: $pad-wide; right: $pad-wide; }
183   - @extend .group;
184 183 }
185 184 }
186 185 }
@@ -190,3 +189,4 @@ body.sidebar-footer {
190 189 ul, ol { margin-left: 0; }
191 190 }
192 191 }
  192 +
5 sass/partials/_navigation.scss
@@ -13,7 +13,7 @@ body > nav {
13 13 .search {
14 14 padding: .3em .5em 0;
15 15 font-size: .85em;
16   - @extend .sans;
  16 + font-family: $sans;
17 17 line-height: 1.1em;
18 18 width: 95%;
19 19 @include border-radius(.5em);
@@ -54,7 +54,7 @@ body > nav {
54 54 }
55 55 a {
56 56 @include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
57   - @extend .sans;
  57 + font-family: $sans;
58 58 text-shadow: lighten($nav-bg, 12) 0 1px;
59 59 float: left;
60 60 text-decoration: none;
@@ -134,3 +134,4 @@ body > nav {
134 134 a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
135 135 a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
136 136 }
  137 +
2  source/_includes/article.html
@@ -8,7 +8,7 @@ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% el
8 8 {% unless page.meta == false %}
9 9 <p class="meta">
10 10 {% include post/date.html %}{{ time }}
11   - {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
  11 + {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
12 12 | <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a>
13 13 {% endif %}
14 14 </p>
2  source/_includes/head.html
@@ -16,7 +16,7 @@
16 16 <meta name="MobileOptimized" content="320">
17 17 <meta name="viewport" content="width=device-width, initial-scale=1">
18 18
19   - {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
  19 + {% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
20 20 <link rel="canonical" href="{{ canonical }}">
21 21 <link href="{{ root_url }}/favicon.png" rel="icon">
22 22 <link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
228 source/assets/jwplayer/glow/glow.xml
... ... @@ -1,115 +1,115 @@
1   -<?xml version="1.0"?>
2   -<skin version="1.1" name="Glow" author="LongTail Video">
3   -
4   - <settings>
5   - <setting name="backcolor" value="0x000000" />
6   - <setting name="frontcolor" value="0xeeeeee" />
7   - <setting name="lightcolor" value="0xeeeeee" />
8   - <setting name="screencolor" value="0x000000" />
9   - </settings>
10   -
11   - <components>
12   - <component name="controlbar">
13   - <settings>
14   - <setting name="margin" value="0" />
15   - <setting name="fontsize" value="11" />
16   - <setting name="fontcolor" value="0xEEEEEE" />
17   - <setting name="buttoncolor" value="0xEEEEEE" />
18   - </settings>
19   -
20   - <layout>
21   - <group position="left">
22   - <button name="play" />
23   - <text name="elapsed" />
24   - </group>
25   - <group position="center">
26   - <slider name="time" />
27   - </group>
28   - <group position="right">
29   - <text name="duration" />
30   - <button name="blank" />
31   - <button name="mute" />
32   - <button name="fullscreen" />
33   - </group>
34   - </layout>
35   -
36   - <elements>
37   - <element name="background" src="background.png" />
38   - <element name="capLeft" src="divider.png" />
39   - <element name="capRight" src="divider.png" />
40   - <element name="divider" src="divider.png" />
41   - <element name="blankButton" src="blankButton.png" />
42   - <element name="fullscreenButton" src="fullscreenButton.png" />
43   - <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
44   - <element name="muteButton" src="muteButton.png" />
45   - <element name="muteButtonOver" src="muteButtonOver.png" />
46   - <element name="pauseButton" src="pauseButton.png" />
47   - <element name="pauseButtonOver" src="pauseButtonOver.png" />
48   - <element name="playButton" src="playButton.png" />
49   - <element name="playButtonOver" src="playButtonOver.png" />
50   - <element name="timeSliderBuffer" src="timeSliderBuffer.png" />
51   - <element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
52   - <element name="timeSliderCapRight" src="timeSliderCapRight.png" />
53   - <element name="timeSliderProgress" src="timeSliderProgress.png" />
54   - <element name="timeSliderRail" src="timeSliderRail.png" />
55   - <element name="normalscreenButton" src="normalscreenButton.png" />
56   - <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
57   - <element name="unmuteButton" src="unmuteButton.png" />
58   - <element name="unmuteButtonOver" src="unmuteButtonOver.png" />
59   - <element name="volumeSliderRail" src="divider.png" />
60   - <element name="volumeSliderProgress" src="divider.png" />
61   - </elements>
62   - </component>
63   -
64   - <component name="display">
65   - <settings>
66   - <setting name="bufferinterval" value="250" />
67   - <setting name="bufferrotation" value="90" />
68   - </settings>
69   - <elements>
70   - <element name="background" src="background.png" />
71   - <element name="playIcon" src="playIcon.png" />
72   - <element name="muteIcon" src="muteIcon.png" />
73   - <element name="errorIcon" src="bufferIcon.png" />
74   - <element name="bufferIcon" src="bufferIcon.png" />
75   - </elements>
76   - </component>
77   -
78   - <component name="dock">
79   - <settings>
80   - <setting name="fontcolor" value="0xFFFFFF" />
81   - </settings>
82   - <elements>
83   - <element name="button" src="button.png" />
84   - </elements>
85   - </component>
86   -
87   - <component name="playlist">
88   - <settings>
89   - <setting name="fontcolor" value="0xEEEEEE" />
90   - <setting name="overcolor" value="0xFFFFFF" />
91   - <setting name="activecolor" value="0xFFFFFF" />
92   - <setting name="backgroundcolor" value="0x333333" />
93   - </settings>
94   - <elements>
95   - <element name="item" src="item.png" />
96   - <element name="itemOver" src="itemOver.png" />
97   - <element name="sliderCapBottom" src="sliderCapBottom.png" />
98   - <element name="sliderCapTop" src="sliderCapTop.png" />
99   - <element name="sliderRail" src="sliderRail.png" />
100   - <element name="sliderThumb" src="sliderThumb.png" />
101   - </elements>
102   - </component>
103   -
104   - <component name="sharing">
105   - <elements>
106   - <element name="embedIcon" src="embedIcon.png" />
107   - <element name="embedScreen" src="embedScreen.png" />
108   - <element name="shareIcon" src="shareIcon.png" />
109   - <element name="shareScreen" src="shareScreen.png" />
110   - </elements>
111   - </component>
112   -
113   - </components>
114   -
  1 +<?xml version="1.0"?>
  2 +<skin version="1.1" name="Glow" author="LongTail Video">
  3 +
  4 + <settings>
  5 + <setting name="backcolor" value="0x000000" />
  6 + <setting name="frontcolor" value="0xeeeeee" />
  7 + <setting name="lightcolor" value="0xeeeeee" />
  8 + <setting name="screencolor" value="0x000000" />
  9 + </settings>
  10 +
  11 + <components>
  12 + <component name="controlbar">
  13 + <settings>
  14 + <setting name="margin" value="0" />
  15 + <setting name="fontsize" value="11" />
  16 + <setting name="fontcolor" value="0xEEEEEE" />
  17 + <setting name="buttoncolor" value="0xEEEEEE" />
  18 + </settings>
  19 +
  20 + <layout>
  21 + <group position="left">
  22 + <button name="play" />
  23 + <text name="elapsed" />
  24 + </group>
  25 + <group position="center">
  26 + <slider name="time" />
  27 + </group>
  28 + <group position="right">
  29 + <text name="duration" />
  30 + <button name="blank" />
  31 + <button name="mute" />
  32 + <button name="fullscreen" />
  33 + </group>
  34 + </layout>
  35 +
  36 + <elements>
  37 + <element name="background" src="background.png" />
  38 + <element name="capLeft" src="divider.png" />
  39 + <element name="capRight" src="divider.png" />
  40 + <element name="divider" src="divider.png" />
  41 + <element name="blankButton" src="blankButton.png" />
  42 + <element name="fullscreenButton" src="fullscreenButton.png" />
  43 + <element name="fullscreenButtonOver" src="fullscreenButtonOver.png" />
  44 + <element name="muteButton" src="muteButton.png" />
  45 + <element name="muteButtonOver" src="muteButtonOver.png" />
  46 + <element name="pauseButton" src="pauseButton.png" />
  47 + <element name="pauseButtonOver" src="pauseButtonOver.png" />
  48 + <element name="playButton" src="playButton.png" />
  49 + <element name="playButtonOver" src="playButtonOver.png" />
  50 + <element name="timeSliderBuffer" src="timeSliderBuffer.png" />
  51 + <element name="timeSliderCapLeft" src="timeSliderCapLeft.png" />
  52 + <element name="timeSliderCapRight" src="timeSliderCapRight.png" />
  53 + <element name="timeSliderProgress" src="timeSliderProgress.png" />
  54 + <element name="timeSliderRail" src="timeSliderRail.png" />
  55 + <element name="normalscreenButton" src="normalscreenButton.png" />
  56 + <element name="normalscreenButtonOver" src="normalscreenButtonOver.png" />
  57 + <element name="unmuteButton" src="unmuteButton.png" />
  58 + <element name="unmuteButtonOver" src="unmuteButtonOver.png" />
  59 + <element name="volumeSliderRail" src="divider.png" />
  60 + <element name="volumeSliderProgress" src="divider.png" />
  61 + </elements>
  62 + </component>
  63 +
  64 + <component name="display">
  65 + <settings>
  66 + <setting name="bufferinterval" value="250" />
  67 + <setting name="bufferrotation" value="90" />
  68 + </settings>
  69 + <elements>
  70 + <element name="background" src="background.png" />
  71 + <element name="playIcon" src="playIcon.png" />
  72 + <element name="muteIcon" src="muteIcon.png" />
  73 + <element name="errorIcon" src="bufferIcon.png" />
  74 + <element name="bufferIcon" src="bufferIcon.png" />
  75 + </elements>
  76 + </component>
  77 +
  78 + <component name="dock">
  79 + <settings>
  80 + <setting name="fontcolor" value="0xFFFFFF" />
  81 + </settings>
  82 + <elements>
  83 + <element name="button" src="button.png" />
  84 + </elements>
  85 + </component>
  86 +
  87 + <component name="playlist">
  88 + <settings>
  89 + <setting name="fontcolor" value="0xEEEEEE" />
  90 + <setting name="overcolor" value="0xFFFFFF" />
  91 + <setting name="activecolor" value="0xFFFFFF" />
  92 + <setting name="backgroundcolor" value="0x333333" />
  93 + </settings>
  94 + <elements>
  95 + <element name="item" src="item.png" />
  96 + <element name="itemOver" src="itemOver.png" />
  97 + <element name="sliderCapBottom" src="sliderCapBottom.png" />
  98 + <element name="sliderCapTop" src="sliderCapTop.png" />
  99 + <element name="sliderRail" src="sliderRail.png" />
  100 + <element name="sliderThumb" src="sliderThumb.png" />
  101 + </elements>
  102 + </component>
  103 +
  104 + <component name="sharing">
  105 + <elements>
  106 + <element name="embedIcon" src="embedIcon.png" />
  107 + <element name="embedScreen" src="embedScreen.png" />
  108 + <element name="shareIcon" src="shareIcon.png" />
  109 + <element name="shareScreen" src="shareScreen.png" />
  110 + </elements>
  111 + </component>
  112 +
  113 + </components>
  114 +
115 115 </skin>

0 comments on commit c187e54

Please sign in to comment.
Something went wrong with that request. Please try again.