From e14a2193113fe60bcc70cccd518639ae12b4a09d Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Thu, 29 May 2014 15:57:39 +0200
Subject: [PATCH 1/9] Script uses bash specific 'let'. Always run under bash.

---
 build-default-stylesheet.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-default-stylesheet.sh b/build-default-stylesheet.sh
index 4193a18..fb9e2af 100755
--- a/build-default-stylesheet.sh
+++ b/build-default-stylesheet.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 compass compile -s compact
 LINES=`wc -l stylesheets/asciidoctor.css | cut -d" " -f1`

From 10607f7b64b99fbf55e12d49c3c7b171d2cffc6a Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Thu, 29 May 2014 17:53:31 +0200
Subject: [PATCH 2/9] Asciidoctor-compact theme

---
 sass/asciidoctor-compact.scss           | 43 ++++++++++++++
 sass/settings/_asciidoctor-compact.scss | 74 +++++++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 sass/asciidoctor-compact.scss
 create mode 100644 sass/settings/_asciidoctor-compact.scss

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
new file mode 100644
index 0000000..c01e9ec
--- /dev/null
+++ b/sass/asciidoctor-compact.scss
@@ -0,0 +1,43 @@
+@import "settings/asciidoctor-compact";
+@import "components/asciidoc";
+@import "components/awesome-icons";
+
+.admonitionblock > table {
+  border: 0;
+  background: none;
+  width: 100%;
+  td.icon {
+    text-align: center;
+    width: 40px;
+    img {
+      max-width: none;
+    }
+    .title {
+      font-weight: bold;
+      text-transform: uppercase;
+    }
+  }
+
+  td.content {
+    padding-left: emCalc(14px);
+    padding-right: emCalc(16px);
+    border-left: $hr-border-width $hr-border-style $hr-border-color;
+    color: $blockquote-font-color;
+
+    //& > .paragraph:last-child > p {
+    & > :last-child > :last-child {
+      margin-bottom: 0;
+    }
+  }
+}
+
+#toc.toc2 {
+  background: $body-bg;
+}
+
+.literalblock,
+.listingblock {
+  & > .content > pre {
+    @include border-radius(0);
+  }
+}
diff --git a/sass/settings/_asciidoctor-compact.scss b/sass/settings/_asciidoctor-compact.scss
new file mode 100644
index 0000000..b8d5d25
--- /dev/null
+++ b/sass/settings/_asciidoctor-compact.scss
@@ -0,0 +1,74 @@
+$base-font-size: 12px;
+
+@import "defaults";
+
+// Body
+
+$em-base: $base-font-size;
+$body-bg: white;
+$primary-color: #005498;
+$alert-color: lighten(#6d180b, 15%);
+$global-radius: 4px;
+
+// Headings
+
+$header-font-family: Georgia, "URW Bookman L", Helvetica, Arial, sans-serif;
+$header-font-weight: normal;
+$header-font-color: #BA3925;
+$header-top-margin: 0.8em;
+$title-font-weight: $header-font-weight;
+$subheader-font-color: darken($header-font-color, 15%);
+$sect-divider-size: 3px;
+$sect-divider-style: double;
+$sect-divider-color: #ebebeb;
+$sidebar-header-border-size: 0 0 1px 0 !default;
+
+$h1-font-size: emCalc(32px);
+$h2-font-size: emCalc(28px);
+$h3-font-size: emCalc(24px);
+$h4-font-size: emCalc(20px);
+$h5-font-size: emCalc(16px);
+$h6-font-size: 1em;
+
+// Paragraphs
+
+// Inline Code
+
+$code-font-weight: normal;
+$code-font-size: emCalc($em-base - 1);
+$code-bg-color: darken(#fff, 5%);
+$code-border-color: darken(#fff, 20%);
+$code-border-size: 1px;
+$code-padding: 1px 3px 0;
+
+// Code Blocks
+// *Recommended highlight.js themes: magula, default, docco
+
+$pre-border-size: 1px 0;
+$pre-border-style: dotted;
+$pre-border-color: #bfbfbf;
+$pre-line-height: 1.4;
+
+// Links
+
+$anchor-text-decoration: underline;
+
+// Lists
+
+$list-side-margin: emCalc(20px);
+$definition-list-header-margin-bottom: emCalc(5px);
+$definition-list-margin-bottom: emCalc(12px);
+
+// Blockquotes
+
+$blockquote-font-color: lighten($body-font-color, 30%);
+$blockquote-cite-font-size: inherit;
+$blockquote-cite-font-color: darken($blockquote-font-color, 10%);
+
+// Tables
+
+$table-head-font-size: inherit;
+$table-row-font-size: inherit;
+$table-line-height: 1;
+$table-border-highlight-color: #468847 !default;
+$table-border-highlight-size: 3px !default;

From 9b387e376c581c51a527b642e676fb4a5d7e3c29 Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Fri, 30 May 2014 17:04:56 +0200
Subject: [PATCH 3/9] smaller paragraph and panel bottom margins

---
 sass/settings/_asciidoctor-compact.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sass/settings/_asciidoctor-compact.scss b/sass/settings/_asciidoctor-compact.scss
index b8d5d25..f372f1a 100644
--- a/sass/settings/_asciidoctor-compact.scss
+++ b/sass/settings/_asciidoctor-compact.scss
@@ -32,6 +32,9 @@ $h6-font-size: 1em;
 
 // Paragraphs
 
+$panel-margin-bottom: emCalc(16px);
+$paragraph-margin-bottom: emCalc(16px);
+
 // Inline Code
 
 $code-font-weight: normal;

From be69237a37c3a3481a9e2df22e18944ee564e343 Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Mon, 28 Jul 2014 21:28:19 +0200
Subject: [PATCH 4/9] Font size and line height of preamble and lead paragraphs
 decreased.

---
 sass/asciidoctor-compact.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
index c01e9ec..3b22554 100644
--- a/sass/asciidoctor-compact.scss
+++ b/sass/asciidoctor-compact.scss
@@ -2,6 +2,12 @@
 @import "components/asciidoc";
 @import "components/awesome-icons";
 
+.paragraph.lead > p,
+#preamble > .sectionbody > .paragraph:first-of-type p {
+  font-size: $paragraph-font-size + emCalc(2.5);
+  line-height: 1.5;
+}
+
 .admonitionblock > table {
   border: 0;
   background: none;

From 53197c9d84163c24dd82dcec455ee470f70ec427 Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Mon, 28 Jul 2014 21:37:26 +0200
Subject: [PATCH 5/9] Fix line height of paragraphs in admonition blocks.

---
 sass/asciidoctor-compact.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
index 3b22554..c96a0f7 100644
--- a/sass/asciidoctor-compact.scss
+++ b/sass/asciidoctor-compact.scss
@@ -29,7 +29,7 @@
     padding-right: emCalc(16px);
     border-left: $hr-border-width $hr-border-style $hr-border-color;
     color: $blockquote-font-color;
-
+    line-height: 1.4;
     //& > .paragraph:last-child > p {
     & > :last-child > :last-child {
       margin-bottom: 0;

From 577124a143c4a0f38a6986d7464084465387352d Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Mon, 28 Jul 2014 21:40:58 +0200
Subject: [PATCH 6/9] Minor formatting.

---
 sass/settings/_asciidoctor-compact.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sass/settings/_asciidoctor-compact.scss b/sass/settings/_asciidoctor-compact.scss
index f372f1a..74f4e91 100644
--- a/sass/settings/_asciidoctor-compact.scss
+++ b/sass/settings/_asciidoctor-compact.scss
@@ -75,3 +75,5 @@ $table-row-font-size: inherit;
 $table-line-height: 1;
 $table-border-highlight-color: #468847 !default;
 $table-border-highlight-size: 3px !default;
+
+

From 699962a355948789b98460851da2f8a356f1ed89 Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Sun, 3 Aug 2014 15:13:58 +0200
Subject: [PATCH 7/9] import components/print

---
 sass/asciidoctor-compact.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
index c96a0f7..e3a74cf 100644
--- a/sass/asciidoctor-compact.scss
+++ b/sass/asciidoctor-compact.scss
@@ -47,3 +47,5 @@
     @include border-radius(0);
   }
 }
+
+@import "components/print";

From 38f27da905ed8eea69149155337690c7d357c2de Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Wed, 13 Aug 2014 20:16:41 +0200
Subject: [PATCH 8/9] integrated changes from upstream

---
 sass/asciidoctor-compact.scss           |  61 +++++++++++---
 sass/settings/_asciidoctor-compact.scss | 104 ++++++++++++++++++------
 2 files changed, 128 insertions(+), 37 deletions(-)

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
index e3a74cf..6cd5eaa 100644
--- a/sass/asciidoctor-compact.scss
+++ b/sass/asciidoctor-compact.scss
@@ -2,6 +2,46 @@
 @import "components/asciidoc";
 @import "components/awesome-icons";
 
+h1, h2 {
+  letter-spacing: -0.01em;
+}
+
+dt, th.tableblock, td.content {
+  text-rendering: optimizeLegibility; // already set for p
+}
+
+p, td.content {
+  letter-spacing: -0.01em;
+  // TODO needs to apply anywhere we have bold prose
+  strong {
+    letter-spacing: -0.005em;
+  }
+}
+
+// NOTE include blockquote for when it doesn't have a nested p
+p, blockquote, dt, td.content {
+  font-size: 1.0625rem;
+}
+p {
+  margin-bottom: 1.25rem;
+}
+
+// restore font size in sidebar block and regular table cells
+.sidebarblock p, .sidebarblock dt, .sidebarblock td.content, p.tableblock {
+  font-size: 1em;
+}
+
+.exampleblock > .content {
+  // white
+  //background-color: #fff;
+  //border-color: $panel-border-color;
+  //@include single-box-shadow($panel-border-color, 0, 1px, 2px);
+  // light yellow
+  background-color: #fffef7; // from rgb(252,247,227), analogous to #f8f8f7
+  border-color: $panel-border-color;
+  @include single-box-shadow($panel-border-color, 0, 1px, 4px);
+}
+
 .paragraph.lead > p,
 #preamble > .sectionbody > .paragraph:first-of-type p {
   font-size: $paragraph-font-size + emCalc(2.5);
@@ -9,27 +49,33 @@
 }
 
 .admonitionblock > table {
+  border-collapse: separate;
   border: 0;
   background: none;
   width: 100%;
   td.icon {
     text-align: center;
+    // FIXME use ems!
     width: 40px;
     img {
       max-width: none;
     }
     .title {
+      //font-weight: $header-font-weight;
       font-weight: bold;
+      font-family: $header-font-family;
       text-transform: uppercase;
     }
   }
-
   td.content {
     padding-left: emCalc(14px);
     padding-right: emCalc(16px);
     border-left: $hr-border-width $hr-border-style $hr-border-color;
-    color: $blockquote-font-color;
+    // FIXME use $aside-font-color
+    color: $blockquote-cite-font-color;
     line-height: 1.4;
+    // QUESTION use opacity instead of blockquote-cite-font-color?
+    //opacity: 0.75;
     //& > .paragraph:last-child > p {
     & > :last-child > :last-child {
       margin-bottom: 0;
@@ -37,15 +83,4 @@
   }
 }
 
-#toc.toc2 {
-  background: $body-bg;
-}
-
-.literalblock,
-.listingblock {
-  & > .content > pre {
-    @include border-radius(0);
-  }
-}
-
 @import "components/print";
diff --git a/sass/settings/_asciidoctor-compact.scss b/sass/settings/_asciidoctor-compact.scss
index 74f4e91..eb9b190 100644
--- a/sass/settings/_asciidoctor-compact.scss
+++ b/sass/settings/_asciidoctor-compact.scss
@@ -1,27 +1,66 @@
+// Color Palette
+
+// rgba(0,0,0,.9) - deep black
+// rgba(0,0,0,.85) - black
+// rgba(0,0,0,.8) - print black
+// rgba(0,0,0,.75) - light black
+// rgba(0,0,0,.6) - muted black
+// #ba3925 - orange
+// #7a2518 - dark orange
+// #3a120c - maroon
+// #2561ba - blue
+// #f8f8f7 - warm beige
+// #f7f7f8 - cool beige
+// #f7f8f7 - tinted beige
+// #ddddd8 - light gray
+// #d8d8d8 - lighter gray
+// #efefed - very light gray
+
+// Body (IMPORTANT $body-* variables must be defined above the defaults import)
+
+$body-bg: white;
+$body-font-color: rgba(0,0,0,0.8);
+$body-font-family: "Noto Serif", "DejaVu Serif", serif;
+
+
 $base-font-size: 12px;
 
 @import "defaults";
 
-// Body
 
 $em-base: $base-font-size;
-$body-bg: white;
-$primary-color: #005498;
-$alert-color: lighten(#6d180b, 15%);
+
+// Default Overrides
+
+$primary-color: darken(#2561ba, 5%);
+$alert-color: lighten(#3a120c, 15%); // $code-color is 15% darker than $alert-color, so we lighten here by 15%
 $global-radius: 4px;
+$panel-bg: #f8f8f7;
+$panel-font-color: rgba(0,0,0,0.75);
 
 // Headings
 
-$header-font-family: Georgia, "URW Bookman L", Helvetica, Arial, sans-serif;
-$header-font-weight: normal;
-$header-font-color: #BA3925;
-$header-top-margin: 0.8em;
+$header-font-family: "Open Sans", "DejaVu Sans", sans-serif;
+$header-font-weight: 300;
+$header-font-color: #ba3925;
+$header-line-height: 1.2;
+$header-top-margin: 1em;
+$header-word-spacing: -0.05em;
+$title-font-color: rgba(0,0,0,0.85);
 $title-font-weight: $header-font-weight;
-$subheader-font-color: darken($header-font-color, 15%);
-$sect-divider-size: 3px;
-$sect-divider-style: double;
-$sect-divider-color: #ebebeb;
-$sidebar-header-border-size: 0 0 1px 0 !default;
+$subheader-font-family: $body-font-family;
+$subheader-font-size: 1rem;
+$subheader-font-color: darken($header-font-color, 15%); // resolves to #7a2518
+$subheader-font-weight: normal;
+$subheader-font-style: italic;
+$subheader-line-height: 1.45;
+$subheader-top-margin: 0;
+$subheader-bottom-margin: 0.25em;
+$sidebar-header-align: center;
+$sect-divider-size: 1px;
+$sect-divider-style: solid;
+$sect-divider-color: #efefed;
+$hr-border-color: #ddddd8;
 
 $h1-font-size: emCalc(32px);
 $h2-font-size: emCalc(28px);
@@ -31,9 +70,23 @@ $h5-font-size: emCalc(16px);
 $h6-font-size: 1em;
 
 // Paragraphs
+// FIXME doesn't support rem math
+//$paragraph-font-size: 1.0625rem; // result of emCalc(17px) converted to rem (18px is 1.125em)
 
-$panel-margin-bottom: emCalc(16px);
-$paragraph-margin-bottom: emCalc(16px);
+// Inline Code
+
+$code-font-family: "Droid Sans Mono", "DejaVu Sans Mono", "Monospace", monospace;
+// NOTE will need to adjust code-font-size if we bump p font-size to 1.125em
+//$code-font-size: 0.95em;
+$code-font-size: emCalc($em-base -1);
+$code-font-weight: normal;
+// FIXME don't forget about code in a table cell
+$code-line-height: 1.4;
+$code-color: rgba(0,0,0,0.9);
+$code-bg-color: #f7f7f8;
+$code-padding: 0.1em 0.5ex;
+$code-word-spacing: -0.15em;
+$code-text-rendering: optimizeSpeed;
 
 // Inline Code
 
@@ -47,9 +100,11 @@ $code-padding: 1px 3px 0;
 // Code Blocks
 // *Recommended highlight.js themes: magula, default, docco
 
-$pre-border-size: 1px 0;
-$pre-border-style: dotted;
-$pre-border-color: #bfbfbf;
+$pre-font-family: "Droid Sans Mono", "DejaVu Sans Mono", "Monospace", monospace;
+$pre-font-color: rgba(0,0,0,0.9);
+$pre-border-size: null;
+$pre-bg: #f7f7f8;
+$pre-padding: emCalc(16px);
 $pre-line-height: 1.4;
 
 // Links
@@ -64,16 +119,17 @@ $definition-list-margin-bottom: emCalc(12px);
 
 // Blockquotes
 
-$blockquote-font-color: lighten($body-font-color, 30%);
-$blockquote-cite-font-size: inherit;
-$blockquote-cite-font-color: darken($blockquote-font-color, 10%);
+$blockquote-font-color: $title-font-color;
+$blockquote-cite-font-color: rgba(0,0,0,0.6);
+$blockquote-cite-font-size: emCalc(13px);
 
 // Tables
 
 $table-head-font-size: inherit;
 $table-row-font-size: inherit;
-$table-line-height: 1;
-$table-border-highlight-color: #468847 !default;
-$table-border-highlight-size: 3px !default;
+$table-line-height: 1.6;
+$table-head-bg: #f7f8f7;
+$table-even-row-bg: #f8f8f7;
+$table-border-color: #dedede;
 
 

From c3c52481c53a217337d6b5609c9bba55f5211db3 Mon Sep 17 00:00:00 2001
From: Thomas Kern <kern99@web.de>
Date: Wed, 13 Aug 2014 21:43:07 +0200
Subject: [PATCH 9/9] adjustment to font size of literal and listing blocks

---
 sass/asciidoctor-compact.scss | 45 +++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/sass/asciidoctor-compact.scss b/sass/asciidoctor-compact.scss
index 6cd5eaa..3ba37b1 100644
--- a/sass/asciidoctor-compact.scss
+++ b/sass/asciidoctor-compact.scss
@@ -83,4 +83,49 @@ p {
   }
 }
 
+.literalblock,
+.listingblock {
+  // use pre[class] so we win over pre.<name> styles
+  pre, pre[class] {
+    @if $pre-border-size {
+      border: $pre-border-size $pre-border-style $pre-border-color;
+    }
+    // FIXME make border radius on listing blocks configurable!
+    @include radius;
+    word-wrap: break-word;
+
+    &.nowrap {
+      overflow-x: auto;
+      white-space: pre;
+      word-wrap: normal;
+    }
+
+    // screens below breakpoint
+    padding: $pre-padding;
+    font-size: $em-base;
+
+    @media #{$small} {
+      font-size: emCalc($em-base + 1);
+    }
+
+    @media #{$medium} {
+      font-size: emCalc($em-base + 2);
+    }
+  }
+}
+
+.listingblock code[data-lang]:before {
+  display: none;
+  content: attr(data-lang);
+  position: absolute;
+  font-size: $em-base - 1;
+  //top: 0.5rem; // 0.67em
+  top: 0.425rem;
+  right: 0.5rem; // 0.67em
+  line-height: 1;
+  text-transform: uppercase;
+  color: #999;
+}
+
+
 @import "components/print";