Skip to content

Commit

Permalink
BL-2353 Fix image width on xmatter to use full width
Browse files Browse the repository at this point in the history
* Fix BL-1022 in basePage.less was overridden by xmatter css
   which have wider relative marginBox margins
* also changed capitalization on @import to match actual
   DistFiles folder name (in case we build less->css on linux
   someday)
  • Loading branch information
Gordon Martin committed Jun 19, 2015
1 parent 0e16a0f commit 8e30038
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 21 deletions.
31 changes: 29 additions & 2 deletions DistFiles/xMatter/Factory-XMatter/Factory-XMatter.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.bloom-frontMatter .pageLabel:after,
.bloom-frontMatter .pageLabel:after,
.bloom-backMatter .pageLabel:after {
content: ": Factory Front/Back Matter";
}
Expand All @@ -9,48 +9,76 @@
left: 15mm;
width: 180mm;
}
.A4Portrait.outsideFrontCover .marginBox IMG,
.A4Portrait.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A4Landscape.outsideFrontCover .marginBox,
.A4Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 267mm;
}
.A4Landscape.outsideFrontCover .marginBox IMG,
.A4Landscape.outsideBackCover .marginBox IMG {
max-width: 267mm;
}
.A5Portrait.outsideFrontCover .marginBox,
.A5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 118mm;
}
.A5Portrait.outsideFrontCover .marginBox IMG,
.A5Portrait.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.A5Landscape.outsideFrontCover .marginBox,
.A5Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 180mm;
}
.A5Landscape.outsideFrontCover .marginBox IMG,
.A5Landscape.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A6Portrait.outsideFrontCover .marginBox,
.A6Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 75mm;
}
.A6Portrait.outsideFrontCover .marginBox IMG,
.A6Portrait.outsideBackCover .marginBox IMG {
max-width: 75mm;
}
.A6Landscape.outsideFrontCover .marginBox,
.A6Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 80mm;
left: 15mm;
width: 118mm;
}
.A6Landscape.outsideFrontCover .marginBox IMG,
.A6Landscape.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.B5Portrait.outsideFrontCover .marginBox,
.B5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 225mm;
left: 15mm;
width: 146mm;
}
.B5Portrait.outsideFrontCover .marginBox IMG,
.B5Portrait.outsideBackCover .marginBox IMG {
max-width: 146mm;
}
.insideFrontCover .bloom-content1 {
display: inherit;
}
Expand Down Expand Up @@ -345,4 +373,3 @@ BODY[bookcreationtype="translation"] .titlePage #funding .bloom-contentNational1
.ISBNContainer .ISBNContainer SPAN {
vertical-align: top;
}
/*# sourceMappingURL=Factory-XMatter.css.map */
31 changes: 29 additions & 2 deletions DistFiles/xMatter/SIL-Cameroon-XMatter/SIL-Cameroon-XMatter.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.bloom-frontMatter .pageLabel:after,
.bloom-frontMatter .pageLabel:after,
.bloom-backMatter .pageLabel:after {
content: ": SIL-Cameroon Front/Back Matter";
}
Expand All @@ -9,48 +9,76 @@
left: 15mm;
width: 180mm;
}
.A4Portrait.outsideFrontCover .marginBox IMG,
.A4Portrait.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A4Landscape.outsideFrontCover .marginBox,
.A4Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 267mm;
}
.A4Landscape.outsideFrontCover .marginBox IMG,
.A4Landscape.outsideBackCover .marginBox IMG {
max-width: 267mm;
}
.A5Portrait.outsideFrontCover .marginBox,
.A5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 118mm;
}
.A5Portrait.outsideFrontCover .marginBox IMG,
.A5Portrait.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.A5Landscape.outsideFrontCover .marginBox,
.A5Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 180mm;
}
.A5Landscape.outsideFrontCover .marginBox IMG,
.A5Landscape.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A6Portrait.outsideFrontCover .marginBox,
.A6Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 75mm;
}
.A6Portrait.outsideFrontCover .marginBox IMG,
.A6Portrait.outsideBackCover .marginBox IMG {
max-width: 75mm;
}
.A6Landscape.outsideFrontCover .marginBox,
.A6Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 80mm;
left: 15mm;
width: 118mm;
}
.A6Landscape.outsideFrontCover .marginBox IMG,
.A6Landscape.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.B5Portrait.outsideFrontCover .marginBox,
.B5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 225mm;
left: 15mm;
width: 146mm;
}
.B5Portrait.outsideFrontCover .marginBox IMG,
.B5Portrait.outsideBackCover .marginBox IMG {
max-width: 146mm;
}
.insideFrontCover .bloom-content1 {
display: inherit;
}
Expand Down Expand Up @@ -345,4 +373,3 @@ BODY[bookcreationtype="translation"] .titlePage #funding .bloom-contentNational1
.ISBNContainer .ISBNContainer SPAN {
vertical-align: top;
}
/*# sourceMappingURL=SIL-Cameroon-XMatter.css.map */
31 changes: 29 additions & 2 deletions DistFiles/xMatter/Traditional-XMatter/Traditional-XMatter.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.bloom-frontMatter .pageLabel:after,
.bloom-frontMatter .pageLabel:after,
.bloom-backMatter .pageLabel:after {
content: ": Traditional Front/Back Matter";
}
Expand All @@ -9,48 +9,76 @@
left: 15mm;
width: 180mm;
}
.A4Portrait.outsideFrontCover .marginBox IMG,
.A4Portrait.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A4Landscape.outsideFrontCover .marginBox,
.A4Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 267mm;
}
.A4Landscape.outsideFrontCover .marginBox IMG,
.A4Landscape.outsideBackCover .marginBox IMG {
max-width: 267mm;
}
.A5Portrait.outsideFrontCover .marginBox,
.A5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 118mm;
}
.A5Portrait.outsideFrontCover .marginBox IMG,
.A5Portrait.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.A5Landscape.outsideFrontCover .marginBox,
.A5Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 180mm;
}
.A5Landscape.outsideFrontCover .marginBox IMG,
.A5Landscape.outsideBackCover .marginBox IMG {
max-width: 180mm;
}
.A6Portrait.outsideFrontCover .marginBox,
.A6Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 75mm;
}
.A6Portrait.outsideFrontCover .marginBox IMG,
.A6Portrait.outsideBackCover .marginBox IMG {
max-width: 75mm;
}
.A6Landscape.outsideFrontCover .marginBox,
.A6Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 80mm;
left: 15mm;
width: 118mm;
}
.A6Landscape.outsideFrontCover .marginBox IMG,
.A6Landscape.outsideBackCover .marginBox IMG {
max-width: 118mm;
}
.B5Portrait.outsideFrontCover .marginBox,
.B5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 225mm;
left: 15mm;
width: 146mm;
}
.B5Portrait.outsideFrontCover .marginBox IMG,
.B5Portrait.outsideBackCover .marginBox IMG {
max-width: 146mm;
}
.insideFrontCover .bloom-content1 {
display: inherit;
}
Expand Down Expand Up @@ -345,4 +373,3 @@ BODY[bookcreationtype="translation"] .titlePage #funding .bloom-contentNational1
.ISBNContainer .ISBNContainer SPAN {
vertical-align: top;
}
/*# sourceMappingURL=Traditional-XMatter.css.map */
38 changes: 36 additions & 2 deletions DistFiles/xMatter/bloom-xmatter-common.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.bloom-frontMatter .pageLabel:after,
.bloom-frontMatter .pageLabel:after,
.bloom-backMatter .pageLabel:after {
content: ": unknown Front/Back Matter";
}
Expand All @@ -9,48 +9,83 @@
left: 15mm;
width: 180mm;
}
.A4Portrait.outsideFrontCover .marginBox IMG,
.A4Portrait.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 180mm;
}
.A4Landscape.outsideFrontCover .marginBox,
.A4Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 267mm;
}
.A4Landscape.outsideFrontCover .marginBox IMG,
.A4Landscape.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 267mm;
}
.A5Portrait.outsideFrontCover .marginBox,
.A5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 185mm;
left: 15mm;
width: 118mm;
}
.A5Portrait.outsideFrontCover .marginBox IMG,
.A5Portrait.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 118mm;
}
.A5Landscape.outsideFrontCover .marginBox,
.A5Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 180mm;
}
.A5Landscape.outsideFrontCover .marginBox IMG,
.A5Landscape.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 180mm;
}
.A6Portrait.outsideFrontCover .marginBox,
.A6Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 123mm;
left: 15mm;
width: 75mm;
}
.A6Portrait.outsideFrontCover .marginBox IMG,
.A6Portrait.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 75mm;
}
.A6Landscape.outsideFrontCover .marginBox,
.A6Landscape.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 80mm;
left: 15mm;
width: 118mm;
}
.A6Landscape.outsideFrontCover .marginBox IMG,
.A6Landscape.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 118mm;
}
.B5Portrait.outsideFrontCover .marginBox,
.B5Portrait.outsideBackCover .marginBox {
/*There's no page number on the cover, so we might as well have a the bottom stuff closer to the bottom*/
height: 225mm;
left: 15mm;
width: 146mm;
}
.B5Portrait.outsideFrontCover .marginBox IMG,
.B5Portrait.outsideBackCover .marginBox IMG {
/* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: 146mm;
}
.insideFrontCover .bloom-content1 {
display: inherit;
}
Expand Down Expand Up @@ -345,4 +380,3 @@ BODY[bookcreationtype="translation"] .titlePage #funding .bloom-contentNational1
.ISBNContainer .ISBNContainer SPAN {
vertical-align: top;
}
/*# sourceMappingURL=bloom-xmatter-common.css.map */
3 changes: 3 additions & 0 deletions DistFiles/xMatter/bloom-xmatter-common.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
//Just center the margin box, (for now, we're ignoring the binding)
left: @MarginOuter;
width: @PageWidth - (2 * @MarginOuter);
IMG { /* BL-2353 Keeps XMatter thumb images from going too wide (or too small) */
max-width: @PageWidth - (2 * @MarginOuter);
}
}
.A4Portrait& {
.SetMarginBoxCover(@A4Portrait-Height, @A4Portrait-Width);
Expand Down
Loading

0 comments on commit 8e30038

Please sign in to comment.