From c36698c8e7a7b162279384d6f4cd32bcbfda2371 Mon Sep 17 00:00:00 2001 From: dannylonglegs Date: Wed, 13 Feb 2019 12:41:25 -0500 Subject: [PATCH 1/4] Add publisher and publisher city float variable and set it to none --- .../assets/styles/components/pages/_titles.scss | 4 ++-- packages/buckram/assets/styles/variables/_pages.scss | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/buckram/assets/styles/components/pages/_titles.scss b/packages/buckram/assets/styles/components/pages/_titles.scss index 4d02783da..00ca8afb4 100644 --- a/packages/buckram/assets/styles/components/pages/_titles.scss +++ b/packages/buckram/assets/styles/components/pages/_titles.scss @@ -108,7 +108,7 @@ div.publisher-logo { h4.publisher { display: block; - float: bottom; + float: if-map-get($title-publisher-float); margin: if-map-get($title-publisher-margin-top, $type) if-map-get($title-publisher-margin-right, $type) if-map-get($title-publisher-margin-bottom, $type) if-map-get($title-publisher-margin-left, $type); font-family: $title-publisher-font-family; font-size: if-map-get($title-publisher-font-size, $type); @@ -127,7 +127,7 @@ h4.publisher { } h5.publisher-city { - float: bottom; + float: if-map-get($title-publisher-city-float); margin-top: 0; margin-left: if-map-get($title-publisher-city-margin-left, $type); margin-right: if-map-get($title-publisher-city-margin-right, $type); diff --git a/packages/buckram/assets/styles/variables/_pages.scss b/packages/buckram/assets/styles/variables/_pages.scss index b0221f318..8d52b7372 100644 --- a/packages/buckram/assets/styles/variables/_pages.scss +++ b/packages/buckram/assets/styles/variables/_pages.scss @@ -386,6 +386,11 @@ $title-publisher-margin-bottom: (epub: 0.5em, prince: 0.5em, web: 0.5em) !defaul /// @since 1.2.0 $title-publisher-margin-left: (epub: 0, prince: 0, web: 0) !default; +/// Float for title page publisher text on elements `

` with a class of `publisher`. +/// @type String | Map +/// @since 1.4.0 +$title-publisher-float: (epub: none, prince: none, web: none) !default; + /// Font stack for title page publisher text on elements `

` with a class of `publisher`. /// @type String $title-publisher-font-family: $font-3 !default; @@ -454,6 +459,11 @@ $title-publisher-city-margin-right: $title-publisher-margin-right !default; /// @since 1.2.0 $title-publisher-city-margin-left: $title-publisher-margin-left !default; +/// Float for title page publisher city text on elements `

` with a class of `publisher-city`. +/// @type String | Map +/// @since 1.4.0 +$title-publisher-float: (epub: none, prince: none, web: none) !default; + /// Font stack for title page publisher city text on elements `
` with a class of `publisher-city`. /// @type String $title-publisher-city-font-family: $font-3 !default; From 028ad52736f9ac46982a59bcfaf75d4ed0568e90 Mon Sep 17 00:00:00 2001 From: dannylonglegs Date: Wed, 13 Feb 2019 12:42:13 -0500 Subject: [PATCH 2/4] Add missing text --- packages/buckram/assets/styles/variables/_pages.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/buckram/assets/styles/variables/_pages.scss b/packages/buckram/assets/styles/variables/_pages.scss index 8d52b7372..d7b3d1a72 100644 --- a/packages/buckram/assets/styles/variables/_pages.scss +++ b/packages/buckram/assets/styles/variables/_pages.scss @@ -462,7 +462,7 @@ $title-publisher-city-margin-left: $title-publisher-margin-left !default; /// Float for title page publisher city text on elements `
` with a class of `publisher-city`. /// @type String | Map /// @since 1.4.0 -$title-publisher-float: (epub: none, prince: none, web: none) !default; +$title-publisher-city-float: (epub: none, prince: none, web: none) !default; /// Font stack for title page publisher city text on elements `
` with a class of `publisher-city`. /// @type String From bae0083e19629a8d1f2931ae56491feb65ecf951 Mon Sep 17 00:00:00 2001 From: dannylonglegs Date: Wed, 13 Feb 2019 14:42:53 -0500 Subject: [PATCH 3/4] Add missing --- packages/buckram/assets/styles/components/pages/_titles.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/buckram/assets/styles/components/pages/_titles.scss b/packages/buckram/assets/styles/components/pages/_titles.scss index 00ca8afb4..65c31b393 100644 --- a/packages/buckram/assets/styles/components/pages/_titles.scss +++ b/packages/buckram/assets/styles/components/pages/_titles.scss @@ -108,7 +108,7 @@ div.publisher-logo { h4.publisher { display: block; - float: if-map-get($title-publisher-float); + float: if-map-get($title-publisher-float, $type); margin: if-map-get($title-publisher-margin-top, $type) if-map-get($title-publisher-margin-right, $type) if-map-get($title-publisher-margin-bottom, $type) if-map-get($title-publisher-margin-left, $type); font-family: $title-publisher-font-family; font-size: if-map-get($title-publisher-font-size, $type); @@ -127,7 +127,7 @@ h4.publisher { } h5.publisher-city { - float: if-map-get($title-publisher-city-float); + float: if-map-get($title-publisher-city-float, $type); margin-top: 0; margin-left: if-map-get($title-publisher-city-margin-left, $type); margin-right: if-map-get($title-publisher-city-margin-right, $type); From da2d445d4cc2bd7dad91d6cce74b5ac3693cde1f Mon Sep 17 00:00:00 2001 From: dannylonglegs Date: Wed, 13 Feb 2019 15:02:27 -0500 Subject: [PATCH 4/4] Update changelog --- packages/buckram/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/buckram/CHANGELOG.md b/packages/buckram/CHANGELOG.md index 76aaf7e22..ae60baa20 100644 --- a/packages/buckram/CHANGELOG.md +++ b/packages/buckram/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.4.0 + +- Add `$section-author-text-indent` variable: [#501](https://github.com/pressbooks/pressbooks-book/pull/501) +- Add `$title-publisher-float` and `$title-publisher-city-float` variables: [#503](https://github.com/pressbooks/pressbooks-book/pull/503) + ## 1.3.3 ### Patches