mirror of
https://github.com/JonathanHerrewijnen/calibre-web.git
synced 2024-11-11 05:33:57 +00:00
Merge remote-tracking branch 'caliblur/master'
This commit is contained in:
commit
17b7333992
2
cps/static/css/caliBlur.min.css
vendored
2
cps/static/css/caliBlur.min.css
vendored
File diff suppressed because one or more lines are too long
@ -108,7 +108,7 @@ if ( $( 'body.book' ).length > 0 ) {
|
||||
.replace(/^(?=\n)$|^\s*|\s*$|\n\n+/gm,"").split(/\n/);
|
||||
}
|
||||
else {
|
||||
newdesc = description.toString();
|
||||
newdesc = description.text();
|
||||
}
|
||||
doc = nlp ( newdesc.toString() );
|
||||
sentences = doc.map((m)=> m.out( 'text' ));
|
||||
|
7
cps/static/js/libs/bootstrap.min.js
vendored
7
cps/static/js/libs/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
@ -104,6 +104,14 @@
|
||||
</div>
|
||||
{%endif%}
|
||||
{% endfor %}
|
||||
{% if g.current_theme == 1 %}
|
||||
<div id="loader" hidden="true">
|
||||
<center>
|
||||
<h3>{{_('Uploading...')}}</h3>
|
||||
<span>{{_("please don't refresh the page")}}</span>.
|
||||
</center>
|
||||
</div>
|
||||
{%endif%}
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
{% if g.user.is_authenticated or g.user.is_anonymous %}
|
||||
|
Loading…
Reference in New Issue
Block a user