buckram 1.7.3 → 1.8.2

package/assets/styles/components/elements/_miscellaneous.scss

@@ -2,9 +2,9 @@
 /// @group elements
 ////
 
-//============================================================================//
+// ============================================================================//
 //                               Miscellaneous                                //
-//============================================================================//
+// ============================================================================//
 @import "../utilities";
 
 @if $type != 'web' {
@@ -29,6 +29,7 @@
     @if $type == 'prince' {
       line-height: if-map-get($code-line-height, $type);
     }
+
     margin: if-map-get($code-margin-top, $type) if-map-get($code-margin-right, $type) if-map-get($code-margin-bottom, $type) if-map-get($code-margin-left, $type);
     padding: if-map-get($code-padding-top, $type) if-map-get($code-padding-right, $type) if-map-get($code-padding-bottom, $type) if-map-get($code-padding-left, $type);
   }
@@ -42,6 +43,7 @@
     @if $type == 'prince' {
       line-height: if-map-get($pre-line-height, $type);
     }
+
     margin: if-map-get($pre-margin-top, $type) if-map-get($pre-margin-right, $type) if-map-get($pre-margin-bottom, $type) if-map-get($pre-margin-left, $type);
     padding: if-map-get($pre-padding-top, $type) if-map-get($pre-padding-right, $type) if-map-get($pre-padding-bottom, $type) if-map-get($pre-padding-left, $type);
 }
@@ -53,6 +55,7 @@
     @if $type == 'prince' {
       line-height: if-map-get($sub-line-height, $type);
     }
+
     text-transform: $sub-text-transform;
   }
 
@@ -62,11 +65,10 @@
     @if $type == 'prince' {
       line-height: if-map-get($sup-line-height, $type);
     }
+
     text-transform: $sup-text-transform;
   }
-}
-
-@else {
+} @else {
   .front-matter,
   .part,
   .chapter,

package/assets/styles/components/elements/_paragraphs.scss

@@ -2,9 +2,9 @@
 /// @group elements
 ////
 
-//============================================================================//
+// ============================================================================//
 //                                 Paragraphs                                 //
-//============================================================================//
+// ============================================================================//
 
 @import '../utilities';
 
@@ -62,7 +62,8 @@
   .pullquote--outside + p,
   .pullquote-inside + p,
   .pullquote--inside + p,
-  .sidebar + p {
+  .sidebar + p,
+  .textbox--sidebar + p {
     margin-top: $para-margin-top;
     text-indent: $para-indent;
   }
@@ -199,23 +200,6 @@
       hyphens: none;
     }
 
-    // When paragraphs follow a floated element, make sure indents work as expected.
-    // NOTE: this should only happen when paragraph separators = indent.
-
-    .wp-caption.alignleft + p,
-    .wp-nocaption.alignleft + p,
-    .wp-caption.alignright + p,
-    .wp-nocaption.alignright + p,
-    .float-top + p,
-    .float-bottom + p,
-    .pullquote + p,
-    .pullquote-right + p,
-    .pullquote-left + p,
-    .pullquote-outside + p,
-    .sidebar + p {
-      margin-top: $para-margin-top;
-      text-indent: $para-indent;
-    }
 
     // Hanging Indents
     .hanging-indent {

package/assets/styles/components/elements/_tables.scss

@@ -2,9 +2,9 @@
 /// @group elements
 ////
 
-//============================================================================//
+// ============================================================================//
 //                                  Tables                                    //
-//============================================================================//
+// ============================================================================//
 
 @import '../utilities';
 
@@ -24,12 +24,14 @@
     @if $type != 'prince' {
       overflow-x: scroll;
     }
+
     font-family: $table-font-family;
     font-size: $table-font-size;
     hyphens: $table-hyphens;
     @if $type == 'prince' {
       line-height: $table-line-height;
     }
+
     text-align: $table-align;
     border-collapse: collapse;
     border-top: $table-border-width solid if-map-get($line-color-1, $type);
@@ -48,6 +50,7 @@
         line-height: $table-caption-line-height;
       }
     }
+
     &.lines {
       border-color: if-map-get($line-color-1, $type);
     }
@@ -152,6 +155,7 @@
     @if $type == 'prince' {
       line-height: $table-th-line-height;
     }
