Skip to content
Browse files

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

Conflicts:
	Gemfile
	Gemfile.lock
  • Loading branch information...
2 parents 8061b19 + e53b26a commit 345b6552c3f3cc2b40d3351b87ace5c01e88010c @heygrady committed
View
8 .themes/classic/sass/base/_layout.scss
@@ -127,16 +127,17 @@ body.sidebar-footer {
@media only screen and (min-width: 750px) {
aside.sidebar { @include collapse-sidebar; }
}
+#main, #content, .sidebar {
+ @extend .group;
+}
@media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; }
body > header { font-size: $header-font-size * 1.2; }
#main {
- @extend .group;
padding: 0;
margin: 0 auto;
}
#content {
- @extend .group;
overflow: visible;
margin-right: $sidebar-width-medium;
position: relative;
@@ -149,7 +150,6 @@ body.sidebar-footer {
}
}
aside.sidebar {
- @extend .group;
width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
background: none;
@@ -180,7 +180,6 @@ body.sidebar-footer {
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & {
padding: { left: $pad-wide; right: $pad-wide; }
- @extend .group;
}
}
}
@@ -190,3 +189,4 @@ body.sidebar-footer {
ul, ol { margin-left: 0; }
}
}
+
View
5 .themes/classic/sass/partials/_navigation.scss
@@ -13,7 +13,7 @@ body > nav {
.search {
padding: .3em .5em 0;
font-size: .85em;
- @extend .sans;
+ font-family: $sans;
line-height: 1.1em;
width: 95%;
@include border-radius(.5em);
@@ -54,7 +54,7 @@ body > nav {
}
a {
@include link-colors($nav-color, $nav-color-hover, $visited: $nav-color);
- @extend .sans;
+ font-family: $sans;
text-shadow: lighten($nav-bg, 12) 0 1px;
float: left;
text-decoration: none;
@@ -134,3 +134,4 @@ body > nav {
a[rel=subscribe-rss]{ @include mask-subscription-nav('rss.png'); }
a[rel=subscribe-email]{ @include mask-subscription-nav('email.png'); }
}
+
View
2 .themes/classic/source/_includes/article.html
@@ -8,7 +8,7 @@ <h1 class="entry-title">{% if site.titlecase %}{{ page.title | titlecase }}{% el
{% unless page.meta == false %}
<p class="meta">
{% include post/date.html %}{{ time }}
- {% if site.disqus_short_name and page.comments != false and site.disqus_show_comment_count == true %}
+ {% if site.disqus_short_name and page.comments != false and post.comments != false and site.disqus_show_comment_count == true %}
| <a href="{% if index %}{{ root_url }}{{ post.url }}{% endif %}#disqus_thread">Comments</a>
{% endif %}
</p>
View
26 Gemfile
@@ -1,19 +1,19 @@
source "http://rubygems.org"
group :development do
- gem 'rake'
- gem 'rack'
- gem 'jekyll'
- gem 'rdiscount'
- gem 'pygments.rb'
- gem 'RedCloth'
- gem 'haml', '>= 3.1'
- gem 'compass', '>= 0.11'
- gem 'rubypants'
- gem 'rb-fsevent'
- gem 'stringex'
- gem 'liquid', '2.2.2'
+ gem 'rake', '~> 0.9.2'
+ gem 'rack', '~> 1.4.1'
+ gem 'jekyll', '~> 0.11.2'
+ gem 'rdiscount', '~> 1.6.8'
+ gem 'pygments.rb', '~> 0.2.12'
+ gem 'RedCloth', '~> 4.2.9'
+ gem 'haml', '~> 3.1.6'
+ gem 'compass', '~> 0.12.1'
+ gem 'rubypants', '~> 0.2.0'
+ gem 'rb-fsevent', '~> 0.9'
+ gem 'stringex', '~> 1.4.0'
+ gem 'liquid', '~> 2.3.0'
gem 'html5-boilerplate', '< 2.0'
end
-gem 'sinatra', '1.2.6'
+gem 'sinatra', '~> 1.3.2'
View
63 Gemfile.lock
@@ -14,38 +14,41 @@ GEM
sass (~> 3.1)
directory_watcher (1.4.1)
fast-stemmer (1.0.1)
- ffi (1.1.0.rc3)
+ ffi (1.0.11)
fssm (0.2.9)
- haml (3.1.4)
+ haml (3.1.6)
html5-boilerplate (1.0.0)
compass (>= 0.11.1)
- jekyll (0.11.0)
- albino (>= 1.3.2)
- classifier (>= 1.3.1)
- directory_watcher (>= 1.1.1)
- kramdown (>= 0.13.2)
- liquid (>= 1.9.0)
- maruku (>= 0.5.9)
- kramdown (0.13.5)
- liquid (2.2.2)
+ jekyll (0.11.2)
+ albino (~> 1.3)
+ classifier (~> 1.3)
+ directory_watcher (~> 1.1)
+ kramdown (~> 0.13)
+ liquid (~> 2.3)
+ maruku (~> 0.5)
+ kramdown (0.13.6)
+ liquid (2.3.0)
maruku (0.6.0)
syntax (>= 1.0.0)
posix-spawn (0.3.6)
pygments.rb (0.2.12)
rubypython (~> 0.5.3)
rack (1.4.1)
+ rack-protection (1.2.0)
+ rack
rake (0.9.2.2)
rb-fsevent (0.9.1)
rdiscount (1.6.8)
rubypants (0.2.0)
- rubypython (0.6.0)
+ rubypython (0.5.3)
blankslate (>= 2.1.2.3)
ffi (~> 1.0.7)
- sass (3.1.16)
- sinatra (1.2.6)
- rack (~> 1.1)
- tilt (>= 1.2.2, < 2.0)
- stringex (1.3.2)
+ sass (3.1.18)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
+ stringex (1.4.0)
syntax (1.0.0)
tilt (1.3.3)
@@ -53,17 +56,17 @@ PLATFORMS
x86-mingw32
DEPENDENCIES
- RedCloth
- compass (>= 0.11)
- haml (>= 3.1)
+ RedCloth (~> 4.2.9)
+ compass (~> 0.12.1)
+ haml (~> 3.1.6)
html5-boilerplate (< 2.0)
- jekyll
- liquid (= 2.2.2)
- pygments.rb
- rack
- rake
- rb-fsevent
- rdiscount
- rubypants
- sinatra (= 1.2.6)
- stringex
+ jekyll (~> 0.11.2)
+ liquid (~> 2.3.0)
+ pygments.rb (~> 0.2.12)
+ rack (~> 1.4.1)
+ rake (~> 0.9.2)
+ rb-fsevent (~> 0.9)
+ rdiscount (~> 1.6.8)
+ rubypants (~> 0.2.0)
+ sinatra (~> 1.3.2)
+ stringex (~> 1.4.0)
View
2 README.markdown
@@ -16,7 +16,7 @@ Check out [Octopress.org](http://octopress.org/docs) for guides and documentatio
## Contributing
-We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plug-ins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases.
+We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases.
## License
View
4 plugins/blockquote.rb
@@ -46,7 +46,7 @@ def initialize(tag_name, markup, tokens)
end
def render(context)
- quote = paragraphize(super.map(&:strip).join)
+ quote = paragraphize(super)
author = "<strong>#{@by.strip}</strong>" if @by
if @source
url = @source.match(/https?:\/\/(.+)/)[1].split('/')
@@ -75,7 +75,7 @@ def render(context)
end
def paragraphize(input)
- "<p>#{input.gsub(/\n\n/, '</p><p>').gsub(/\n/, '<br/>')}</p>"
+ "<p>#{input.lstrip.rstrip.gsub(/\n\n/, '</p><p>').gsub(/\n/, '<br/>')}</p>"
end
end
end
View
2 plugins/code_block.rb
@@ -79,7 +79,7 @@ def initialize(tag_name, markup, tokens)
def render(context)
output = super
- code = super.join
+ code = super
source = "<figure class='code'>"
source += @caption if @caption
if @filetype
View
8 plugins/octopress_filters.rb
@@ -24,10 +24,14 @@ module Jekyll
class ContentFilters < PostFilter
include OctopressFilters
def pre_render(post)
- post.content = pre_filter(post.content)
+ if post.ext.match('html|textile|markdown|haml|slim|xml')
+ post.content = pre_filter(post.content)
+ end
end
def post_render(post)
- post.content = post_filter(post.content)
+ if post.ext.match('html|textile|markdown|haml|slim|xml')
+ post.content = post_filter(post.content)
+ end
end
end
end
View
6 plugins/pullquote.rb
@@ -32,11 +32,9 @@ def initialize(tag_name, markup, tokens)
def render(context)
output = super
- if output.join =~ /\{"\s*(.+)\s*"\}/
- #@quote = $1
+ if output =~ /\{"\s*(.+?)\s*"\}/m
@quote = RubyPants.new($1).to_html
- #@quote = CGI.escape($1)
- "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
+ "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.gsub(/\{"\s*|\s*"\}/, '')}</span>"
else
return "Surround your pullquote like this {\" text to be quoted \"}"
end

0 comments on commit 345b655

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