From: Stephen Cameron <stephen@cubedesigners.com>
Date: Mon, 28 Aug 2017 13:23:50 +0000 (+0200)
Subject: Merge branch 'master' into burgermenu
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e41022a4e0c82709945031532b5126738d26505e;p=fluidbook-html5.git

Merge branch 'master' into burgermenu
---

e41022a4e0c82709945031532b5126738d26505e
diff --cc js/libs/fluidbook/fluidbook.menu.js
index 0b89d6c7,031de2e0..d6352db2
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@@ -5,9 -5,13 +5,12 @@@ function FluidbookMenu(fluidbook) 
  
  FluidbookMenu.prototype = {
      init: function () {
 -        this.index = new FluidbookIndex(this.fluidbook);
          var $this = this;
  
-         $(document).on('click', ".mview .back", function () {
+         // Note: iOS won't catch click events unless the element has a cursor:pointer style
+         // This was added for #viewOverlay in the CSS
+         // More details: https://stackoverflow.com/a/16006333
+         $(document).on('click', ".mview .back, #viewOverlay", function () {
              var currentHash = window.location.hash;
              window.location.hash = '/page/' + $this.fluidbook.currentPage;
              if (window.location.hash == currentHash) {
diff --cc style/fluidbook.less
index a363a021,00b5955a..5447ac69
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@@ -1194,39 -1219,17 +1226,18 @@@ form input[type="text"], form input[typ
  
  }
  
- /* Search */
- .highlight0 {
- 	background-color: #00ff00;
- }
- 
- .highlight1 {
- 	background-color: #ffff00;
- }
- 
- .highlight2 {
- 	background-color: #00ffff;
- }
- 
- .highlight3 {
- 	background-color: #ff00ff;
- }
- 
- .highlight4 {
- 	background-color: #ff0000;
- }
- 
  /* Share */
  
 -ul.chapters.shareList a.level0 img {
 +ul.chapters.shareList a.level0 .svg-icon {
  	height: 25px;
 -	margin: 2px 10px 0 0;
 -	position: relative;
 -	top: 3px;
 -}
 +	width: 25px;
 +	display: inline-block;
 +	vertical-align: middle;
 +	margin: 0 10px 6px 0;
  
 -.rtl ul.chapters.shareList a.level0 img {
 -	margin: 2px 0 0 10px;
 +	.rtl & {
 +		margin: 0 0 6px 10px;
 +	}
  }
  
  /* Help */