Skip to content

BKJS-34 Correct flexbox issues #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
japina wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BKJS-34 Correct flexbox issues #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions book.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,13 @@
var stylesheet = document.createElement('style');
stylesheet.innerHTML =
".pagination-main-contents-container {display: -webkit-flex; " +
"-webkit-flex-direction: column;}" +
"-webkit-flex-direction: column; display: flex; floex-direction: column; }" +
"\n.pagination-contents-container {position: absolute;}" +
"\n.pagination-contents {display: -webkit-flex; -webkit-flex: 1;}"
"\n.pagination-contents {display: -webkit-flex; -webkit-flex: 1; display: flex; flex: 1;}"
/* There seems to be a bug in the new flexbox model code which requires the
* height to be set to an arbitrary value (which is ignored).
*/ + "\n.pagination-contents {height: 0px;}" +
"\n.pagination-contents-column {-webkit-flex: 1;}" + "\nbody {" +
"\n.pagination-contents-column {-webkit-flex: 1; flex: 1;}" + "\nbody {" +
"counter-reset: pagination-footnote pagination-footnote-reference;}" +
"\n.pagination-footnote::before {" +
"counter-increment: pagination-footnote-reference; " +
Expand All @@ -364,12 +364,12 @@
"-webkit-region-break-after: always;}" +
"\n.pagination-pagenumber, .pagination-header {position: absolute;}" +
"\n.pagination-pagebreak {-webkit-region-break-after: always;}" +
"\n.pagination-simple {height: auto; position-relative;}" +
"\n.pagination-simple {height: auto; position: relative;}" +
"\n.pagination-page {margin-left:auto; margin-right:auto;}" +
"\n.pagination-marginnote-item {position:absolute;}" +
"\n.pagination-marginnote > * {display: block;}" +
"\n.pagination-index-page {float:right;}" +
"\n.pagination-index-list div {margin-left: 5px;)";
"\n.pagination-index-list div {margin-left: 5px;}";
document.head.appendChild(stylesheet);
};

Expand Down Expand Up @@ -417,9 +417,9 @@
+ "\n@media screen{.pagination-page {border:solid 1px #000; " +
"margin-bottom:.2in;}}" +
"\n.pagination-main-contents-container {width:" + contentsWidth + ";}" +
"\n.pagination-contents-container {bottom:" + contentsBottomMargin + "; height:" + contentsHeight + "; display: -webkit-flex;}"
"\n.pagination-contents-container {bottom:" + contentsBottomMargin + "; height:" + contentsHeight + "; display: -webkit-flex; display: flex; }" +
// Images should at max size be slightly smaller than the contentsWidth.
+ "\nimg {max-height: " + imageMaxHeight + ";max-width: " +
"\nimg {max-height: " + imageMaxHeight + ";max-width: " +
imageMaxWidth + ";}" + "\n.pagination-pagenumber {bottom:" +
pagenumberBottomMargin + ";}" + "\n.pagination-header {top:" +
headerTopMargin + ";}" +
Expand Down Expand Up @@ -447,7 +447,7 @@
"{position: relative; top: -0.5em; font-size: 80%;}" +
"\n.pagination-toc-entry .pagination-toc-pagenumber, " +
".pagination-tof-entry .pagination-tof-pagenumber, " +
".pagination-tot-entry .pagination-tot-pagenumber {float:right}"
".pagination-tot-entry .pagination-tot-pagenumber {float:right;}"
/* This seems to be a bug in Webkit. But unless we set the width of the
* original element that is being flown, some elements extend beyond the
* mainContentsContainer's width.
Expand Down
1 change: 1 addition & 0 deletions test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>BookJS test</title>
<script src="book-config.js" type="text/javascript"></script>
<script src="book.js" type="text/javascript"></script>
Expand Down
1 change: 1 addition & 0 deletions test2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>

<head>
<meta charset="UTF-8">
<title>BookJS test</title>
<link href="book.css" rel="stylesheet" type="text/css">
<script src="book-config.js" type="text/javascript"></script>
Expand Down
1 change: 1 addition & 0 deletions test3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html>

<head>
<meta charset="UTF-8">
<title>BookJS test</title>
<link href="book.css" rel="stylesheet" type="text/css">
<script src="book-config.js" type="text/javascript"></script>
Expand Down
3 changes: 2 additions & 1 deletion test4.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<html>

<head>
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<meta charset="UTF-8">
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<title>The Malay Archipelago</title>
<style>
body {
Expand Down
1 change: 1 addition & 0 deletions test5.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@


<head>
<meta charset="UTF-8">
<title>BookJS test</title>
<script type="text/javascript">
paginationConfig = {
Expand Down
3 changes: 2 additions & 1 deletion test7.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<html>

<head>
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<meta charset="UTF-8">
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<title>The Malay Archipelago</title>
<style>
body {
Expand Down
3 changes: 2 additions & 1 deletion test8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<html>

<head>
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<meta charset="UTF-8">
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<title>The Malay Archipelago</title>
<style>
body {
Expand Down
4 changes: 2 additions & 2 deletions test9.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<html>

<head>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link href='http://fonts.googleapis.com/css?family=Goudy+Bookletter+1911' rel='stylesheet' type='text/css'>
<title>The Malay Archipelago</title>
<style>
body {
Expand Down