mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-25 17:40:31 +00:00
Code Issues Releases Wiki Activity

Some code cosmetics

Browse Source
This commit is contained in:
Ozzie Isaacs 2021-03-14 14:05:36 +01:00
parent 725fc658f8
commit 9b80c84794
3 changed files with 98 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
cps/static/css/main.css
View File

@ -35,7 +35,6 @@ body {
height: 8%; height: 8%;
min-height: 20px; min-height: 20px;
padding: 10px; padding: 10px;
/* margin: 0 50px 0 50px; */
position: relative; position: relative;
color: #4f4f4f; color: #4f4f4f;
font-weight: 100; font-weight: 100;
@ -114,7 +113,7 @@ body {
top: 50%; top: 50%;
margin-top: -192px; margin-top: -192px;
font-size: 64px; font-size: 64px;
color: #E2E2E2; color: #e2e2e2;
font-family: arial, sans-serif; font-family: arial, sans-serif;
font-weight: bold; font-weight: bold;
cursor: pointer; cursor: pointer;
@ -148,12 +147,6 @@ body {
overflow: hidden; overflow: hidden;
} }
#sidebar.open {
/* left: 0; */
/* -webkit-transform: translate(0, 0);
-moz-transform: translate(0, 0); */
}
#main.closed { #main.closed {
/* left: 300px; */ /* left: 300px; */
-webkit-transform: translate(300px, 0); -webkit-transform: translate(300px, 0);
@ -238,7 +231,7 @@ input:-moz-placeholder { color: #454545; }
left: 50%; left: 50%;
margin-left: -1px; margin-left: -1px;
top: 10%; top: 10%;
opacity: .15; opacity: 0.15;
box-shadow: -2px 0 15px rgba(0, 0, 0, 1); box-shadow: -2px 0 15px rgba(0, 0, 0, 1);
display: none; display: none;
} }
@ -291,7 +284,7 @@ input:-moz-placeholder { color: #454545; }
#tocView li, #tocView li,
#bookmarksView li { #bookmarksView li {
margin-bottom:10px; margin-bottom: 10px;
width: 225px; width: 225px;
font-family: Georgia, "Times New Roman", Times, serif; font-family: Georgia, "Times New Roman", Times, serif;
list-style: none; list-style: none;
@ -299,8 +292,7 @@ input:-moz-placeholder { color: #454545; }
} }
#tocView li:active, #tocView li:active,
#tocView li.currentChapter #tocView li.currentChapter {
{
list-style: none; list-style: none;
} }
@ -319,7 +311,7 @@ input:-moz-placeholder { color: #454545; }
.list_item.currentChapter > a, .list_item.currentChapter > a,
.list_item a:hover { .list_item a:hover {
color: #f1f1f1 color: #f1f1f1;
} }
/* #tocView li.openChapter > a, */ /* #tocView li.openChapter > a, */
@ -328,7 +320,7 @@ input:-moz-placeholder { color: #454545; }
} }
.list_item ul { .list_item ul {
padding-left:10px; padding-left: 10px;
margin-top: 8px; margin-top: 8px;
display: none; display: none;
} }
@ -414,7 +406,7 @@ input:-moz-placeholder { color: #454545; }
} }
#notes { #notes {
padding: 0 0 0 34px; padding: 0 0 0 34px;
} }
#notes li { #notes li {
@ -449,8 +441,9 @@ input:-moz-placeholder { color: #454545; }
border-radius: 5px; border-radius: 5px;
} }
#note-text[disabled], #note-text[disabled="disabled"]{ #note-text[disabled],
opacity: 0.5; #note-text[disabled="disabled"]{
opacity: 0.5;
} }
#note-anchor { #note-anchor {
@ -478,13 +471,13 @@ input:-moz-placeholder { color: #454545; }
color: #f1f1f1; color: #f1f1f1;
} }
#settingsPanel .xsmall { font-size: x-small; } #settingsPanel .xsmall { font-size: x-small; }
#settingsPanel .small { font-size: small; } #settingsPanel .small { font-size: small; }
#settingsPanel .medium { font-size: medium; } #settingsPanel .medium { font-size: medium; }
#settingsPanel .large { font-size: large; } #settingsPanel .large { font-size: large; }
#settingsPanel .xlarge { font-size: x-large; } #settingsPanel .xlarge { font-size: x-large; }
.highlight { background-color: yellow } .highlight { background-color: yellow; }
.modal { .modal {
position: fixed; position: fixed;
@ -496,7 +489,6 @@ input:-moz-placeholder { color: #454545; }
visibility: hidden; visibility: hidden;
margin-left: -320px; margin-left: -320px;
margin-top: -160px; margin-top: -160px;
} }
.overlay { .overlay {
@ -515,12 +507,12 @@ input:-moz-placeholder { color: #454545; }
} }
.md-show { .md-show {
visibility: visible; visibility: visible;
} }
.md-show ~ .overlay { .md-show ~ .overlay {
opacity: 1; opacity: 1;
visibility: visible; visibility: visible;
} }
/* Content styles */ /* Content styles */
@ -600,7 +592,7 @@ input:-moz-placeholder { color: #454545; }
} }
@media only screen and (max-width: 1040px) and (orientation: portrait) { @media only screen and (max-width: 1040px) and (orientation: portrait) {
#viewer{ #viewer {
width: 80%; width: 80%;
margin-left: 10%; margin-left: 10%;
} }
@ -612,7 +604,7 @@ input:-moz-placeholder { color: #454545; }
} }
@media only screen and (max-width: 900px) { @media only screen and (max-width: 900px) {
#viewer{ #viewer {
width: 60%; width: 60%;
margin-left: 20%; margin-left: 20%;
} }
@ -651,9 +643,9 @@ input:-moz-placeholder { color: #454545; }
-webkit-transform: translate(0, 0); -webkit-transform: translate(0, 0);
-moz-transform: translate(0, 0); -moz-transform: translate(0, 0);
-ms-transform: translate(0, 0); -ms-transform: translate(0, 0);
-webkit-transition: -webkit-transform .3s; -webkit-transition: -webkit-transform 0.3s;
-moz-transition: -moz-transform .3s; -moz-transition: -moz-transform 0.3s;
transition: -moz-transform .3s; transition: -moz-transform 0.3s;
} }
#main.closed { #main.closed {
@ -679,12 +671,11 @@ input:-moz-placeholder { color: #454545; }
font-size: 12px; font-size: 12px;
} }
#tocView > ul{ #tocView > ul {
padding-left: 10px; padding-left: 10px;
} }
} }
/* For iPad portrait layouts only */ /* For iPad portrait layouts only */
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: portrait) { @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: portrait) {
#viewer iframe { #viewer iframe {
@ -692,20 +683,13 @@ input:-moz-placeholder { color: #454545; }
height: 740px; height: 740px;
} }
} }
/*For iPad landscape layouts only *//*
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) {
#viewer iframe {
width: 460px;
height: 415px;
}
}*/
@media only screen @media only screen
and (min-device-width : 768px) and (min-device-width : 768px)
and (max-device-width : 1024px) and (max-device-width : 1024px)
and (orientation : landscape) and (orientation : landscape)
/*and (-webkit-min-device-pixel-ratio: 2)*/ { /*and (-webkit-min-device-pixel-ratio: 2)*/ {
#viewer{ #viewer {
width: 80%; width: 80%;
margin-left: 10%; margin-left: 10%;
} }
@ -718,8 +702,8 @@ and (orientation : landscape)
/*For iPad landscape layouts only */ /*For iPad landscape layouts only */
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) { @media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: landscape) {
#viewer iframe { #viewer iframe {
width: 960px; width: 960px;
height: 515px; height: 515px;
} }
} }
@ -762,8 +746,8 @@ and (orientation : landscape)
/* For iPhone landscape layouts only */ /* For iPhone landscape layouts only */
@media only screen and (max-device-width: 374px) and (orientation: landscape) { @media only screen and (max-device-width: 374px) and (orientation: landscape) {
#viewer iframe { #viewer iframe {
width: 256px; width: 256px;
height: 124px; height: 124px;
} }
} }

