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

2 files changed, 16 insertions, 4 deletions

diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index ef83065b..f248c2e4 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -115,7 +115,7 @@ blockquote {
   }
 }
 
-.has-pullquote:before {
+.pullquote-right:before, .pullquote-left:before {
   /* Reset metrics. */
   padding: 0;
   border: none;
@@ -134,6 +134,15 @@ blockquote {
   font-size: 1.4em;
   line-height: 1.45em;
 }
+
+.pullquote-left:before {
+
+  /* Make left pullquotes align properly. */
+  float: left;
+  margin: .5em 1.5em 1em 0;
+
+}
+
 /* @extend this to force long lines of continuous text to wrap */
 .force-wrap {
   white-space: -moz-pre-wrap;
diff --git a/plugins/pullquote.rb b/plugins/pullquote.rb
index 03e307a7..5dd6a553 100644
--- a/plugins/pullquote.rb
+++ b/plugins/pullquote.rb
@@ -1,10 +1,10 @@
 #
 # Author: Brandon Mathis
-# Based on the sematic pullquote technique by Maykel Loomans at http://miekd.com/articles/pull-quotes-with-html5-and-css/
+# Based on the semantic pullquote technique by Maykel Loomans at http://miekd.com/articles/pull-quotes-with-html5-and-css/
 #
 # Outputs a span with a data-pullquote attribute set from the marked pullquote. Example:
 #
-#   {% pullquote %}
+#   {% pullquote %} 
 #     When writing longform posts, I find it helpful to include pullquotes, which help those scanning a post discern whether or not a post is helpful.
 #     It is important to note, {" pullquotes are merely visual in presentation and should not appear twice in the text. "} That is why it is prefered
 #     to use a CSS only technique for styling pullquotes.
@@ -17,11 +17,14 @@
 #     </span>
 #   </p>
 #
+#  Strand's modification adds the ability to call this plugin with {% pullquote left %} which duplicates the current behavior of the pullquote plugin, with a left float and appropriate margins.
+#  Note: this version of the plugin now creates pullquotes with the class of pullquote-right by default
 
 module Jekyll
 
   class PullquoteTag < Liquid::Block
     def initialize(tag_name, markup, tokens)
+      markup =~ /left/i ? @align = "left" : @align = "right"
       super
     end
 
@@ -29,7 +32,7 @@ module Jekyll
       output = super
       if output.join =~ /\{"\s*(.+)\s*"\}/
         @quote = $1
-        "<span class='has-pullquote' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>"
+         "<span class='pullquote-#{@align}' data-pullquote='#{@quote}'>#{output.join.gsub(/\{"\s*|\s*"\}/, '')}</span>" # TODO Determine how to makethis span have a left or right flag.
       else
         return "Surround your pullquote like this {\" text to be quoted \"}"
       end