Skip to content

Commit

Permalink
Update to Buckram 1.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Ned Zimmerman committed Jun 24, 2018
1 parent f5a6405 commit 0bef444
Show file tree
Hide file tree
Showing 10 changed files with 37 additions and 32 deletions.
2 changes: 2 additions & 0 deletions assets/book/styles/components/media/_interactive-content.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
}

p {
font-size: if-map-get($interactive-content-font-size, $type);
font-style: $interactive-content-font-style;
margin-bottom: 0;
text-align: left;
}
Expand Down
5 changes: 5 additions & 0 deletions assets/book/styles/components/pages/_front-matter.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ div.epigraph {
}
}

#copyright-page p + p {
margin-top: 1em;
text-indent: 0;
}

@if $type == 'epub' {
@media amzn-mobi {
#copyright-page {
Expand Down
2 changes: 0 additions & 2 deletions assets/book/styles/components/toc/_generic.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
font-weight: $toc-chapter-subtitle-font-weight;
text-transform: $toc-chapter-subtitle-text-transform;
margin-top: if-map-get($toc-chapter-subtitle-margin-top, $type);
margin-bottom: if-map-get($toc-chapter-subtitle-margin-bottom, $type);
}

.chapter .chapter-author {
Expand All @@ -124,7 +123,6 @@
font-weight: $toc-chapter-author-font-weight;
text-transform: $toc-chapter-author-text-transform;
margin-top: if-map-get($toc-chapter-author-margin-top, $type);
margin-bottom: if-map-get($toc-chapter-author-margin-bottom, $type);
}

.back-matter {
Expand Down
10 changes: 5 additions & 5 deletions assets/book/styles/variables/_elements.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@ $h3-font-size: 1em !default;

/// Font Style for `<h3>` elements.
/// @type String
$h3-font-style: normal !default;
$h3-font-style: italic !default;

/// Font Weight for `<h3>` elements.
/// @type String
$h3-font-weight: bold !default;
$h3-font-weight: normal !default;

/// Line Height for `<h3>` elements.
/// @type String | Map
Expand Down Expand Up @@ -248,7 +248,7 @@ $h4-font-style: normal !default;

/// Font Weight for `<h4>` elements.
/// @type String
$h4-font-weight: bold !default;
$h4-font-weight: normal !default;

/// Line Height for `<h4>` elements.
/// @type String | Map
Expand All @@ -260,7 +260,7 @@ $h4-text-transform: none !default;

/// Alignment for `<h4>` elements.
/// @type String
$h4-align: center !default;
$h4-align: left !default;

/// Bottom border style for `<h4>` elements.
/// @type String
Expand Down Expand Up @@ -348,7 +348,7 @@ $h6-padding-bottom: $hx-padding-bottom !default;

/// Font stack for `<h6>` elements.
/// @type String
$h6-font-family: $font-3 !default;
$h6-font-family: $font-1 !default;

/// Font size for `<h6>` elements.
/// @type String | Map
Expand Down
10 changes: 10 additions & 0 deletions assets/book/styles/variables/_media.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,16 @@ $interactive-icon-background-size: (
/// @since 1.0.0
$interactive-content-line-height: $body-line-height !default;

/// Font size property for interactive content box
/// @type String | Map
/// @since 1.0.0
$interactive-content-font-size: 0.9em !default;

/// Font style property for interactive content box
/// @type String
/// @since 1.0.0
$interactive-content-font-style: italic !default;

/// Bottom margin property for interactive content box
/// @type String | Map
/// @since 1.0.0
Expand Down
12 changes: 6 additions & 6 deletions assets/book/styles/variables/_pages.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ $title-title-text-transform: none !default;
$title-title-decoration-font-family: $font-3 !default;

/// Defines the title page title decoration content.
/// @type String
/// @type String
/// @since 1.0.0
$title-title-decoration-content: "" !default;

Expand All @@ -137,7 +137,7 @@ $title-title-decoration-display: none !default;
$title-title-decoration-font-size: (epub: 0em, prince: 0em, web: 0em) !default;

/// Defines the title page title decoration font weight.
/// @type String
/// @type String
/// @since 1.0.0
$title-title-decoration-font-weight: normal !default;

Expand Down Expand Up @@ -255,7 +255,7 @@ $title-author-align: center !default;

/// Text transform for title page author on elements `<h3>` with a class of `author`.
/// @type String
$title-author-text-transform: uppercase !default;
$title-author-text-transform: none !default;

// Publisher logo

Expand Down Expand Up @@ -327,7 +327,7 @@ $title-publisher-align: center !default;

/// Text transform for title page publisher text on elements `<h4>` with a class of `publisher`.
/// @type String
$title-publisher-text-transform: uppercase !default;
$title-publisher-text-transform: none !default;

// Publisher city

Expand Down Expand Up @@ -437,7 +437,7 @@ $dedication-margin-bottom: 1em !default;

/// Font stack for Dedication on `<p>` elements that are children of `<div>` elements with a class of `dedication`.
/// @type String
$dedication-font-family: $font-2 !default;
$dedication-font-family: $font-1 !default;

/// Font size for Dedication on `<p>` elements that are children of `<div>` elements with a class of `dedication`.
/// @type String
Expand Down Expand Up @@ -559,7 +559,7 @@ $section-license-align: left !default;

/// Line height for License on `<p>` elements that are immediate children of elements with classes `front-matter` and `license-attribution`.
/// @type String
$section-license-line-height: 1.4em !default;
$section-license-line-height: 1.2em !default;

/// Font size for License on `<p>` elements that are immediate children of elements with classes `front-matter` and `license-attribution`.
/// @type String
Expand Down
4 changes: 2 additions & 2 deletions assets/book/styles/variables/_structure.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ $numbering-position: 'top-outside' !default;

/// First page numbering position.
/// @type Null | String
$first-numbering-position: null !default;
// $first-numbering-position: 'null' !default;
// $first-numbering-position: 'top-center' !default;
// $first-numbering-position: 'bottom-center' !default;
$first-numbering-position: 'bottom-center' !default;
// $first-numbering-position: 'bottom-inside' !default;
// $first-numbering-position: 'bottom-outside' !default;
// TODO: Handle other positions based on recto-verso
Expand Down
16 changes: 3 additions & 13 deletions assets/book/styles/variables/_toc.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -361,22 +361,12 @@ $toc-chapter-title-display: inline !default;
/// Chapter subtitle top margin for Table of Contents
/// @type String | Map
/// @since 1.0.0
$toc-chapter-subtitle-margin-top: (epub: 0.2em, prince: 0.2em, web: 0.2em) !default;

/// Chapter subtitle bottom margin for Table of Contents
/// @type String | Map
/// @since 1.0.0
$toc-chapter-subtitle-margin-bottom: (epub: 0.2em, prince: 0.2em, web: 0.2em) !default;
$toc-chapter-subtitle-margin-top: (epub: 0.4em, prince: 0.4em, web: 0.4em) !default;

/// Chapter author top margin for Table of Contents
/// @type String | Map
/// @since 1.0.0
$toc-chapter-author-margin-top: (epub: 0.2em, prince: 0.2em, web: 0.2em) !default;

/// Chapter author bottom margin for Table of Contents
/// @type String | Map
/// @since 1.0.0
$toc-chapter-author-margin-bottom: (epub: 0.2em, prince: 0.2em, web: 0.2em) !default;
$toc-chapter-author-margin-top: (epub: 0.4em, prince: 0.4em, web: 0.4em) !default;

/// Chapter subtitle font stack for Table of Contents
/// @type String
Expand All @@ -388,7 +378,7 @@ $toc-chapter-subtitle-font-size: 0.9em !default;

/// Chapter subtitle font style for Table of Contents
/// @type String
$toc-chapter-subtitle-font-style: normal !default;
$toc-chapter-subtitle-font-style: italic !default;

/// Chapter subtitle font weight for Table of Contents
/// @type String
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"aetna": "^1.0.0-alpha.17",
"buckram": "pressbooks/buckram",
"buckram": "^1.0.0-rc.1",
"diff": "^3.5.0",
"js-cookie": "^2.2.0",
"lity": "^2.3.1",
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1549,9 +1549,9 @@ [email protected]:
version "1.3.4"
resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"

buckram@pressbooks/buckram:
version "1.0.0-dev"
resolved "https://codeload.github.com/pressbooks/buckram/tar.gz/b752651939f8f39380deef97ceacd8bf9c4abdd7"
buckram@^1.0.0-rc.1:
version "1.0.0-rc.1"
resolved "https://registry.yarnpkg.com/buckram/-/buckram-1.0.0-rc.1.tgz#7963f922bce3d987744807d052456ebee0aa827b"

buffer-crc32@~0.2.3:
version "0.2.13"
Expand Down

0 comments on commit 0bef444

Please sign in to comment.