82
cps/static/css/style.css
View File

@ -51,7 +51,11 @@ body h2 {
color: #444; color: #444;
} }
a, .danger, .book-remove, .editable-empty, .editable-empty:hover { color: #45b29d; } a,
.danger,
.book-remove,
.editable-empty,
.editable-empty:hover { color: #45b29d; }
.book-remove:hover { color: #23527c; } .book-remove:hover { color: #23527c; }
@ -66,7 +70,9 @@ a, .danger, .book-remove, .editable-empty, .editable-empty:hover { color: #45b29
color: #45b29d; color: #45b29d;
} }
.editable-click, a.editable-click, a.editable-click:hover { border-bottom: None; } .editable-click,
a.editable-click,
a.editable-click:hover { border-bottom: None; }
.navigation .nav-head { .navigation .nav-head {
text-transform: uppercase; text-transform: uppercase;
@ -122,6 +128,7 @@ a, .danger, .book-remove, .editable-empty, .editable-empty:hover { color: #45b29
.container-fluid .discover { margin-bottom: 50px; } .container-fluid .discover { margin-bottom: 50px; }
.container-fluid .new-books { border-top: 1px solid #ccc; } .container-fluid .new-books { border-top: 1px solid #ccc; }
.container-fluid .new-books h2 { margin: 50px 0 0 0; } .container-fluid .new-books h2 { margin: 50px 0 0 0; }
.container-fluid .book { .container-fluid .book {
margin-top: 20px; margin-top: 20px;
display: flex; display: flex;
@ -216,7 +223,7 @@ span.glyphicon.glyphicon-tags {
.navbar-default .navbar-toggle { border-color: #000; } .navbar-default .navbar-toggle { border-color: #000; }
.cover { margin-bottom: 10px; } .cover { margin-bottom: 10px; }
.cover .badge{ .cover .badge {
position: absolute; position: absolute;
top: 2px; top: 2px;
left: 2px; left: 2px;
@ -224,7 +231,8 @@ span.glyphicon.glyphicon-tags {
border-radius: 10px; border-radius: 10px;
background-color: #fff; background-color: #fff;
} }
.cover .read{
.cover .read {
left: auto; left: auto;
right: 2px; right: 2px;
width: 17px; width: 17px;
@ -239,7 +247,10 @@ span.glyphicon.glyphicon-tags {
max-height: 200px; max-height: 200px;
} }
.btn-file { position: relative; overflow: hidden; } .btn-file {
position: relative;
overflow: hidden;
}
.btn-file input[type=file] { .btn-file input[type=file] {
position: absolute; position: absolute;
@ -275,26 +286,44 @@ fieldset[disabled] .btn-primary,
fieldset[disabled] .btn-primary:hover, fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus, .btn-primary.disabled:focus,
.btn-primary[disabled]:focus, .btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; } fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active { background-color: #89b9e2; }
.btn-toolbar > .btn+.btn, .btn-toolbar > .btn + .btn,
.btn-toolbar > .btn-group+.btn, .btn-toolbar > .btn-group + .btn,
.btn-toolbar > .btn+.btn-group, .btn-toolbar > .btn + .btn-group,
.btn-toolbar > .btn-group+.btn-group { margin-left: 0; } .btn-toolbar > .btn-group + .btn-group { margin-left: 0; }
.panel-body { background-color: #f5f5f5; } .panel-body { background-color: #f5f5f5; }
.spinner { margin: 0 41%; } .spinner { margin: 0 41%; }
.spinner2 { margin: 0 41%; } .spinner2 { margin: 0 41%; }
.intend-form { margin-left:20px; } .intend-form { margin-left: 20px; }
table .bg-dark-danger { background-color: #d9534f; color: #fff; }
table .bg-dark-danger {
background-color: #d9534f;
color: #fff;
}
table .bg-dark-danger a { color: #fff; } table .bg-dark-danger a { color: #fff; }
table .bg-dark-danger:hover { background-color: #c9302c; } table .bg-dark-danger:hover { background-color: #c9302c; }
table .bg-primary:hover { background-color: #1c5484; } table .bg-primary:hover { background-color: #1c5484; }
table .bg-primary a { color: #fff; } table .bg-primary a { color: #fff; }
.block-label { display: block; } .block-label { display: block; }
.fake-input { position: absolute; pointer-events: none; top: 0; }
input.pill { position: absolute; opacity: 0; } .fake-input {
position: absolute;
pointer-events: none;
top: 0;
}
input.pill {
position: absolute;
opacity: 0;
}
input.pill + label { input.pill + label {
border: 2px solid #45b29d; border: 2px solid #45b29d;
@ -317,11 +346,24 @@ input.pill:checked + label {
input.pill:not(:checked) + label .glyphicon { display: none; } input.pill:not(:checked) + label .glyphicon { display: none; }
.author-bio img { margin: 0 1em 1em 0; } .author-bio img { margin: 0 1em 1em 0; }
.author-link { display: inline-block; margin-top: 10px; width: 100px; }
.author-link img { display: block; height: 100%; }
#remove-from-shelves .btn, #shelf-action-errors { margin-left: 5px; }
.tags_click, .serie_click, .language_click { margin-right: 5px; } .author-link {
display: inline-block;
margin-top: 10px;
width: 100px;
}
.author-link img {
display: block;
height: 100%;
}
#remove-from-shelves .btn,
#shelf-action-errors { margin-left: 5px; }
.tags_click,
.serie_click,
.language_click { margin-right: 5px; }
#meta-info { #meta-info {
height: 600px; height: 600px;
@ -344,11 +386,11 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
#btn-upload-cover { display: none; } #btn-upload-cover { display: none; }
.panel-title > a { text-decoration: none; } .panel-title > a { text-decoration: none; }
.editable-buttons { .editable-buttons {
display:inline-block; display: inline-block;
margin-left: 7px; margin-left: 7px;
} }
.editable-input { display:inline-block; } .editable-input { display: inline-block; }
.editable-cancel { .editable-cancel {
margin-bottom: 0 !important; margin-bottom: 0 !important;

12
cps/static/js/edit_books.js
View File

@ -1,7 +1,7 @@
/** /**
* Created by SpeedProg on 05.04.2015. * Created by SpeedProg on 05.04.2015.
*/ */
/* global Bloodhound, language, Modernizr, tinymce */ /* global Bloodhound, language, Modernizr, tinymce, getPath */
if ($("#description").length) { if ($("#description").length) {
tinymce.init({ tinymce.init({
@ -250,14 +250,14 @@ promisePublishers.done(function() {
}); });
$("#search").on("change input.typeahead:selected", function(event) { $("#search").on("change input.typeahead:selected", function(event) {
if (event.target.type == "search" && event.target.tagName == "INPUT") { if (event.target.type === "search" && event.target.tagName === "INPUT") {
return; return;
} }
var form = $("form").serialize(); var form = $("form").serialize();
$.getJSON( getPath() + "/get_matching_tags", form, function( data ) { $.getJSON( getPath() + "/get_matching_tags", form, function( data ) {
$(".tags_click").each(function() { $(".tags_click").each(function() {
if ($.inArray(parseInt($(this).val(), 10), data.tags) === -1) { if ($.inArray(parseInt($(this).val(), 10), data.tags) === -1) {
if(!$(this).prop("selected")) { if (!$(this).prop("selected")) {
$(this).prop("disabled", true); $(this).prop("disabled", true);
} }
} else { } else {
@ -265,10 +265,10 @@ $("#search").on("change input.typeahead:selected", function(event) {
} }
}); });
$("#include_tag option:selected").each(function () { $("#include_tag option:selected").each(function () {
$("#exclude_tag").find("[value="+$(this).val()+"]").prop("disabled", true); $("#exclude_tag").find("[value="+$(this).val() + "]").prop("disabled", true);
}); });
$('#include_tag').selectpicker("refresh"); $("#include_tag").selectpicker("refresh");
$('#exclude_tag').selectpicker("refresh"); $("#exclude_tag").selectpicker("refresh");
}); });
}); });