diff --git a/epub.js/css/annotations.css b/epub.js/css/annotations.css index ae74f91..7a77e66 100644 --- a/epub.js/css/annotations.css +++ b/epub.js/css/annotations.css @@ -1,8 +1,3 @@ -.ui-loader { - display: none; +.annotator-adder { + width: 80px; } - -.annotator-hl { - box-shadow: none !important; - cursor: pointer !important; -} \ No newline at end of file diff --git a/epub.js/css/main.css b/epub.js/css/main.css index fe0c65d..27e77a3 100755 --- a/epub.js/css/main.css +++ b/epub.js/css/main.css @@ -20,14 +20,22 @@ body { width: 100%; height: 100%; right: 0; - padding-top: 2%; - /* left: 40px; */ + /* left: 40px; */ /* -webkit-transform: translate(40px, 0); -moz-transform: translate(40px, 0); */ - + /* border-radius: 5px 0px 0px 5px; */ + border-radius: 5px; background: #fff; overflow: hidden; + -webkit-transition: -webkit-transform .4s, width .2s; + -moz-transition: -webkit-transform .4s, width .2s; + -ms-transition: -webkit-transform .4s, width .2s; + + -moz-box-shadow: inset 0 0 50px rgba(0,0,0,.1); + -webkit-box-shadow: inset 0 0 50px rgba(0,0,0,.1); + -ms-box-shadow: inset 0 0 50px rgba(0,0,0,.1); + box-shadow: inset 0 0 50px rgba(0,0,0,.1); } @@ -44,6 +52,7 @@ body { text-align: center; -webkit-transition: opacity .5s; -moz-transition: opacity .5s; + -ms-transition: opacity .5s; z-index: 10; } @@ -64,7 +73,7 @@ body { #titlebar a::before { visibility: visible; -} +} #titlebar a:hover { opacity: .8; @@ -78,6 +87,7 @@ body { /* margin: 1px -1px -1px 1px; */ -moz-box-shadow: inset 0 0 6px rgba(155,155,155,.8); -webkit-box-shadow: inset 0 0 6px rgba(155,155,155,.8); + -ms-box-shadow: inset 0 0 6px rgba(155,155,155,.8); box-shadow: inset 0 0 6px rgba(155,155,155,.8); } @@ -90,8 +100,8 @@ body { } #viewer { - width: 88%; - height: 92%; + width: 80%; + height: 80%; /* margin-left: 10%; */ margin: 0 auto; max-width: 1250px; @@ -108,7 +118,7 @@ body { left: 40px; } -#next { +#next { right: 40px; } @@ -121,12 +131,17 @@ body { font-family: arial, sans-serif; font-weight: bold; cursor: pointer; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .arrow:hover { color: #777; } - + .arrow:active, .arrow.active { color: #000; @@ -144,7 +159,8 @@ body { height: 100%; -webkit-transition: -webkit-transform .5s; -moz-transition: -moz-transform .5s; - + -ms-transition: -moz-transform .5s; + overflow: hidden; } @@ -158,6 +174,7 @@ body { /* left: 300px; */ -webkit-transform: translate(300px, 0); -moz-transform: translate(300px, 0); + -ms-transform: translate(300px, 0); } #main.single { @@ -179,6 +196,7 @@ body { height: 14px; -moz-box-shadow: 0px 1px 3px rgba(0,0,0,.6); -webkit-box-shadow: 0px 1px 3px rgba(0,0,0,.6); + -ms-box-shadow: 0px 1px 3px rgba(0,0,0,.6); box-shadow: 0px 1px 3px rgba(0,0,0,.6); } @@ -234,7 +252,7 @@ body { float: left; margin-left: 10px; margin-top: -1px; - /* + /* border-radius: 5px; background: #9b9b9b; float: left; @@ -244,7 +262,7 @@ body { color: #000; border: none; outline: none; */ - + } input::-webkit-input-placeholder { @@ -253,6 +271,9 @@ input::-webkit-input-placeholder { input:-moz-placeholder { color: #454545; } +input:-ms-placeholder { + color: #454545; +} #divider { position: absolute; @@ -264,6 +285,7 @@ input:-moz-placeholder { margin-left: -1px; top: 10%; opacity: .15; + box-shadow: -2px 0 15px rgba(0, 0, 0, 1); display: none; } @@ -289,6 +311,7 @@ input:-moz-placeholder { visibility: hidden; -webkit-transition: visibility 0 ease .5s; -moz-transition: visibility 0 ease .5s; + -ms-transition: visibility 0 ease .5s; } @@ -299,6 +322,7 @@ input:-moz-placeholder { visibility: visible; -webkit-transition: visibility 0 ease 0; -moz-transition: visibility 0 ease 0; + -ms-transition: visibility 0 ease 0; } #sidebar.open #tocView { @@ -313,7 +337,7 @@ input:-moz-placeholder { display: block; } -#tocView li, +#tocView li, #bookmarksView li { margin-bottom:10px; width: 225px; @@ -372,6 +396,7 @@ input:-moz-placeholder { cursor: pointer; -webkit-user-select: none; -moz-user-select: none; + -ms-user-select: none; user-select: none; } @@ -515,13 +540,13 @@ input:-moz-placeholder { left: 50%; width: 50%; width: 630px; - + height: auto; z-index: 2000; visibility: hidden; margin-left: -320px; margin-top: -160px; - + } .overlay { @@ -536,6 +561,7 @@ input:-moz-placeholder { background: rgba(255,255,255,0.8); -webkit-transition: all 0.3s; -moz-transition: all 0.3s; + -ms-transition: all 0.3s; transition: all 0.3s; } @@ -605,6 +631,7 @@ input:-moz-placeholder { opacity: 0; -webkit-transition: all 0.3s; -moz-transition: all 0.3s; + -ms-transition: all 0.3s; transition: all 0.3s; } @@ -630,7 +657,7 @@ input:-moz-placeholder { width: 50%; margin-left: 25%; } - + #divider, #divider.show { display: none; @@ -646,8 +673,8 @@ input:-moz-placeholder { #prev { left: 20px; } - - #next { + + #next { right: 20px; } } @@ -657,54 +684,56 @@ input:-moz-placeholder { width: 80%; margin-left: 10%; } - + #prev { left: 0; } - - #next { + + #next { right: 0; } - + .arrow { height: 100%; top: 45px; width: 10%; text-indent: -10000px; } - + #main { -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; + -ms-transition: -moz-transform .3s; } - + #main.closed { -webkit-transform: translate(260px, 0); -moz-transform: translate(260px, 0); + -ms-transform: translate(260px, 0); } - + #titlebar { /* font-size: 16px; */ /* margin: 0 50px 0 50px; */ } - + #metainfo { font-size: 10px; } - + #tocView { width: 260px; } - + #tocView li { font-size: 12px; } - + #tocView > ul{ padding-left: 10px; - webkit-padding-start:; } } @@ -747,23 +776,23 @@ input:-moz-placeholder { font-style: normal; font-weight: normal; speak: none; - + display: inline-block; text-decoration: inherit; width: 1em; margin-right: .2em; text-align: center; /* opacity: .8; */ - + /* 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'; } /* '' */ @@ -786,7 +815,3 @@ input:-moz-placeholder { .icon-columns:before { content: '\e810'; } /* '' */ .icon-list:before { content: '\e800'; } /* '' */ .icon-resize-small:before { content: '\e808'; } /* '' */ - -#titlebar { - display: none !important; -} diff --git a/epub.js/update.sh b/epub.js/update.sh index 4561e88..3235018 100755 --- a/epub.js/update.sh +++ b/epub.js/update.sh @@ -4,3 +4,4 @@ cp $base/build/libs/* ./libs/ cp $base/reader/js/hooks/extensions/*.js ./hooks/extensions/ cp $base/reader/js/plugins/*.js ./plugins/ cp $base/reader/img/loader.gif img/loader.gif +cp $base/reader/css/*.css css/