From dfa7bcd1049882c0696abc2877b7d636178e84f8 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 8 Jun 2017 17:10:01 +0200
Subject: [PATCH] fix #1451 @0.5

---
 js/libs/fluidbook/fluidbook.menu.js          |  4 ++++
 js/libs/fluidbook/menu/fluidbook.chapters.js |  2 +-
 style/fluidbook.less                         | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/js/libs/fluidbook/fluidbook.menu.js b/js/libs/fluidbook/fluidbook.menu.js
index e63e56a3..e8e99b70 100644
--- a/js/libs/fluidbook/fluidbook.menu.js
+++ b/js/libs/fluidbook/fluidbook.menu.js
@@ -447,6 +447,10 @@ FluidbookMenu.prototype = {
             case 'chapters':
                 w = this.fluidbook.datas.chaptersColMaxWidth * 1.5;
                 fullscreen = (w >= ww * 0.9);
+                if (this.fluidbook.datas.chaptersCascade) {
+                    h = hh * 0.8;
+                    forceHeight=true;
+                }
                 break;
             case 'index':
                 fullscreen = true;
diff --git a/js/libs/fluidbook/menu/fluidbook.chapters.js b/js/libs/fluidbook/menu/fluidbook.chapters.js
index 5c9e5b84..05a8635a 100644
--- a/js/libs/fluidbook/menu/fluidbook.chapters.js
+++ b/js/libs/fluidbook/menu/fluidbook.chapters.js
@@ -97,7 +97,7 @@ FluidbookChapters.prototype = {
         } else if (this.style == 'ina') {
             res += '<li style="background-color:#' + color + ';" data-level="' + chapter.level + '"><a href="#/page/' + p + '" class="nodark level' + chapter.level + '">';
         }
-        res += chapter.label;
+        res += '<span>' + chapter.label + '</span>';
         res += '<div class="right" data-page="' + p + '">';
 
         if (this.style == 'classic') {
diff --git a/style/fluidbook.less b/style/fluidbook.less
index 6dc6900f..8e03a536 100644
--- a/style/fluidbook.less
+++ b/style/fluidbook.less
@@ -1401,6 +1401,7 @@ ul.chapters {
 	}
 
 	li {
+		position: relative;
 		&[data-level="1"] + [data-level="0"] {
 			margin-top: 15px;
 		}
@@ -1452,9 +1453,20 @@ ul.chapters {
 			display: none;
 		}
 	}
+
+	li > a > span {
+		display: block;
+		padding-right: 30px;
+	}
 	.right {
-		float: right;
+		right: 32px;
+		top: 5px;
+		position: absolute;
 		display: inline-block;
+		vertical-align: top;
+		width: 25px;
+		height: 25px;
+		text-align: center;
 
 		.puce {
 			width: 25px;
@@ -1462,6 +1474,8 @@ ul.chapters {
 			line-height: 17px;
 			padding: 6px;
 			color: #fff;
+			position: relative;
+			top: 0px;
 			svg {
 				width: 16px;
 				height: 16px;
-- 
2.39.5