1
0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 09:30:31 +00:00

Merge remote-tracking branch 'caliblur/issue/caliblur-1560' into master

This commit is contained in:
Ozzieisaacs 2020-10-11 12:43:21 +02:00
commit 99fda00442
2 changed files with 22 additions and 4 deletions

View File

@ -831,7 +831,10 @@ body:not(.read-frame) {
font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
font-weight: 400;
overflow: hidden;
margin: 0
margin: 0;
/* scroll bar fix for firefox */
scrollbar-color: hsla(0, 0%, 100%, .2) transparent;
scrollbar-width: thin;
}
body > div.navbar.navbar-default.navbar-static-top > div > form > div {
@ -3506,6 +3509,20 @@ body.shelf > div.container-fluid > div > div.col-sm-10 > div.discover > h2 {
padding-right: 25px !important
}
body.shelf-down > .discover > h2 {
color: inherit;
margin-bottom: 20px;
}
body.shelf-down > .discover > .row > .book.col-sm-3.col-lg-2.col-xs-6 {
max-width: 225px !important;
width: 225px !important;
}
body.shelf-down .btn-group button#btnGroupDrop1 {
height: 50px;
}
.author > .container-fluid > .row-fluid > .col-sm-10 > h2:before, .plexBack > a {
-moz-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;

View File

@ -12,8 +12,9 @@
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
{% if g.user.get_theme == 1 %}
<link href="{{ url_for('static', filename='css/caliBlur-style.css') }}" rel="stylesheet" media="screen">
{% if g.current_theme == 1 %}
<link href="{{ url_for('static', filename='css/caliBlur.css') }}" rel="stylesheet" media="screen">
<link href="{{ url_for('static', filename='css/caliBlur_override.css') }}" rel="stylesheet" media="screen">
{% endif %}
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@ -24,7 +25,7 @@
{% block header %}{% endblock %}
</head>
<body class="{{ page }}">
<body class="{{ page }} shelf-down">
{% block body %}
<div class="discover">
<h2>{{title}}</h2>