Merge pull request #68 from kiwix/css_taskbar

Css taskbar
This commit is contained in:
Matthieu Gautier 2017-08-15 15:51:09 -04:00 committed by GitHub
commit a210cb3a4b
4 changed files with 8 additions and 13 deletions

View File

@ -129,15 +129,11 @@ void introduceTaskbar(string& content, const string& humanReadableBookId)
content, content,
"<head>", "<head>",
replaceRegex( replaceRegex(
RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__")); RESOURCE::include_html_part, humanReadableBookId, "__CONTENT__")
content = appendToFirstOccurence( + (noLibraryButtonFlag
content, ? "<style>#kiwix_serve_taskbar_library_button { display: none }</style>"
"<head>", : "")
"<style>" + RESOURCE::taskbar_css );
+ (noLibraryButtonFlag
? " #kiwix_serve_taskbar_library_button { display: none }"
: "")
+ "</style>");
if ( humanReadableBookId.empty() ) { if ( humanReadableBookId.empty() ) {
content = appendToFirstOccurence( content = appendToFirstOccurence(
content, content,

View File

@ -1,5 +1,3 @@
<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
<span class="kiwix"> <span class="kiwix">
<span id="kiwixtoolbar" class="ui-widget-header"> <span id="kiwixtoolbar" class="ui-widget-header">
<div class="kiwix_centered"> <div class="kiwix_centered">

View File

@ -1,3 +1,6 @@
<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
<link type="text/css" href="/skin/taskbar.css" rel="Stylesheet" />
<script type="text/javascript" src="/skin/jquery-ui/external/jquery/jquery.js"></script> <script type="text/javascript" src="/skin/jquery-ui/external/jquery/jquery.js"></script>
<script type="text/javascript" src="/skin/jquery-ui/jquery-ui.min.js"></script> <script type="text/javascript" src="/skin/jquery-ui/jquery-ui.min.js"></script>
<script> <script>

View File

@ -1,5 +1,3 @@
<link type="text/css" href="/skin/jquery-ui/jquery-ui.min.css" rel="Stylesheet" />
<link type="text/css" href="/skin/jquery-ui/jquery-ui.theme.min.css" rel="Stylesheet" />
<span class="kiwix"> <span class="kiwix">
<span id="kiwixtoolbar" class="ui-widget-header"> <span id="kiwixtoolbar" class="ui-widget-header">
<div class="kiwix_centered"> <div class="kiwix_centered">