merge changes

This commit is contained in:
cbartondock
2021-03-15 21:08:41 -04:00
30 changed files with 1125 additions and 949 deletions
+21 -19
View File
@@ -1,22 +1,24 @@
body.serieslist.grid-view div.container-fluid>div>div.col-sm-10:before{
display: none;
}
.cover .badge{
position: absolute;
top: 0;
left: 0;
color: #fff;
background-color: #cc7b19;
border-radius: 0;
padding: 0 8px;
box-shadow: 0 0 4px rgba(0,0,0,.6);
line-height: 24px;
}
.cover{
box-shadow: 0 0 4px rgba(0,0,0,.6);
body.serieslist.grid-view div.container-fluid > div > div.col-sm-10::before {
display: none;
}
.cover .read{
padding: 0 0px;
line-height: 15px;
.cover .badge {
position: absolute;
top: 0;
left: 0;
color: #fff;
background-color: #cc7b19;
border-radius: 0;
padding: 0 8px;
box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
line-height: 24px;
}
.cover {
box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
}
.cover .read {
padding: 0 0;
line-height: 15px;
}
+2 -3
View File
@@ -33,7 +33,6 @@ body {
position: relative;
cursor: pointer;
padding: 4px;
transition: all 0.2s ease;
}
@@ -45,7 +44,7 @@ body {
#sidebar a.active,
#sidebar a.active img + span {
background-color: #45B29D;
background-color: #45b29d;
}
#sidebar li img {
@@ -99,7 +98,7 @@ body {
background-color: #ccc;
}
#progress .bar-read {
#progress .bar-read {
color: #fff;
background-color: #45b29d;
}
+3 -10
View File
@@ -66,19 +66,12 @@ body {
right: 40px;
}
xmp,
pre,
plaintext {
display: block;
font-family: -moz-fixed;
white-space: pre;
margin: 1em 0;
}
pre {
display: block;
margin: 1em 0;
white-space: pre-wrap;
word-wrap: break-word;
font-family: -moz-fixed;
font-family: -moz-fixed, sans-serif;
column-count: 2;
-webkit-columns: 2;
-moz-columns: 2;
+202 -218
View File
@@ -35,7 +35,6 @@ body {
height: 8%;
min-height: 20px;
padding: 10px;
/* margin: 0 50px 0 50px; */
position: relative;
color: #4f4f4f;
font-weight: 100;
@@ -73,6 +72,16 @@ body {
padding: 3px;
}
#panels a {
visibility: hidden;
width: 18px;
height: 20px;
overflow: hidden;
display: inline-block;
color: #ccc;
margin-left: 6px;
}
#titlebar a:active {
opacity: 1;
color: rgba(0, 0, 0, 0.6);
@@ -114,7 +123,7 @@ body {
top: 50%;
margin-top: -192px;
font-size: 64px;
color: #E2E2E2;
color: #e2e2e2;
font-family: arial, sans-serif;
font-weight: bold;
cursor: pointer;
@@ -148,12 +157,6 @@ body {
overflow: hidden;
}
#sidebar.open {
/* left: 0; */
/* -webkit-transform: translate(0, 0);
-moz-transform: translate(0, 0); */
}
#main.closed {
/* left: 300px; */
-webkit-transform: translate(300px, 0);
@@ -196,19 +199,24 @@ body {
#title-controls { float: right; }
#panels a {
visibility: hidden;
width: 18px;
height: 20px;
overflow: hidden;
display: inline-block;
color: #ccc;
margin-left: 6px;
}
#panels a::before { visibility: visible; }
#panels a:hover { color: #aaa; }
.list_item.currentChapter > a,
.list_item a:hover {
color: #f1f1f1;
}
.list_item a {
color: #aaa;
text-decoration: none;
}
#searchResults a {
color: #aaa;
text-decoration: none;
}
#panels a:active {
color: #aaa;
margin: 1px 0 -1px 6px;
@@ -238,7 +246,7 @@ input:-moz-placeholder { color: #454545; }
left: 50%;
margin-left: -1px;
top: 10%;
opacity: .15;
opacity: 0.15;
box-shadow: -2px 0 15px rgba(0, 0, 0, 1);
display: none;
}
@@ -281,6 +289,17 @@ input:-moz-placeholder { color: #454545; }
display: block;
}
.list_item ul {
padding-left: 10px;
margin-top: 8px;
display: none;
}
.list_item.currentChapter > ul,
.list_item.openChapter > ul {
display: block;
}
#tocView > ul,
#bookmarksView > ul {
margin-top: 15px;
@@ -291,22 +310,41 @@ input:-moz-placeholder { color: #454545; }
#tocView li,
#bookmarksView li {
margin-bottom:10px;
margin-bottom: 10px;
width: 225px;
font-family: Georgia, "Times New Roman", Times, serif;
list-style: none;
text-transform: capitalize;
}
#tocView li:active,
#tocView li.currentChapter
{
.md-content > div ul li {
padding: 5px 0;
}
#settingsPanel li {
font-size: 1em;
color: #f1f1f1;
}
#searchResults li {
margin-bottom: 10px;
width: 225px;
font-family: Georgia, "Times New Roman", Times, serif;
list-style: none;
}
.list_item a {
color: #aaa;
text-decoration: none;
#notes li {
color: #eee;
font-size: 12px;
width: 240px;
border-top: 1px #fff solid;
padding-top: 6px;
margin-bottom: 6px;
}
#tocView li:active,
#tocView li.currentChapter {
list-style: none;
}
.list_item a.chapter {
@@ -317,27 +355,11 @@ input:-moz-placeholder { color: #454545; }
font-size: 0.8em;
}
.list_item.currentChapter > a,
.list_item a:hover {
color: #f1f1f1
}
/* #tocView li.openChapter > a, */
.list_item a:hover {
color: #e2e2e2;
}
.list_item ul {
padding-left:10px;
margin-top: 8px;
display: none;
}
.list_item.currentChapter > ul,
.list_item.openChapter > ul {
display: block;
}
#tocView.hidden {
display: none;
}
@@ -352,14 +374,14 @@ input:-moz-placeholder { color: #454545; }
user-select: none;
}
.toc_toggle:before {
.toc_toggle::before {
content: '▸';
color: #fff;
margin-right: -4px;
}
.currentChapter > .toc_toggle:before,
.openChapter > .toc_toggle:before {
.currentChapter > .toc_toggle::before,
.openChapter > .toc_toggle::before {
content: '▾';
}
@@ -377,18 +399,6 @@ input:-moz-placeholder { color: #454545; }
display: block;
}
#searchResults li {
margin-bottom:10px;
width: 225px;
font-family: Georgia, "Times New Roman", Times, serif;
list-style: none;
}
#searchResults a {
color: #aaa;
text-decoration: none;
}
#searchResults p {
text-decoration: none;
font-size: 12px;
@@ -400,10 +410,21 @@ input:-moz-placeholder { color: #454545; }
color: #000;
}
.md-content > div p {
margin: 0;
padding: 10px 0;
}
#searchResults li > p {
color: #aaa;
}
#notes li a {
color: #fff;
display: inline-block;
margin-left: 6px;
}
#searchResults li a:hover {
color: #e2e2e2;
}
@@ -414,22 +435,7 @@ input:-moz-placeholder { color: #454545; }
}
#notes {
padding: 0 0 0 34px;
}
#notes li {
color: #eee;
font-size: 12px;
width: 240px;
border-top: 1px #fff solid;
padding-top: 6px;
margin-bottom: 6px;
}
#notes li a {
color: #fff;
display: inline-block;
margin-left: 6px;
padding: 0 0 0 34px;
}
#notes li a:hover {
@@ -449,8 +455,9 @@ input:-moz-placeholder { color: #454545; }
border-radius: 5px;
}
#note-text[disabled], #note-text[disabled="disabled"]{
opacity: 0.5;
#note-text[disabled],
#note-text[disabled="disabled"] {
opacity: 0.5;
}
#note-anchor {
@@ -462,6 +469,22 @@ input:-moz-placeholder { color: #454545; }
display: none;
}
.md-content h3 {
margin: 0;
padding: 6px;
text-align: center;
font-size: 22px;
font-weight: 300;
opacity: 0.8;
background: rgba(0, 0, 0, 0.1);
border-radius: 3px 3px 0 0;
}
.md-content > div ul {
margin: 0;
padding: 0 0 30px 20px;
}
#settingsPanel h3 {
color: #f1f1f1;
font-family: Georgia, "Times New Roman", Times, serif;
@@ -473,31 +496,24 @@ input:-moz-placeholder { color: #454545; }
list-style-type: none;
}
#settingsPanel li {
font-size: 1em;
color: #f1f1f1;
}
#settingsPanel .xsmall { font-size: x-small; }
#settingsPanel .small { font-size: small; }
#settingsPanel .medium { font-size: medium; }
#settingsPanel .large { font-size: large; }
#settingsPanel .xlarge { font-size: x-large; }
#settingsPanel .xsmall { font-size: x-small; }
#settingsPanel .small { font-size: small; }
#settingsPanel .medium { font-size: medium; }
#settingsPanel .large { font-size: large; }
#settingsPanel .xlarge { font-size: x-large; }
.highlight { background-color: yellow }
.highlight { background-color: yellow; }
.modal {
position: fixed;
top: 50%;
left: 50%;
// width: 50%;
width: 630px;
height: auto;
z-index: 2000;
visibility: hidden;
margin-left: -320px;
margin-top: -160px;
}
.overlay {
@@ -516,12 +532,12 @@ input:-moz-placeholder { color: #454545; }
}
.md-show {
visibility: visible;
visibility: visible;
}
.md-show ~ .overlay {
opacity: 1;
visibility: visible;
opacity: 1;
visibility: visible;
}
/* Content styles */
@@ -534,17 +550,6 @@ input:-moz-placeholder { color: #454545; }
height: 320px;
}
.md-content h3 {
margin: 0;
padding: 6px;
text-align: center;
font-size: 22px;
font-weight: 300;
opacity: 0.8;
background: rgba(0, 0, 0, 0.1);
border-radius: 3px 3px 0 0;
}
.md-content > div {
padding: 15px 40px 30px;
margin: 0;
@@ -552,20 +557,6 @@ input:-moz-placeholder { color: #454545; }
font-size: 14px;
}
.md-content > div p {
margin: 0;
padding: 10px 0;
}
.md-content > div ul {
margin: 0;
padding: 0 0 30px 20px;
}
.md-content > div ul li {
padding: 5px 0;
}
.md-content button {
display: block;
margin: 0 auto;
@@ -593,7 +584,6 @@ input:-moz-placeholder { color: #454545; }
}
.md-content > .closer {
//font-size: 18px;
position: absolute;
right: 0;
top: 0;
@@ -602,7 +592,7 @@ input:-moz-placeholder { color: #454545; }
}
@media only screen and (max-width: 1040px) and (orientation: portrait) {
#viewer{
#viewer {
width: 80%;
margin-left: 10%;
}
@@ -614,7 +604,7 @@ input:-moz-placeholder { color: #454545; }
}
@media only screen and (max-width: 900px) {
#viewer{
#viewer {
width: 60%;
margin-left: 20%;
}
@@ -629,7 +619,7 @@ input:-moz-placeholder { color: #454545; }
}
@media only screen and (max-width: 550px) {
#viewer{
#viewer {
width: 80%;
margin-left: 10%;
}
@@ -653,9 +643,9 @@ input:-moz-placeholder { color: #454545; }
-webkit-transform: translate(0, 0);
-moz-transform: translate(0, 0);
-ms-transform: translate(0, 0);
-webkit-transition: -webkit-transform .3s;
-moz-transition: -moz-transform .3s;
transition: -moz-transform .3s;
-webkit-transition: -webkit-transform 0.3s;
-moz-transition: -moz-transform 0.3s;
transition: -moz-transform 0.3s;
}
#main.closed {
@@ -664,11 +654,6 @@ input:-moz-placeholder { color: #454545; }
-ms-transform: translate(260px, 0);
}
#titlebar {
/* font-size: 16px; */
/* margin: 0 50px 0 50px; */
}
#metainfo {
font-size: 10px;
}
@@ -681,130 +666,129 @@ input:-moz-placeholder { color: #454545; }
font-size: 12px;
}
#tocView > ul{
#tocView > ul {
padding-left: 10px;
}
}
/* For iPad portrait layouts only */
@media only screen and (min-device-width: 481px) and (max-device-width: 1024px) and (orientation: portrait) {
#viewer iframe {
width: 460px;
height: 740px;
}
#viewer iframe {
width: 460px;
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
and (min-device-width : 768px)
and (max-device-width : 1024px)
and (orientation : landscape)
/*and (-webkit-min-device-pixel-ratio: 2)*/ {
#viewer{
and (min-device-width: 768px)
and (max-device-width: 1024px)
and (orientation: landscape)
/* and (-webkit-min-device-pixel-ratio: 2)*/ {
#viewer {
width: 80%;
margin-left: 10%;
}
#divider,
#divider.show {
display: none;
}
}
/*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) {
#viewer iframe {
width: 960px;
height: 515px;
}
#viewer iframe {
width: 960px;
height: 515px;
}
}
/* For iPhone 6\6s portrait layouts only */
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation: portrait) {
#viewer {
width: 300px;
height: 480px;
}
#viewer iframe {
width: 300px;
height: 480px;
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) {
#viewer {
width: 300px;
height: 480px;
}
#viewer iframe {
width: 300px;
height: 480px;
}
}
/* For iPhone 6\6s landscape layouts only */
@media only screen and (min-device-width : 375px) and (max-device-width : 667px) and (orientation: landscape) {
#viewer {
width: 450px;
height: 300px;
}
#viewer iframe {
width: 450px;
height: 300px;
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) {
#viewer {
width: 450px;
height: 300px;
}
#viewer iframe {
width: 450px;
height: 300px;
}
}
/* For iPhone portrait layouts only */
@media only screen and (max-device-width: 374px) and (orientation: portrait) {
#viewer {
width: 256px;
height: 432px;
}
#viewer iframe {
width: 256px;
height: 432px;
}
#viewer {
width: 256px;
height: 432px;
}
#viewer iframe {
width: 256px;
height: 432px;
}
}
/* For iPhone landscape layouts only */
@media only screen and (max-device-width: 374px) and (orientation: landscape) {
#viewer iframe {
width: 256px;
height: 124px;
}
#viewer iframe {
width: 256px;
height: 124px;
}
}
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontello", serif;
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: 0.2em;
text-align: center;
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* you can be more comfortable with increased icons size */
font-size: 112%;
[class^="icon-"]::before,
[class*=" icon-"]::before {
font-family: "fontello", serif;
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: 0.2em;
text-align: center;
/* For safety - reset parent styles, that can break glyph codes */
font-variant: normal;
text-transform: none;
/* you can be more comfortable with increased icons size */
font-size: 112%;
}
.icon-search:before { content: '\e807'; } /* '' */
.icon-resize-full-1:before { content: '\e804'; } /* '' */
.icon-cancel-circled2:before { content: '\e80f'; } /* '' */
.icon-link:before { content: '\e80d'; } /* '' */
.icon-bookmark:before { content: '\e805'; } /* '' */
.icon-bookmark-empty:before { content: '\e806'; } /* '' */
.icon-download-cloud:before { content: '\e811'; } /* '' */
.icon-edit:before { content: '\e814'; } /* '' */
.icon-menu:before { content: '\e802'; } /* '' */
.icon-cog:before { content: '\e813'; } /* '' */
.icon-resize-full:before { content: '\e812'; } /* '' */
.icon-cancel-circled:before { content: '\e80e'; } /* '' */
.icon-up-dir:before { content: '\e80c'; } /* '' */
.icon-right-dir:before { content: '\e80b'; } /* '' */
.icon-angle-right:before { content: '\e809'; } /* '' */
.icon-angle-down:before { content: '\e80a'; } /* '' */
.icon-right:before { content: '\e815'; } /* '' */
.icon-list-1:before { content: '\e803'; } /* '' */
.icon-list-numbered:before { content: '\e801'; } /* '' */
.icon-columns:before { content: '\e810'; } /* '' */
.icon-list:before { content: '\e800'; } /* '' */
.icon-resize-small:before { content: '\e808'; } /* '' */
.icon-search::before { content: '\e807'; } /* '' */
.icon-resize-full-1::before { content: '\e804'; } /* '' */
.icon-cancel-circled2::before { content: '\e80f'; } /* '' */
.icon-link::before { content: '\e80d'; } /* '' */
.icon-bookmark::before { content: '\e805'; } /* '' */
.icon-bookmark-empty::before { content: '\e806'; } /* '' */
.icon-download-cloud::before { content: '\e811'; } /* '' */
.icon-edit::before { content: '\e814'; } /* '' */
.icon-menu::before { content: '\e802'; } /* '' */
.icon-cog::before { content: '\e813'; } /* '' */
.icon-resize-full::before { content: '\e812'; } /* '' */
.icon-cancel-circled::before { content: '\e80e'; } /* '' */
.icon-up-dir::before { content: '\e80c'; } /* '' */
.icon-right-dir::before { content: '\e80b'; } /* '' */
.icon-angle-right::before { content: '\e809'; } /* '' */
.icon-angle-down::before { content: '\e80a'; } /* '' */
.icon-right::before { content: '\e815'; } /* '' */
.icon-list-1::before { content: '\e803'; } /* '' */
.icon-list-numbered::before { content: '\e801'; } /* '' */
.icon-columns::before { content: '\e810'; } /* '' */
.icon-list::before { content: '\e800'; } /* '' */
.icon-resize-small::before { content: '\e808'; } /* '' */
+142 -81
View File
@@ -1,7 +1,7 @@
.tooltip.bottom .tooltip-inner {
font-size: 13px;
font-family: Open Sans Semibold,Helvetica Neue,Helvetica,Arial,sans-serif;
font-family: Open Sans Semibold, Helvetica Neue, Helvetica, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
padding: 3px 10px;
@@ -28,6 +28,11 @@ html.http-error {
height: 100%;
}
body {
background: #f2f2f2;
margin-bottom: 40px;
}
.http-error body {
margin: 0;
height: 100%;
@@ -41,32 +46,39 @@ html.http-error {
text-align: center;
}
body {
background: #f2f2f2;
margin-bottom: 40px;
}
body h2 {
font-weight: normal;
color:#444;
color: #444;
}
a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d; }
.book-remove:hover { color: #23527c; }
a,
.danger,
.book-remove,
.editable-empty,
.editable-empty:hover { color: #45b29d; }
.user-remove:hover { color: #23527c; }
.btn-default a { color: #444; }
.panel-title > a { text-decoration: none; }
.navigation li a {
color: #444;
text-decoration: none;
display: block;
padding: 10px;
}
.btn-default a:hover {
color: #45b29d;
text-decoration: None;
color: #45b29d;
text-decoration: None;
}
.btn-default:hover {
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 {
text-transform: uppercase;
@@ -79,11 +91,17 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
padding-top: 20px;
}
.navigation li a {
color: #444;
.book-meta .tags a { display: inline; }
table .bg-primary a { color: #fff; }
table .bg-dark-danger a { color: #fff; }
.book-meta .identifiers a { display: inline; }
.navigation .create-shelf a {
color: #fff;
background: #45b29d;
padding: 10px 20px;
border-radius: 5px;
text-decoration: none;
display: block;
padding: 10px;
}
.navigation li a:hover {
@@ -99,14 +117,6 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
text-align: center;
}
.navigation .create-shelf a {
color: #fff;
background: #45b29d;
padding: 10px 20px;
border-radius: 5px;
text-decoration: none;
}
.row.display-flex {
display: flex;
flex-wrap: wrap;
@@ -119,25 +129,41 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
max-height: 100%;
}
.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 h2 { margin: 50px 0 0 0; }
.container-fluid .book {
margin-top: 20px;
display: flex;
flex-direction: column;
}
.cover { margin-bottom: 10px; }
.container-fluid .book .cover {
height: 225px;
position: relative;
}
.author-link img {
display: block;
height: 100%;
}
.container-fluid .book .cover span.img {
bottom: 0;
height: 100%;
position: absolute;
}
.author-bio img { margin: 0 1em 1em 0; }
.container-fluid .single .cover img {
border: 1px solid #fff;
box-sizing: border-box;
-webkit-box-shadow: 0 5px 8px -6px #777;
-moz-box-shadow: 0 5px 8px -6px #777;
box-shadow: 0 5px 8px -6px #777;
}
.container-fluid .book .cover span img {
position: relative;
@@ -152,6 +178,7 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
}
.container-fluid .book .meta { margin-top: 10px; }
.media-body p { text-align: justify; }
.container-fluid .book .meta p { margin: 0; }
.container-fluid .book .meta .title {
@@ -174,9 +201,10 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
.container-fluid .book .meta .rating { margin-top: 5px; }
.rating .glyphicon-star-empty { color: #444; }
.rating .glyphicon-star.good { color: #444; }
.rating-clear .glyphicon-remove { color: #333 }
.rating-clear .glyphicon-remove { color: #333; }
.container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; }
.container-fluid .author .author-hidden,
.container-fluid .author .author-hidden-divider { display: none; }
.navbar-brand {
font-family: 'Grand Hotel', cursive;
@@ -190,7 +218,7 @@ a, .danger,.book-remove, .editable-empty, .editable-empty:hover { color: #45b29d
border-top: 1px solid #ccc;
}
.more-stuff>li { margin-bottom: 10px; }
.more-stuff > li { margin-bottom: 10px; }
.navbar-collapse.in .navbar-nav { margin: 0; }
span.glyphicon.glyphicon-tags {
@@ -200,30 +228,20 @@ span.glyphicon.glyphicon-tags {
}
.book-meta { padding-bottom: 20px; }
.book-meta .tags a { display: inline; }
.book-meta .identifiers a { display: inline; }
.container-fluid .single .cover img {
border: 1px solid #fff;
box-sizing: border-box;
-webkit-box-shadow: 0 5px 8px -6px #777;
-moz-box-shadow: 0 5px 8px -6px #777;
box-shadow: 0 5px 8px -6px #777;
.navbar-default .navbar-toggle .icon-bar { background-color: #000; }
.navbar-default .navbar-toggle { border-color: #000; }
.cover .badge {
position: absolute;
top: 2px;
left: 2px;
color: #000;
border-radius: 10px;
background-color: #fff;
}
.navbar-default .navbar-toggle .icon-bar {background-color: #000; }
.navbar-default .navbar-toggle {border-color: #000; }
.cover { margin-bottom: 10px; }
.cover .badge{
position: absolute;
top: 2px;
left: 2px;
color: #000;
border-radius: 10px;
background-color: #fff;
}
.cover .read{
.cover .read {
left: auto;
right: 2px;
width: 17px;
@@ -231,14 +249,17 @@ span.glyphicon.glyphicon-tags {
display: inline-block;
padding: 2px;
}
.cover-height { max-height: 100px;}
.cover-height { max-height: 100px; }
.col-sm-2 a .cover-small {
margin: 5px;
max-height: 200px;
}
.btn-file {position: relative; overflow: hidden;}
.btn-file {
position: relative;
overflow: hidden;
}
.btn-file input[type=file] {
position: absolute;
@@ -256,24 +277,60 @@ span.glyphicon.glyphicon-tags {
display: block;
}
.btn-toolbar .btn,.discover .btn { margin-bottom: 5px; }
.button-link {color: #fff; }
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .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; }
.btn-toolbar>.btn+.btn, .btn-toolbar>.btn-group+.btn, .btn-toolbar>.btn+.btn-group, .btn-toolbar>.btn-group+.btn-group { margin-left: 0; }
.panel-body {background-color: #f5f5f5; }
.spinner {margin: 0 41%; }
.spinner2 {margin: 0 41%; }
.intend-form { margin-left:20px; }
table .bg-dark-danger {background-color: #d9534f; color: #fff; }
table .bg-dark-danger a {color: #fff; }
table .bg-dark-danger:hover {background-color: #c9302c; }
table .bg-primary:hover {background-color: #1C5484; }
table .bg-primary a {color: #fff; }
.block-label {display: block;}
.fake-input {position: absolute; pointer-events: none; top: 0; }
.btn-toolbar .btn,
.discover .btn { margin-bottom: 5px; }
.button-link { color: #fff; }
input.pill { position: absolute; opacity: 0; }
.btn-primary:hover,
.btn-primary:focus,
.btn-primary:active,
.btn-primary.active,
.open .dropdown-toggle.btn-primary { background-color: #1c5484; }
.btn-primary.disabled,
.btn-primary[disabled],
fieldset[disabled] .btn-primary,
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.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; }
.btn-toolbar > .btn + .btn,
.btn-toolbar > .btn-group + .btn,
.btn-toolbar > .btn + .btn-group,
.btn-toolbar > .btn-group + .btn-group { margin-left: 0; }
.panel-body { background-color: #f5f5f5; }
.spinner { margin: 0 41%; }
.spinner2 { margin: 0 41%; }
.intend-form { margin-left: 20px; }
table .bg-dark-danger {
background-color: #d9534f;
color: #fff;
}
table .bg-dark-danger:hover { background-color: #c9302c; }
table .bg-primary:hover { background-color: #1c5484; }
.block-label { display: block; }
.fake-input {
position: absolute;
pointer-events: none;
top: 0;
}
input.pill {
position: absolute;
opacity: 0;
}
input.pill + label {
border: 2px solid #45b29d;
@@ -295,12 +352,18 @@ input.pill:checked + label {
input.pill:not(:checked) + label .glyphicon { display: none; }
.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; }
.author-link {
display: inline-block;
margin-top: 10px;
width: 100px;
}
.tags_click, .serie_click, .language_click { margin-right: 5px; }
#remove-from-shelves .btn,
#shelf-action-errors { margin-left: 5px; }
.tags_click,
.serie_click,
.language_click { margin-right: 5px; }
#meta-info {
height: 600px;
@@ -308,7 +371,6 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
}
.media-list { padding-right: 15px; }
.media-body p { text-align: justify; }
#meta-info img {
max-height: 150px;
@@ -321,13 +383,13 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
#btn-upload-format { display: none; }
.upload-cover-input-text { display: initial; }
#btn-upload-cover { display: none; }
.panel-title > a { text-decoration: none; }
.editable-buttons {
display:inline-block;
display: inline-block;
margin-left: 7px;
}
.editable-input { display:inline-block; }
.editable-input { display: inline-block; }
.editable-cancel {
margin-bottom: 0 !important;
@@ -354,4 +416,3 @@ div.log {
white-space: nowrap;
padding: 0.5em;
}
+1 -1
View File
@@ -710,7 +710,7 @@ $(".navbar-collapse.collapse.in").before('<div class="sidebar-backdrop"></div>')
// Get rid of leading white space
recentlyAdded = $("#nav_new a:contains('Recently')").text().trim();
$("#nav_new a:contains('Recently')").contents().filter(function () {
return this.nodeType == 3
return this.nodeType === 3
}).each(function () {
this.textContent = this.textContent.replace(" Recently Added", recentlyAdded);
});
+6 -6
View File
@@ -1,7 +1,7 @@
/**
* Created by SpeedProg on 05.04.2015.
*/
/* global Bloodhound, language, Modernizr, tinymce */
/* global Bloodhound, language, Modernizr, tinymce, getPath */
if ($("#description").length) {
tinymce.init({
@@ -250,14 +250,14 @@ promisePublishers.done(function() {
});
$("#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;
}
var form = $("form").serialize();
$.getJSON( getPath() + "/get_matching_tags", form, function( data ) {
$(".tags_click").each(function() {
if ($.inArray(parseInt($(this).val(), 10), data.tags) === -1) {
if(!$(this).prop("selected")) {
if (!$(this).prop("selected")) {
$(this).prop("disabled", true);
}
} else {
@@ -265,10 +265,10 @@ $("#search").on("change input.typeahead:selected", function(event) {
}
});
$("#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");
$('#exclude_tag').selectpicker("refresh");
$("#include_tag").selectpicker("refresh");
$("#exclude_tag").selectpicker("refresh");
});
});
+5 -5
View File
@@ -36,7 +36,6 @@ $("#desc").click(function() {
sortBy: "name",
sortAscending: true
});
return;
});
$("#asc").click(function() {
@@ -52,19 +51,20 @@ $("#asc").click(function() {
sortBy: "name",
sortAscending: false
});
return;
});
$("#all").click(function() {
// go through all elements and make them visible
$list.isotope({ filter: function() {
return true;
} })
}
});
});
$(".char").click(function() {
var character = this.innerText;
$list.isotope({ filter: function() {
return this.attributes["data-id"].value.charAt(0).toUpperCase() == character;
} })
return this.attributes["data-id"].value.charAt(0).toUpperCase() === character;
}
});
});
+2 -2
View File
@@ -88,7 +88,7 @@ $("#desc").click(function() {
// Find count of middle element
var count = $(".row:visible").length;
if (count > 20) {
middle = parseInt(count / 2) + (count % 2);
middle = parseInt(count / 2, 10) + (count % 2);
//var middle = parseInt(count / 2) + (count % 2);
// search for the middle of all visible elements
@@ -135,7 +135,7 @@ $("#asc").click(function() {
// Find count of middle element
var count = $(".row:visible").length;
if (count > 20) {
var middle = parseInt(count / 2) + (count % 2);
var middle = parseInt(count / 2, 10) + (count % 2);
//var middle = parseInt(count / 2) + (count % 2);
// search for the middle of all visible elements
+4 -4
View File
@@ -138,8 +138,8 @@ $(function () {
seriesTitle = result.series.title;
}
var dateFomers = result.pubdate.split("-");
var publishedYear = parseInt(dateFomers[0]);
var publishedMonth = parseInt(dateFomers[1]);
var publishedYear = parseInt(dateFomers[0], 10);
var publishedMonth = parseInt(dateFomers[1], 10);
var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
publishedDate = formatDate(publishedDate);
@@ -194,8 +194,8 @@ $(function () {
} else {
dateFomers = result.date_added.split("-");
}
var publishedYear = parseInt(dateFomers[0]);
var publishedMonth = parseInt(dateFomers[1]);
var publishedYear = parseInt(dateFomers[0], 10);
var publishedMonth = parseInt(dateFomers[1], 10);
var publishedDate = new Date(publishedYear, publishedMonth - 1, 1);
publishedDate = formatDate(publishedDate);
+7 -7
View File
@@ -38,10 +38,10 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
$(document).on("change", "select[data-control]", function() {
var $this = $(this);
var name = $this.data("control");
var showOrHide = parseInt($this.val());
var showOrHide = parseInt($this.val(), 10);
// var showOrHideLast = $("#" + name + " option:last").val()
for (var i = 0; i < $(this)[0].length; i++) {
var element = parseInt($(this)[0][i].value);
var element = parseInt($(this)[0][i].value, 10);
if (element === showOrHide) {
$("[data-related^=" + name + "][data-related*=-" + element + "]").show();
} else {
@@ -55,7 +55,7 @@ $(document).on("change", "select[data-control]", function() {
$(document).on("change", "select[data-controlall]", function() {
var $this = $(this);
var name = $this.data("controlall");
var showOrHide = parseInt($this.val());
var showOrHide = parseInt($this.val(), 10);
if (showOrHide) {
$("[data-related=" + name + "]").show();
} else {
@@ -114,7 +114,7 @@ $(document).ready(function() {
}
});
function ConfirmDialog(id, dataValue, yesFn, noFn) {
function confirmDialog(id, dataValue, yesFn, noFn) {
var $confirm = $("#GeneralDeleteModal");
// var dataValue= e.data('value'); // target.data('value');
$confirm.modal('show');
@@ -481,7 +481,7 @@ $(function() {
});
$("#config_delete_kobo_token").click(function() {
ConfirmDialog(
confirmDialog(
$(this).attr('id'),
$(this).data('value'),
function (value) {
@@ -509,7 +509,7 @@ $(function() {
});
$("#btndeluser").click(function() {
ConfirmDialog(
confirmDialog(
$(this).attr('id'),
$(this).data('value'),
function(value){
@@ -527,7 +527,7 @@ $(function() {
});
$("#delete_shelf").click(function() {
ConfirmDialog(
confirmDialog(
$(this).attr('id'),
$(this).data('value'),
function(value){
+13 -12
View File
@@ -16,6 +16,7 @@
*/
/* exported TableActions, RestrictionActions, EbookActions, responseHandler */
/* global getPath, confirmDialog */
var selections = [];
@@ -209,7 +210,7 @@ $(function() {
striped: false
});
function domain_handle(domainId) {
function domainHandle(domainId) {
$.ajax({
method:"post",
url: window.location.pathname + "/../../ajax/deletedomain",
@@ -236,12 +237,12 @@ $(function() {
}
$("#domain-allow-table").on("click-cell.bs.table", function (field, value, row, $element) {
if (value === 2) {
ConfirmDialog("btndeletedomain", $element.id, domain_handle);
confirmDialog("btndeletedomain", $element.id, domainHandle);
}
});
$("#domain-deny-table").on("click-cell.bs.table", function (field, value, row, $element) {
if (value === 2) {
ConfirmDialog("btndeletedomain", $element.id, domain_handle);
confirmDialog("btndeletedomain", $element.id, domainHandle);
}
});
@@ -255,12 +256,12 @@ $(function() {
$("#h3").addClass("hidden");
$("#h4").addClass("hidden");
});
function startTable(type, user_id) {
function startTable(type, userId) {
$("#restrict-elements-table").bootstrapTable({
formatNoMatches: function () {
return "";
},
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
rowStyle: function(row) {
// console.log('Reihe :' + row + " Index :" + index);
if (row.id.charAt(0) === "a") {
@@ -274,13 +275,13 @@ $(function() {
$.ajax ({
type: "Post",
data: "id=" + row.id + "&type=" + row.type + "&Element=" + encodeURIComponent(row.Element),
url: getPath() + "/ajax/deleterestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/deleterestriction/" + type + "/" + userId,
async: true,
timeout: 900,
success:function() {
$.ajax({
method:"get",
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
async: true,
timeout: 900,
success:function(data) {
@@ -296,7 +297,7 @@ $(function() {
$("#restrict-elements-table").removeClass("table-hover");
$("#restrict-elements-table").on("editable-save.bs.table", function (e, field, row) {
$.ajax({
url: getPath() + "/ajax/editrestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/editrestriction/" + type + "/" + userId,
type: "Post",
data: row
});
@@ -304,13 +305,13 @@ $(function() {
$("[id^=submit_]").click(function() {
$(this)[0].blur();
$.ajax({
url: getPath() + "/ajax/addrestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/addrestriction/" + type + "/" + userId,
type: "Post",
data: $(this).closest("form").serialize() + "&" + $(this)[0].name + "=",
success: function () {
$.ajax ({
method:"get",
url: getPath() + "/ajax/listrestriction/" + type + "/" + user_id,
url: getPath() + "/ajax/listrestriction/" + type + "/" + userId,
async: true,
timeout: 900,
success:function(data) {
@@ -332,12 +333,12 @@ $(function() {
$("#h1").removeClass("hidden");
});
$("#get_user_column_values").on("click", function() {
startTable(3, $(this).data('id'));
startTable(3, $(this).data("id"));
$("#h4").removeClass("hidden");
});
$("#get_user_tags").on("click", function() {
startTable(2, $(this).data('id'));
startTable(2, $(this).data("id"));
$(this)[0].blur();
$("#h3").removeClass("hidden");
});