(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index c5088bb9eeb9479dc8dbda520141ef105b1c3272..b37ef5bb05ca51f89f3ece66a522f633ce02b5bb 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -757,11 +757,12 @@ class wsHTML5Compiler {
 
                $bookmarksDisabledColors = array('star' => $this->theme->parametres->bookmarkStarDisabledColor, 'bookmark' => $this->theme->parametres->bookmarkBackgroundColor);
                $bookmarksEnabledColors = array('star' => $this->theme->parametres->bookmarkStarEnabledColor, 'bookmark' => $this->theme->parametres->bookmarkBackgroundColor);
+               $subTextColor = $this->theme->parametres->subTextColor;
 
                $arrowsColor = $this->theme->parametres->arrowsColor;
                // Set the icon list with the color
                $icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,
-                       'interface-next' => $arrowsColor, 'interface-previous' => $arrowsColor, 'interface-search' => $couleurI,
+                       'interface-next' => $arrowsColor, 'interface-previous' => $arrowsColor, 'interface-search' => $couleurI, 'interface-back-arrow' => $subTextColor,
                        'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI, 'nav-archives' => $couleurI, 'nav-map' => $couleurI,
                        'nav-tag' => $couleurI, 'nav-print' => $couleurI, 'nav-friend' => $couleurI,
                        'share-facebook' => $couleurM, 'share-twitter' => $couleurM, 'share-email' => $couleurM, 'share-googleplus' => $couleurM, 'share-linkedin' => $couleurM, 'share-viadeo' => $couleurM,
@@ -1013,28 +1014,37 @@ class wsHTML5Compiler {
                $res[] = '.landscape .mview{width:' . $w2 . ';min-height:' . $h . '}';
                $res[] = '.mview{background-color:' . $menuColor->toCSS() . ';color:' . self::colorToCSS($this->theme->parametres->subTextColor) . ';}';
                # Topbar
-               
-               
                $top = $menuColor->toCSS();
-               $bottom = $menuMultiply->setAlpha(0.3)->toCSS();
-               $border = $menuMultiply2->setAlpha(0.5)->toCSS();
+               $bottom = $menuMultiply->toCSS();
+               $border = $menuMultiply2->setAlpha(0.6)->toCSS();
 
                $caption = ".mview .caption{
+       background-image: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
+       background-image: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
+       background-image: -o-linear-gradient(top, $top 0%,$bottom 100%); /* Opera 11.10+ */
+       background-image: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
+       background-image: linear-gradient(top bottom, $top 0%,$bottom 100%); /* W3C */
+}";
+
+               $caption.=".mview .caption .back{
+       border:1px solid $border;
+}";
+               $res[] = $caption;
+
+               # Chapters (menu lists)
+               $top = $menuColor->setAlpha(0.5)->toCSS();
+               $bottom = $menuMultiply->setAlpha(0.5)->toCSS();
+               $border=$menuMultiply2->setAlpha(0.5)->toCSS();
+
+               $chapters = "ul.chapters a.level0,ul.chapters a.level1,ul.chapters a.level2,ul.chapters a.level3{
        background: -moz-linear-gradient(top, $top 0%, $bottom 100%); /* FF3.6+ */
-       background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$top), color-stop(100%,$bottom)); /* Chrome,Safari4+ */
        background: -webkit-linear-gradient(top, $top 0%,$bottom 100%); /* Chrome10+,Safari5.1+ */
        background: -o-linear-gradient(top, $top 0%,rgba(0,0,0,0.5) 100%); /* Opera 11.10+ */
        background: -ms-linear-gradient(top, $top 0%,$bottom 100%); /* IE10+ */
        background: linear-gradient(top bottom, $top 0%,$bottom 100%); /* W3C */
-       border-bottom:2px solid $border;
-       box-shadow:0 2px rgba(255,255,255,0.3);
-}
-.mview .caption:after{
-       content:'';
-       border-top:2px solid rgba(255,255,255,0.3);
+       border-bottom:1px solid $border;
 }";
-               fb($caption);
-               $res[] = $caption;
+               $res[] = $chapters;
                # Index
                $ratio = $this->width / $this->height;
                $thumbh = round(100 / $ratio);