+
     text-align: $table-th-align;
     vertical-align: $table-th-vertical-align;
     border-top: if-map-get($table-th-border-top-width, $type) if-map-get($table-th-border-top-style, $type) if-map-get($line-color-1, $type);
@@ -167,6 +171,7 @@
     @if $type == 'prince' {
       line-height: $table-td-line-height;
     }
+
     text-align: $table-td-align;
     vertical-align: $table-td-vertical-align;
   }
@@ -175,9 +180,7 @@
     border-top: if-map-get($table-tr-border-top-width, $type) if-map-get($table-tr-border-top-style, $type) if-map-get($line-color-1, $type);
     border-bottom: if-map-get($table-tr-border-bottom-width, $type) if-map-get($table-tr-border-bottom-style, $type) if-map-get($line-color-1, $type);
   }
-}
-
-@else {
+} @else {
   .front-matter,
   .part,
   .chapter,

package/assets/styles/components/media/_audio.scss

@@ -6,6 +6,6 @@
 
 .interactive-content--audio {
   .interactive-content__icon {
-    background-image: url(if-map-get($audio-icon-url, $type));
+    background-image: url('#{if-map-get($audio-icon-url, $type)}');
   }
 }

package/assets/styles/components/media/_images.scss

@@ -5,7 +5,7 @@
 @mixin caption-text-align($align) {
   figcaption,
   .wp-caption-text {
-    text-align: map-get($_image-caption-text-align, $align);
+    text-align: map-get($image-caption-text-align-map, $align);
   }
 }
 
@@ -146,15 +146,13 @@ p {
       width: 100% !important;
     }
 
-    &:after {
+    &::after {
       content: "";
       display: table;
       clear: both;
     }
   }
-}
-
-@else if $type == 'prince' {
+} @else if $type == 'prince' {
   figcaption,
   .wp-caption-text {
     font-family: $image-caption-font-family;
@@ -248,15 +246,13 @@ p {
       width: if-map-get($image-alignnone-caption-width, $type) !important;
     }
 
-    &:after {
+    &::after {
         content: "";
         display: table;
         clear: both;
     }
   }
-}
-
-@else if $type == 'web' {
+} @else if $type == 'web' {
   .front-matter,
   .part,
   .chapter,

package/assets/styles/components/media/_interactive-content.scss

@@ -9,6 +9,7 @@
   @if $type != 'epub' {
     line-height: if-map-get($interactive-content-line-height, $type);
   }
+
   margin-bottom: if-map-get($interactive-content-margin-bottom, $type);
   padding: if-map-get($interactive-content-padding-top, $type) if-map-get($interactive-content-padding-right, $type) if-map-get($interactive-content-padding-bottom, $type) if-map-get($interactive-content-padding-left, $type);
 
@@ -22,7 +23,7 @@
       if-map-get($interactive-icon-margin-right, $type)
       if-map-get($interactive-icon-margin-bottom, $type)
       if-map-get($interactive-icon-margin-left, $type);
-    background-image: url(if-map-get($interactive-icon-url, $type));
+    background-image: url('#{if-map-get($interactive-icon-url, $type)}');
     background-repeat: no-repeat;
     background-size: if-map-get($interactive-icon-background-size, $type);
   }

package/assets/styles/components/media/_video.scss

@@ -6,7 +6,7 @@
 
 .interactive-content--video {
   .interactive-content__icon {
-    background-image: url(if-map-get($video-icon-url, $type));
+    background-image: url('#{if-map-get($video-icon-url, $type)}');
   }
 }
 

package/assets/styles/components/pages/_back-matter.scss

@@ -46,6 +46,7 @@ div.index {
     @if $type != 'epub' {
       line-height: $section-license-line-height;
     }
+
     font-size: $section-license-font-size;
     font-style: $section-license-font-style;
     margin-top: $section-license-margin-top;

package/assets/styles/components/pages/_chapters.scss

@@ -14,6 +14,7 @@
     @if $type != 'epub' {
       line-height: $section-license-line-height;
     }
+
     font-size: $section-license-font-size;
     font-style: $section-license-font-style;
     margin-top: $section-license-margin-top;

package/assets/styles/components/pages/_front-matter.scss

@@ -17,6 +17,7 @@
   margin-top: if-map-get($copyright-margin-top, $type);
   margin-right: if-map-get($copyright-margin-right, $type);
   margin-left: if-map-get($copyright-margin-left, $type);
+
   .ugc {
     float: $copyright-float;
 
@@ -81,6 +82,7 @@ section.epigraph
     @if $type != 'epub' {
       line-height: $section-license-line-height;
     }
+
     font-size: $section-license-font-size;
     font-style: $section-license-font-style;
     margin-top: $section-license-margin-top;

package/assets/styles/components/pages/_titles.scss

@@ -48,7 +48,7 @@
     line-height: if-map-get($title-title-line-height, $type);
   }
 
-  @if ($title-title-decoration-content != "" or $title-title-decoration-display != none) {
+  @if  $title-title-decoration-content != "" or $title-title-decoration-display != none {
     &::after {
       font-family: $title-title-decoration-font-family;
       content: $title-title-decoration-content;
@@ -127,6 +127,7 @@ div.publisher-logo {
   @if $type != 'epub' {
     line-height: $title-publisher-line-height;
   }
+
   letter-spacing: $title-publisher-letter-spacing;
   word-spacing: $title-publisher-word-spacing;
   text-align: $title-publisher-align;
@@ -149,6 +150,7 @@ div.publisher-logo {
   @if $type != 'epub' {
     line-height: $title-publisher-city-line-height;
   }
+
   letter-spacing: $title-publisher-city-letter-spacing;
   word-spacing: $title-publisher-city-word-spacing;
   text-align: $title-publisher-city-align;

package/assets/styles/components/section-titles/_back-matter.scss

@@ -27,6 +27,7 @@
       @if $type != 'epub' {
         line-height: if-map-get($back-matter-title-line-height, $type);
       }
+
       text-align: $back-matter-title-align;
       text-transform: $back-matter-title-text-transform;
       border-bottom: if-map-get($back-matter-title-border-bottom-width, $type) $back-matter-title-border-bottom-style if-map-get($back-matter-title-border-bottom-color, $type);
@@ -34,7 +35,7 @@
       letter-spacing: if-map-get($back-matter-title-letter-spacing, $type);
       word-spacing: if-map-get($back-matter-title-word-spacing, $type);
 
-      @if ($back-matter-title-decoration-content != "" or $back-matter-title-decoration-display != none) {
+      @if  $back-matter-title-decoration-content != "" or $back-matter-title-decoration-display != none {
         &::after {
           font-family: $back-matter-title-decoration-font-family;
           content: $back-matter-title-decoration-content;
@@ -62,6 +63,7 @@
       @if $type != 'epub' {
         column-span: all;
       }
+
       letter-spacing: if-map-get($section-subtitle-letter-spacing, $type);
       word-spacing: if-map-get($section-subtitle-word-spacing, $type);
     }

package/assets/styles/components/section-titles/_chapters.scss

@@ -21,12 +21,13 @@
       @if $type != 'epub' {
         line-height: if-map-get($chapter-title-line-height, $type);
       }
+
       text-align: $chapter-title-align;
       text-transform: $chapter-title-text-transform;
       letter-spacing: if-map-get($chapter-title-letter-spacing, $type);
       word-spacing: if-map-get($chapter-title-word-spacing, $type);
 
-      @if ($chapter-title-decoration-content != "" or $chapter-title-decoration-display != none) {
+      @if  $chapter-title-decoration-content != "" or $chapter-title-decoration-display != none {
         &::after {
           font-family: $chapter-title-decoration-font-family;
           content: $chapter-title-decoration-content;
@@ -53,12 +54,13 @@
       @if $type != 'epub' {
         line-height: if-map-get($chapter-number-line-height, $type);
       }
+
       text-align: $chapter-number-align;
       text-transform: $chapter-number-text-transform;
       letter-spacing: if-map-get($chapter-number-letter-spacing, $type);
       word-spacing: if-map-get($chapter-number-word-spacing, $type);
 
-      &:before {
+      &::before {
         content: $chapter-number-before-content;
         text-transform: $chapter-number-before-content-text-transform;
       }
@@ -73,9 +75,11 @@
         @if $type != 'epub' {
           display: none;
         }
+
         &::after {
           content: '';
         }
+
         &::before {
           content: '';
         }
@@ -95,6 +99,7 @@
       @if $type != 'epub' {
         column-span: all;
       }
+
       letter-spacing: if-map-get($section-subtitle-letter-spacing, $type);
       word-spacing: if-map-get($section-subtitle-word-spacing, $type);
     }
@@ -156,6 +161,7 @@ blockquote.aphorism {
   @if $type != 'epub' {
     line-height: if-map-get($aphorism-line-height, $type);
   }
+
   text-align: $aphorism-align;
   text-indent: if-map-get($aphorism-indent, $type);
 

package/assets/styles/components/section-titles/_front-matter.scss

@@ -31,10 +31,11 @@
       @if $type != 'epub' {
         line-height: if-map-get($front-matter-title-line-height, $type);
       }
+
       text-align: $front-matter-title-align;
       text-transform: $front-matter-title-text-transform;
 
-      @if ($front-matter-title-decoration-content != "" or $front-matter-title-decoration-display != none) {
+      @if  $front-matter-title-decoration-content != "" or $front-matter-title-decoration-display != none {
         &::after {
           font-family: $front-matter-title-decoration-font-family;
           content: $front-matter-title-decoration-content;
@@ -62,6 +63,7 @@
       @if $type != 'epub' {
         column-span: all;
       }
+
       letter-spacing: if-map-get($section-subtitle-letter-spacing, $type);
       word-spacing: if-map-get($section-subtitle-word-spacing, $type);
     }
@@ -118,12 +120,13 @@
     @if $type != 'epub' {
       line-height: $toc-title-line-height;
     }
+
     text-align: $toc-title-align;
     text-transform: $toc-title-text-transform;
     letter-spacing: if-map-get($toc-title-letter-spacing, $type);
     word-spacing: if-map-get($toc-title-word-spacing, $type);
 
-    @if ($toc-title-decoration-content != "" or $toc-title-decoration-display != none) {
+    @if  $toc-title-decoration-content != "" or $toc-title-decoration-display != none {
       &::after {
         font-family: $toc-title-decoration-font-family;
         content: $toc-title-decoration-content;

package/assets/styles/components/section-titles/_generic.scss

@@ -41,7 +41,7 @@
           text-align: $part-number-align;
           text-transform: $part-number-text-transform;
 
-          &:before {
+          &::before {
             content: $part-number-before-content;
             text-transform: $part-number-before-content-text-transform;
           }
@@ -137,7 +137,7 @@
           text-align: $chapter-number-align;
           text-transform: $chapter-number-text-transform;
 
-          &:before {
+          &::before {
             content: $chapter-number-before-content;
             text-transform: $chapter-number-before-content-text-transform;
           }
@@ -147,6 +147,7 @@
           }
         }
       }
+
       .numberless & {
         h1 span {
           display: none;

package/assets/styles/components/section-titles/_parts.scss

@@ -45,6 +45,7 @@
       @if $type != 'epub' {
         line-height: if-map-get($part-title-line-height, $type);
       }
+
       text-align: if-map-get($part-title-align, $type);
       text-transform: $part-title-text-transform;
       page-break-after: avoid;
@@ -52,7 +53,7 @@
       word-spacing: if-map-get($part-title-word-spacing, $type);
       border-bottom: if-map-get($part-title-border-bottom-width, $type) $part-title-border-bottom-style if-map-get($part-title-border-bottom-color, $type);
 
-      @if ($part-title-decoration-content != "" or $part-title-decoration-display != none) {
+      @if  $part-title-decoration-content != "" or $part-title-decoration-display != none {
         &::after {
           font-family: $part-title-decoration-font-family;
           content: $part-title-decoration-content;

package/assets/styles/components/specials/_columns.scss

@@ -11,6 +11,7 @@
   @if $type != 'epub' {
     line-height: $column-line-height;
   }
+
   text-align: if-map-get($column-twocolumn-text-align, $type);
   text-indent: if-map-get($column-text-indent, $type);
   column-gap: $column-twocolumn-column-gap;
@@ -22,6 +23,7 @@
     @if $type != 'epub' {
       line-height: $column-line-height;
     }
+
     text-align: if-map-get($column-twocolumn-text-align, $type);
     text-indent: $para-indent;
   }
@@ -40,6 +42,7 @@
   @if $type != 'epub' {
     line-height: $column-line-height;
   }
+
   column-gap: $column-threecolumn-column-gap;
   column-count: 3;
   column-fill: balance;
@@ -49,6 +52,7 @@
     @if $type != 'epub' {
       line-height: $column-line-height;
     }
+
     text-align: if-map-get($column-threecolumn-text-align, $type);
     text-indent: $para-indent;
   }

package/assets/styles/components/specials/_contributors.scss

@@ -2,9 +2,9 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                           Contributors                                     //
-//============================================================================//
+// ============================================================================//
 
 .contributors {
   .chapter-authors, .book-contributors {
@@ -25,8 +25,9 @@
       margin-top: $contributors-margin-top;
       margin-bottom: $contributors-margin-bottom;
     }
+
     // TODO: replace clearfix hack with better CSS Grid solution when Prince supports grid layout
-    &__name__and__links:after {
+    &__name__and__links::after {
       content: "";
       display: table;
       clear: both;

package/assets/styles/components/specials/_dropcaps.scss

@@ -2,18 +2,16 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                                   Dropcaps                                 //
-//============================================================================//
+// ============================================================================//
 
-.first-character { //
+.first-character,
+.firstcharacter // Deprecated; only included for backwards-compatibility.
+{
   font-family: $first-character-font-family;
   font-size: $first-character-font-size;
   font-style: $first-character-font-style;
   font-weight: $first-character-font-weight;
   line-height: $first-character-line-height;
 }
-
-.firstcharacter { // Deprecated; only included for backwards-compatibility.
-  @extend .first-character;
-}

package/assets/styles/components/specials/_floats.scss

@@ -2,9 +2,9 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                                   Floats                                   //
-//============================================================================//
+// ============================================================================//
 
 .clear {
   clear: both;

package/assets/styles/components/specials/_footnotes.scss

@@ -2,15 +2,14 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                            Footnotes & Endnotes                            //
-//============================================================================//
+// ============================================================================//
 
 @import '../utilities';
 
 // Prince footnotes
 @mixin prince-footnotes {
-
   // Reset counter at the beginning of a new section
   .front-matter,
   .part,
@@ -79,25 +78,23 @@
 
 @if $type == 'prince' {
   @include prince-footnotes;
-}
-
-@else if $type == 'epub' {
+} @else if $type == 'epub' {
   @include epub-footnotes;
 }
 
 // Our footnote function eats <p> & <blockquote> tags, so users should wrap new
 // paragraphs & blockquotes in a span, as per below
 
-.fn-p {
+.fn-p,
+.fn_p // Deprecated; only included for backwards-compatibility.
+{
   display: block;
   text-indent: $para-indent;
 }
 
-.fn_p { // Deprecated; only included for backwards-compatibility.
-  @extend .fn-p;
-}
-
-.fn-blockquote {
+.fn-blockquote,
+.fn_blockquote // Deprecated; only included for backwards-compatibility.
+{
   display: block;
   margin-top: $footnote-blockquote-margin-top;
   margin-bottom: $footnote-blockquote-margin-bottom;
@@ -105,10 +102,6 @@
   font-size: $footnote-blockquote-font-size;
 }
 
-.fn_blockquote { // Deprecated; only included for backwards-compatibility.
-  @extend .fn-blockquote;
-}
-
 // Endnotes
 
 .endnotes {

package/assets/styles/components/specials/_glossaryterms.scss

@@ -2,9 +2,9 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                               Glossary terms                               //
-//============================================================================//
+// ============================================================================//
 
 .glossary-term {
   font-weight: bold;

package/assets/styles/components/specials/_miscellaneous.scss

@@ -2,9 +2,9 @@
 /// @group specials
 ////
 
-//============================================================================//
+// ============================================================================//
 //                               Miscellaneous                                //
-//============================================================================//
+// ============================================================================//
 
 // No Hyphens
 .no-hyphens {
@@ -75,12 +75,8 @@
 
 @if $type == 'epub' {
   @include epub-display-none;
-}
-
-@else if $type == 'prince' {
+} @else if $type == 'prince' {
   @include pdf-display-none;
-}
-
-@else if $type == 'web' {
+} @else if $type == 'web' {
   @include web-display-none;
 }