Merge branch 'master' into development
# Conflicts: # cps/static/css/style.css
This commit is contained in:
Ozzie Isaacs
@@ -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, .6);
|
||||
line-height: 24px;
|
||||
}
|
||||
|
||||
.cover {
|
||||
box-shadow: 0 0 4px rgba(0, 0, 0, .6);
|
||||
}
|
||||
|
||||
.cover .read {
|
||||
padding: 0px 0px;
|
||||
line-height: 15px;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+30
-48
@@ -35,7 +35,6 @@ body {
|
||||
height: 8%;
|
||||
min-height: 20px;
|
||||
padding: 10px;
|
||||
/* margin: 0 50px 0 50px; */
|
||||
position: relative;
|
||||
color: #4f4f4f;
|
||||
font-weight: 100;
|
||||
@@ -114,7 +113,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 +147,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);
|
||||
@@ -238,7 +231,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;
|
||||
}
|
||||
@@ -291,7 +284,7 @@ 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;
|
||||
@@ -299,8 +292,7 @@ input:-moz-placeholder { color: #454545; }
|
||||
}
|
||||
|
||||
#tocView li:active,
|
||||
#tocView li.currentChapter
|
||||
{
|
||||
#tocView li.currentChapter {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
@@ -319,7 +311,7 @@ input:-moz-placeholder { color: #454545; }
|
||||
|
||||
.list_item.currentChapter > a,
|
||||
.list_item a:hover {
|
||||
color: #f1f1f1
|
||||
color: #f1f1f1;
|
||||
}
|
||||
|
||||
/* #tocView li.openChapter > a, */
|
||||
@@ -328,7 +320,7 @@ input:-moz-placeholder { color: #454545; }
|
||||
}
|
||||
|
||||
.list_item ul {
|
||||
padding-left:10px;
|
||||
padding-left: 10px;
|
||||
margin-top: 8px;
|
||||
display: none;
|
||||
}
|
||||
@@ -414,7 +406,7 @@ input:-moz-placeholder { color: #454545; }
|
||||
}
|
||||
|
||||
#notes {
|
||||
padding: 0 0 0 34px;
|
||||
padding: 0 0 0 34px;
|
||||
}
|
||||
|
||||
#notes li {
|
||||
@@ -449,8 +441,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 {
|
||||
@@ -478,26 +471,24 @@ input:-moz-placeholder { color: #454545; }
|
||||
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 +507,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 */
|
||||
@@ -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%;
|
||||
}
|
||||
@@ -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 {
|
||||
@@ -681,12 +671,11 @@ 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 {
|
||||
@@ -694,20 +683,13 @@ input:-moz-placeholder { color: #454545; }
|
||||
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{
|
||||
#viewer {
|
||||
width: 80%;
|
||||
margin-left: 10%;
|
||||
}
|
||||
@@ -720,8 +702,8 @@ and (orientation : landscape)
|
||||
/*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;
|
||||
width: 960px;
|
||||
height: 515px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -764,8 +746,8 @@ and (orientation : landscape)
|
||||
/* For iPhone landscape layouts only */
|
||||
@media only screen and (max-device-width: 374px) and (orientation: landscape) {
|
||||
#viewer iframe {
|
||||
width: 256px;
|
||||
height: 124px;
|
||||
width: 256px;
|
||||
height: 124px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+109
-46
@@ -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;
|
||||
@@ -48,10 +48,14 @@ body {
|
||||
|
||||
body h2 {
|
||||
font-weight: normal;
|
||||
color:#444;
|
||||
color: #444;
|
||||
}
|
||||
|
||||
a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover { color: #45b29d; }
|
||||
a,
|
||||
.danger,
|
||||
.book-remove,
|
||||
.editable-empty,
|
||||
.editable-empty:hover { color: #45b29d; }
|
||||
|
||||
.book-remove:hover { color: #23527c; }
|
||||
|
||||
@@ -60,15 +64,17 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
||||
.btn-default a { color: #444; }
|
||||
|
||||
.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;
|
||||
@@ -121,9 +127,10 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
||||
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;
|
||||
@@ -176,9 +183,10 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
||||
.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;
|
||||
@@ -192,7 +200,7 @@ a, .danger, .book-remove, .user-remove, .editable-empty, .editable-empty:hover {
|
||||
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 {
|
||||
@@ -213,19 +221,20 @@ span.glyphicon.glyphicon-tags {
|
||||
box-shadow: 0 5px 8px -6px #777;
|
||||
}
|
||||
|
||||
.navbar-default .navbar-toggle .icon-bar {background-color: #000; }
|
||||
.navbar-default .navbar-toggle {border-color: #000; }
|
||||
.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 .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;
|
||||
@@ -233,14 +242,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;
|
||||
@@ -258,24 +270,62 @@ 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 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;
|
||||
}
|
||||
|
||||
input.pill {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
input.pill + label {
|
||||
border: 2px solid #45b29d;
|
||||
@@ -298,11 +348,24 @@ 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; }
|
||||
|
||||
.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 {
|
||||
height: 600px;
|
||||
@@ -325,11 +388,11 @@ input.pill:not(:checked) + label .glyphicon { display: none; }
|
||||
#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;
|
||||
|
||||
Reference in New Issue
Block a user