From ce6604a15e61c1bf931b2d094c5cf30804414fa6 Mon Sep 17 00:00:00 2001
From: strand <jet.strand@gmail.com>
Date: Tue, 11 Oct 2011 16:09:38 -0700
Subject: Edited .themes/classic/sass/base/_typography.scss via GitHub

---
 .themes/classic/sass/base/_typography.scss | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to '.themes/classic/sass')

diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index ef83065b..d4b59ad0 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -115,7 +115,7 @@ blockquote {
   }
 }
 
-.has-pullquote:before {
+.has-pullquote:before, .has-pullquoteleft:before {
   /* Reset metrics. */
   padding: 0;
   border: none;
@@ -134,6 +134,15 @@ blockquote {
   font-size: 1.4em;
   line-height: 1.45em;
 }
+
+.has-pullquoteleft: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;
-- 
cgit v1.2.1


From 490b2593ec8e912b042f49966a80c37f0026e0d9 Mon Sep 17 00:00:00 2001
From: B Strand <jet.strand@gmail.com>
Date: Wed, 12 Oct 2011 11:17:24 -0700
Subject: Renamed has-pullquote and has-pullquoteleft classes to
 pullquote-right and pullquote-left (I suppose a less stylistic naming
 convention might pullquote-default and pullquote-alternate.)

---
 .themes/classic/sass/base/_typography.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.themes/classic/sass')

diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index d4b59ad0..f248c2e4 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -115,7 +115,7 @@ blockquote {
   }
 }
 
-.has-pullquote:before, .has-pullquoteleft:before {
+.pullquote-right:before, .pullquote-left:before {
   /* Reset metrics. */
   padding: 0;
   border: none;
@@ -135,7 +135,7 @@ blockquote {
   line-height: 1.45em;
 }
 
-.has-pullquoteleft:before {
+.pullquote-left:before {
 
   /* Make left pullquotes align properly. */
   float: left;
-- 
cgit v1.2.1


From 5b0486ced124c08ca017b20f584764bab4c5ff0e Mon Sep 17 00:00:00 2001
From: B Strand <jet.strand@gmail.com>
Date: Wed, 12 Oct 2011 13:28:58 -0700
Subject: Separated citation style from the general blockquote style. The
 general blockquote style is great for nesting and indentation, while the
 citation is excellent for quote attribution.

---
 .themes/classic/sass/base/_typography.scss | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to '.themes/classic/sass')

diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index f248c2e4..ec99288c 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -96,13 +96,17 @@ small { font-size: .8em; }
 
 big { font-size: 1.2em; }
 
-blockquote {
+blockquote { 
   $bq-margin: 1.2em;
+  padding-left: 1em;  
+}
+
+blockquote.citation {
+
   font-style: italic;
   position: relative;
   font-size: 1.2em;
-  line-height: 1.5em;
-  padding-left: 1em;
+  line-height: 1.5em; 
   border-left: 4px solid rgba($text-color-light, .5);
   cite {
     font-style: italic;
-- 
cgit v1.2.1


From 2e7bc43cf7d3d0b11381ad131baae870f64f2d71 Mon Sep 17 00:00:00 2001
From: B Strand <jet.strand@gmail.com>
Date: Thu, 13 Oct 2011 11:32:58 -0700
Subject: Reverted previous commit.

---
 .themes/classic/sass/base/_typography.scss | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to '.themes/classic/sass')

diff --git a/.themes/classic/sass/base/_typography.scss b/.themes/classic/sass/base/_typography.scss
index ec99288c..f248c2e4 100644
--- a/.themes/classic/sass/base/_typography.scss
+++ b/.themes/classic/sass/base/_typography.scss
@@ -96,17 +96,13 @@ small { font-size: .8em; }
 
 big { font-size: 1.2em; }
 
-blockquote { 
+blockquote {
   $bq-margin: 1.2em;
-  padding-left: 1em;  
-}
-
-blockquote.citation {
-
   font-style: italic;
   position: relative;
   font-size: 1.2em;
-  line-height: 1.5em; 
+  line-height: 1.5em;
+  padding-left: 1em;
   border-left: 4px solid rgba($text-color-light, .5);
   cite {
     font-style: italic;
-- 
cgit v1.2.1