diff --git a/.gitmodules b/.gitmodules index 888769127..15c29c8c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "examples"] path = examples - url = https://github.com/UniversalViewer/examples.git + url = https://github.com/britishlibrary/examples.git [submodule "tests"] path = tests url = https://github.com/UniversalViewer/tests.git diff --git a/bower.json b/bower.json index 72d8ca10b..c50286ba3 100644 --- a/bower.json +++ b/bower.json @@ -25,8 +25,8 @@ "lodash-compat": "~3.10.0", "r.js": "~2.1.18", "utils": "edsilv/utils", - "uv-cy-GB-theme": "universalviewer/uv-cy-GB-theme", - "uv-en-GB-theme": "universalviewer/uv-en-GB-theme", + "uv-cy-GB-theme": "britishlibrary/uv-cy-GB-theme", + "uv-en-GB-theme": "britishlibrary/uv-en-GB-theme", "exjs": "~0.3.0" } } \ No newline at end of file diff --git a/dist/uv-1.6.17/lib/app.js b/dist/uv-1.6.17/lib/app.js index 19cd543fe..4709f3e2d 100644 --- a/dist/uv-1.6.17/lib/app.js +++ b/dist/uv-1.6.17/lib/app.js @@ -8168,6 +8168,7 @@ String.prototype.utf8_to_b64 = function () { }; !function(e){if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define('manifesto',e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.manifesto=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o /// /// +/// /// /// /// @@ -9885,6 +9887,7 @@ var Manifesto; Manifesto.Resource = Resource; })(Manifesto || (Manifesto = {})); +}).call(this,typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) },{"http":6,"lodash.assign":27,"lodash.endswith":37,"lodash.isarray":39,"lodash.isstring":40,"lodash.last":41,"lodash.map":42,"url":24}],2:[function(_dereq_,module,exports){ /*! * The buffer module from node.js, for the browser. diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-mediaelement-extension/theme.css b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-mediaelement-extension/theme.css index 7a40670b1..20d34d2c5 100644 --- a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-mediaelement-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-mediaelement-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -1451,10 +1451,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -1488,12 +1488,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -1516,7 +1516,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -1531,7 +1531,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -1591,8 +1591,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -1600,8 +1600,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -1623,13 +1623,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -1637,8 +1637,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -1660,13 +1660,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -1674,8 +1674,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -1697,8 +1697,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1849,7 +1849,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1870,7 +1870,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1878,7 +1878,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1918,7 +1918,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1927,14 +1927,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1953,7 +1953,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1976,23 +1976,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -2236,7 +2236,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -2330,10 +2330,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -2400,10 +2400,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -2422,8 +2422,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -2460,19 +2460,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -2724,7 +2724,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2832,7 +2832,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2845,7 +2845,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2858,16 +2858,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2891,6 +2891,47 @@ input[type=range]:focus::-ms-fill-upper { #app .headerPanel .options .centerOptions .nextOptions { margin: 0 0 0 10px; } +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; +} #app .footerPanel .searchPager .controls .searchResultsInfo { width: 290px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-pdf-extension/theme.css b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-pdf-extension/theme.css index a0488ef7b..08f6f5243 100644 --- a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-pdf-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-pdf-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -2307,10 +2307,10 @@ canvas { height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -2344,12 +2344,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -2372,7 +2372,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -2387,7 +2387,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -2447,8 +2447,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -2456,8 +2456,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -2479,13 +2479,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -2493,8 +2493,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -2516,13 +2516,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -2530,8 +2530,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -2553,8 +2553,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -2705,7 +2705,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -2726,7 +2726,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -2734,7 +2734,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -2774,7 +2774,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -2783,14 +2783,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -2809,7 +2809,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -2832,23 +2832,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -3092,7 +3092,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -3186,10 +3186,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -3256,10 +3256,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -3278,8 +3278,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -3316,19 +3316,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -3580,7 +3580,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -3688,7 +3688,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -3701,7 +3701,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -3714,16 +3714,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -3757,6 +3757,47 @@ input[type=range]:focus::-ms-fill-upper { #app .headerPanel .options .centerOptions .nextOptions { margin: 0 0 0 10px; } +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; +} #app .footerPanel .searchPager .controls .searchResultsInfo { width: 290px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-seadragon-extension/theme.css b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-seadragon-extension/theme.css index cc3610081..aaf2ccb3d 100644 --- a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-seadragon-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-seadragon-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -265,8 +265,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -278,11 +278,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -295,40 +295,40 @@ color: #000; } #app .headerPanel a.imageBtn.first { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/first.png'); background-repeat: no-repeat; margin: 0 0 0 0; } #app .headerPanel a.imageBtn.first:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.prev { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/prev.png'); background-repeat: no-repeat; margin: 0 0 0 5px; } #app .headerPanel a.imageBtn.prev:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.next { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/next.png'); background-repeat: no-repeat; margin: 0 5px 0 0; } #app .headerPanel a.imageBtn.next:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.last { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/last.png'); background-repeat: no-repeat; margin: 0 0 0 0; } #app .headerPanel a.imageBtn.last:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.go { background: url('../../img/uv-pagingheaderpanel-module/go.png') no-repeat; @@ -385,7 +385,7 @@ text-align: right; } #app .headerPanel .centerOptions .mode label.disabled { - color: #9a9a9a; + color: #bbbbbb; } #app .headerPanel .centerOptions.modeOptionsDisabled { width: 280px; @@ -478,19 +478,19 @@ cursor: pointer !important; } #app .centerPanel .content #viewer .zoomIn:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer .zoomOut { cursor: pointer !important; } #app .centerPanel .content #viewer .zoomOut:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer .goHome { cursor: pointer !important; } #app .centerPanel .content #viewer .goHome:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer div[title="Rotate left"] { display: none !important; @@ -499,7 +499,7 @@ cursor: pointer !important; } #app .centerPanel .content #viewer .rotate:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer div[title="Previous page"] { display: none !important; @@ -518,7 +518,7 @@ background-position: 50% 50%; } #app .centerPanel .content .searchOverlay { - background-color: #14a4c3; + background-color: #869f33; opacity: 0.5; filter: alpha(opacity=50); } @@ -534,7 +534,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -549,14 +549,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -580,8 +580,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -633,7 +633,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -673,7 +673,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -779,7 +779,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -814,7 +814,7 @@ padding: 30px 9px 0 9px; } #app .footerPanel .searchResults .line { - background: #565656; + background: #787878; height: 2px; } #app .footerPanel .searchResults .searchResultPlacemarker { @@ -881,7 +881,7 @@ } #app .footerPanel .search { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; height: 32px; } #app .footerPanel .search .searchTextContainer { @@ -919,7 +919,7 @@ height: 25px; } #app .footerPanel .search .searchTextContainer .autocomplete .result.selected { - background: #efefef; + background: #ffffff; } #app .footerPanel .search .searchTextContainer .searchText { width: 245px; @@ -953,7 +953,7 @@ } #app .footerPanel .searchPager { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; height: 32px; overflow: hidden; } @@ -1006,7 +1006,7 @@ } #app .footerPanel .searchPager .controls a.clearSearch { cursor: pointer; - color: #26b5cc; + color: #869f33; text-decoration: none; margin: 0 0 0 10px; font-size: 12px; @@ -1077,10 +1077,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -1114,12 +1114,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -1142,7 +1142,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -1157,7 +1157,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -1217,8 +1217,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -1226,8 +1226,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -1249,13 +1249,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -1263,8 +1263,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -1286,13 +1286,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -1300,8 +1300,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -1323,8 +1323,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1475,7 +1475,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1496,7 +1496,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1504,7 +1504,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1544,7 +1544,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1553,14 +1553,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1579,7 +1579,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1602,23 +1602,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -1862,7 +1862,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -1956,10 +1956,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -2026,10 +2026,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -2048,8 +2048,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -2086,19 +2086,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -2350,7 +2350,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2458,7 +2458,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2471,7 +2471,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2484,16 +2484,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2517,6 +2517,47 @@ input[type=range]:focus::-ms-fill-upper { #app .headerPanel .options .centerOptions .nextOptions { margin: 0 0 0 10px; } +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; +} #app .footerPanel .searchPager .controls .searchResultsInfo { width: 290px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-virtex-extension/theme.css b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-virtex-extension/theme.css index 9be8a0bb4..a9fcb929b 100644 --- a/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-virtex-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-cy-GB-theme/css/uv-virtex-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -643,10 +643,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -680,12 +680,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -708,7 +708,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -723,7 +723,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -783,8 +783,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -792,8 +792,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -815,13 +815,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -829,8 +829,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -852,13 +852,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -866,8 +866,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -889,8 +889,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1041,7 +1041,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1062,7 +1062,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1070,7 +1070,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1110,7 +1110,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1119,14 +1119,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1145,7 +1145,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1168,23 +1168,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -1428,7 +1428,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -1522,10 +1522,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -1592,10 +1592,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -1614,8 +1614,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -1652,19 +1652,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -1916,7 +1916,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2024,7 +2024,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2037,7 +2037,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2050,16 +2050,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2083,6 +2083,47 @@ input[type=range]:focus::-ms-fill-upper { #app .headerPanel .options .centerOptions .nextOptions { margin: 0 0 0 10px; } +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; +} #app .footerPanel .searchPager .controls .searchResultsInfo { width: 290px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/close.png b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/close.png new file mode 100644 index 000000000..eac00b6a0 Binary files /dev/null and b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/close.png differ diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/hamburger.png b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/hamburger.png new file mode 100644 index 000000000..5adabfc94 Binary files /dev/null and b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/hamburger.png differ diff --git a/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/placemarker_down.png b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/placemarker_down.png new file mode 100644 index 000000000..46c331645 Binary files /dev/null and b/dist/uv-1.6.17/themes/uv-cy-GB-theme/img/placemarker_down.png differ diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-mediaelement-extension/theme.css b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-mediaelement-extension/theme.css index 7db887095..366b18fc7 100644 --- a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-mediaelement-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-mediaelement-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -1451,10 +1451,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -1488,12 +1488,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -1516,7 +1516,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -1531,7 +1531,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -1591,8 +1591,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -1600,8 +1600,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -1623,13 +1623,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -1637,8 +1637,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -1660,13 +1660,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -1674,8 +1674,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -1697,8 +1697,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1849,7 +1849,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1870,7 +1870,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1878,7 +1878,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1918,7 +1918,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1927,14 +1927,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1953,7 +1953,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1976,23 +1976,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -2236,7 +2236,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -2330,10 +2330,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -2400,10 +2400,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -2422,8 +2422,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -2460,19 +2460,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -2724,7 +2724,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2832,7 +2832,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2845,7 +2845,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2858,16 +2858,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2877,8 +2877,49 @@ input[type=range]:focus::-ms-fill-upper { margin-left: 8px; } #app .headerPanel .options .centerOptions { - width: 390px; + width: 385px; +} +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; } #app .footerPanel .searchPager .controls .searchResultsInfo { width: 340px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-pdf-extension/theme.css b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-pdf-extension/theme.css index a66ad82d5..4917deed7 100644 --- a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-pdf-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-pdf-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -2307,10 +2307,10 @@ canvas { height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -2344,12 +2344,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -2372,7 +2372,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -2387,7 +2387,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -2447,8 +2447,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -2456,8 +2456,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -2479,13 +2479,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -2493,8 +2493,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -2516,13 +2516,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -2530,8 +2530,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -2553,8 +2553,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -2705,7 +2705,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -2726,7 +2726,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -2734,7 +2734,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -2774,7 +2774,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -2783,14 +2783,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -2809,7 +2809,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -2832,23 +2832,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -3092,7 +3092,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -3186,10 +3186,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -3256,10 +3256,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -3278,8 +3278,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -3316,19 +3316,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -3580,7 +3580,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -3688,7 +3688,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -3701,7 +3701,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -3714,16 +3714,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -3743,8 +3743,49 @@ input[type=range]:focus::-ms-fill-upper { border: none; } #app .headerPanel .options .centerOptions { - width: 390px; + width: 385px; +} +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; } #app .footerPanel .searchPager .controls .searchResultsInfo { width: 340px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-seadragon-extension/theme.css b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-seadragon-extension/theme.css index fcfaa8d49..3aab81718 100644 --- a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-seadragon-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-seadragon-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -265,8 +265,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -278,11 +278,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -295,40 +295,40 @@ color: #000; } #app .headerPanel a.imageBtn.first { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/first.png'); background-repeat: no-repeat; margin: 0 0 0 0; } #app .headerPanel a.imageBtn.first:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.prev { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/prev.png'); background-repeat: no-repeat; margin: 0 0 0 5px; } #app .headerPanel a.imageBtn.prev:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.next { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/next.png'); background-repeat: no-repeat; margin: 0 5px 0 0; } #app .headerPanel a.imageBtn.next:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.last { - background-color: #565656; + background-color: #787878; background-image: url('../../img/uv-pagingheaderpanel-module/last.png'); background-repeat: no-repeat; margin: 0 0 0 0; } #app .headerPanel a.imageBtn.last:hover { - background-color: #343434; + background-color: #555555; } #app .headerPanel a.imageBtn.go { background: url('../../img/uv-pagingheaderpanel-module/go.png') no-repeat; @@ -385,7 +385,7 @@ text-align: right; } #app .headerPanel .centerOptions .mode label.disabled { - color: #9a9a9a; + color: #bbbbbb; } #app .headerPanel .centerOptions.modeOptionsDisabled { width: 280px; @@ -478,19 +478,19 @@ cursor: pointer !important; } #app .centerPanel .content #viewer .zoomIn:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer .zoomOut { cursor: pointer !important; } #app .centerPanel .content #viewer .zoomOut:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer .goHome { cursor: pointer !important; } #app .centerPanel .content #viewer .goHome:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer div[title="Rotate left"] { display: none !important; @@ -499,7 +499,7 @@ cursor: pointer !important; } #app .centerPanel .content #viewer .rotate:focus { - border: 1px solid #14a4c3 !important; + border: 1px solid lightskyblue !important; } #app .centerPanel .content #viewer div[title="Previous page"] { display: none !important; @@ -518,7 +518,7 @@ background-position: 50% 50%; } #app .centerPanel .content .searchOverlay { - background-color: #14a4c3; + background-color: #869f33; opacity: 0.5; filter: alpha(opacity=50); } @@ -534,7 +534,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -549,14 +549,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -580,8 +580,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -633,7 +633,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -673,7 +673,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -779,7 +779,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -814,7 +814,7 @@ padding: 30px 9px 0 9px; } #app .footerPanel .searchResults .line { - background: #565656; + background: #787878; height: 2px; } #app .footerPanel .searchResults .searchResultPlacemarker { @@ -881,7 +881,7 @@ } #app .footerPanel .search { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; height: 32px; } #app .footerPanel .search .searchTextContainer { @@ -919,7 +919,7 @@ height: 25px; } #app .footerPanel .search .searchTextContainer .autocomplete .result.selected { - background: #efefef; + background: #ffffff; } #app .footerPanel .search .searchTextContainer .searchText { width: 245px; @@ -953,7 +953,7 @@ } #app .footerPanel .searchPager { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; height: 32px; overflow: hidden; } @@ -1006,7 +1006,7 @@ } #app .footerPanel .searchPager .controls a.clearSearch { cursor: pointer; - color: #26b5cc; + color: #869f33; text-decoration: none; margin: 0 0 0 10px; font-size: 12px; @@ -1077,10 +1077,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -1114,12 +1114,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -1142,7 +1142,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -1157,7 +1157,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -1217,8 +1217,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -1226,8 +1226,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -1249,13 +1249,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -1263,8 +1263,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -1286,13 +1286,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -1300,8 +1300,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -1323,8 +1323,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1475,7 +1475,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1496,7 +1496,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1504,7 +1504,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1544,7 +1544,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1553,14 +1553,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1579,7 +1579,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1602,23 +1602,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -1862,7 +1862,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -1956,10 +1956,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -2026,10 +2026,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -2048,8 +2048,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -2086,19 +2086,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -2350,7 +2350,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2458,7 +2458,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2471,7 +2471,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2484,16 +2484,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2503,8 +2503,49 @@ input[type=range]:focus::-ms-fill-upper { margin-left: 8px; } #app .headerPanel .options .centerOptions { - width: 390px; + width: 385px; +} +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; } #app .footerPanel .searchPager .controls .searchResultsInfo { width: 340px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-virtex-extension/theme.css b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-virtex-extension/theme.css index 5dd74a309..180bf3ce6 100644 --- a/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-virtex-extension/theme.css +++ b/dist/uv-1.6.17/themes/uv-en-GB-theme/css/uv-virtex-extension/theme.css @@ -25,8 +25,8 @@ #app .overlay.embed .middle .secondRow textarea.code { width: 100%; height: 90px; - background: #efefef; - border: 1px solid #9a9a9a; + background: #ffffff; + border: 1px solid #bbbbbb; font-size: 11px; } #app .overlay.embed .middle .secondRow .sizes { @@ -40,13 +40,13 @@ text-align: center; } #app .overlay.embed .middle .secondRow .size { - border: 1px solid #9a9a9a; + border: 1px solid #bbbbbb; float: left; margin: 0 10px 0 0; } #app .overlay.embed .middle .secondRow .size.selected { - border: 1px solid #14a4c3; - background: #7eddf2; + border: 1px solid #869f33; + background: #cadb90; } #app .overlay.embed .middle .secondRow .size.selected p { font-weight: bold; @@ -145,7 +145,7 @@ padding: 0; } #app .overlay.download .middle ol.options li.group { - border-bottom: 1px solid #efefef; + border-bottom: 1px solid #ffffff; } #app .overlay.download .middle ol.options li.group:last-child { border-bottom: none; @@ -248,7 +248,7 @@ } #app .leftPanel .tabs .tab { color: #fff; - background-color: #211f1f; + background-color: #1f1f1f; display: inline-block; text-align: center; line-height: 22px; @@ -263,14 +263,14 @@ } #app .leftPanel .tabs .tab.on { border: 1px solid #373737; - border-bottom: 1px solid #211f1f; - color: #14a4c3; + border-bottom: 1px solid #1f1f1f; + color: #869f33; margin-bottom: -1px; height: 25px; line-height: 25px; } #app .leftPanel .tabs .tab:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .tabsContent { padding: 10px 10px 10px 10px; @@ -294,8 +294,8 @@ } #app .leftPanel .tabsContent .btn-group .btn { padding: 0 5px 0 5px; - background: #565656; - color: #9a9a9a; + background: #787878; + color: #bbbbbb; width: 55px; } #app .leftPanel .tabsContent .btn-group .btn.on { @@ -347,7 +347,7 @@ overflow: hidden; } #app .leftPanel .views .treeView ul a.selected { - color: #14a4c3; + color: #869f33; } #app .leftPanel .views .thumbsView { overflow: auto; @@ -387,7 +387,7 @@ border: 2px solid #fff; } #app .leftPanel .views .thumbsView .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .thumbsView .thumbs .thumb span { font-size: 11px; @@ -493,7 +493,7 @@ border: 2px solid #fff; } #app .leftPanel .views .galleryView .main .thumbs .thumb.searchpreview .wrap { - border: 2px solid #26b5cc; + border: 2px solid #869f33; } #app .leftPanel .views .galleryView .main .thumbs .thumb span { font-size: 11px; @@ -548,8 +548,8 @@ margin: 0 0 20px 0; } #app .rightPanel .main .items .item .header { - color: #9a9a9a; - border-bottom: 1px solid #343434; + color: #bbbbbb; + border-bottom: 1px solid #555555; font-size: 11px; margin: 15px 10px 0 0; text-transform: uppercase; @@ -561,11 +561,11 @@ word-wrap: break-word; } #app .rightPanel .main .items .item .text a.toggle { - color: #14a4c3; + color: #869f33; font-weight: normal; } #app .rightPanel .main .items .item .text a.toggle:hover { - color: #22c5e8; + color: #a5c342; } #app .rightPanel .main .items .item .text a.toggle.more, #app .rightPanel .main .items .item .text a.toggle.less { @@ -643,10 +643,10 @@ height: 12px; } ::-webkit-scrollbar-track { - background: none; + background: #787878; } ::-webkit-scrollbar-thumb { - background: #565656; + background: #a5c342; } html, body { @@ -680,12 +680,12 @@ textarea { background-image: none; } a { - color: #26b5cc; + color: #869f33; text-decoration: none; } a:hover, a:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; } a:focus { @@ -708,7 +708,7 @@ img { padding: 5px 5px 5px 5px; line-height: 1.42857143; background-color: #000; - border: 1px solid #565656; + border: 1px solid #787878; border-radius: 4px; -webkit-transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out; @@ -723,7 +723,7 @@ hr { margin-top: 17px; margin-bottom: 17px; border: 0; - border-top: 1px solid #efefef; + border-top: 1px solid #ffffff; } .sr-only { position: absolute; @@ -783,8 +783,8 @@ fieldset[disabled] .btn { } .btn-default { color: #fff; - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-default:hover, .btn-default:focus, @@ -792,8 +792,8 @@ fieldset[disabled] .btn { .btn-default.active, .open .dropdown-toggle.btn-default { color: #fff; - background-color: #424242; - border-color: #383838; + background-color: #636363; + border-color: #595959; } .btn-default:active, .btn-default.active, @@ -815,13 +815,13 @@ fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #565656; - border-color: #565656; + background-color: #787878; + border-color: #787878; } .btn-primary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-primary:hover, .btn-primary:focus, @@ -829,8 +829,8 @@ fieldset[disabled] .btn-default.active { .btn-primary.active, .open .dropdown-toggle.btn-primary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #a30000; + border-color: #8f0000; } .btn-primary:active, .btn-primary.active, @@ -852,13 +852,13 @@ fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #cc0000; + border-color: #cc0000; } .btn-secondary { color: #fff; - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-secondary:hover, .btn-secondary:focus, @@ -866,8 +866,8 @@ fieldset[disabled] .btn-primary.active { .btn-secondary.active, .open .dropdown-toggle.btn-secondary { color: #fff; - background-color: #10859e; - border-color: #0e758b; + background-color: #6c8029; + border-color: #5f7124; } .btn-secondary:active, .btn-secondary.active, @@ -889,8 +889,8 @@ fieldset[disabled] .btn-secondary:active, .btn-secondary.disabled.active, .btn-secondary[disabled].active, fieldset[disabled] .btn-secondary.active { - background-color: #14a4c3; - border-color: #14a4c3; + background-color: #869f33; + border-color: #869f33; } .btn-warning { color: #fff; @@ -1041,7 +1041,7 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } .btn-link { - color: #26b5cc; + color: #869f33; font-weight: normal; cursor: pointer; border-radius: 0; @@ -1062,7 +1062,7 @@ fieldset[disabled] .btn-link { } .btn-link:hover, .btn-link:focus { - color: #48c8dd; + color: #a5c342; text-decoration: underline; background-color: transparent; } @@ -1070,7 +1070,7 @@ fieldset[disabled] .btn-link { fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #9a9a9a; + color: #bbbbbb; text-decoration: none; } .btn-lg { @@ -1110,7 +1110,7 @@ input[type=range] { input[type=range]::-webkit-slider-runnable-track { width: 300px; height: 5px; - background: #9a9a9a; + background: #bbbbbb; border: none; } input[type=range]::-webkit-slider-thumb { @@ -1119,14 +1119,14 @@ input[type=range]::-webkit-slider-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; margin-top: -5px; } input[type=range]:focus { outline: none; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #9a9a9a; + background: #bbbbbb; } /* Firefox */ input[type=range] { @@ -1145,7 +1145,7 @@ input[type=range]::-moz-range-thumb { height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } /*hide the outline behind the border*/ input[type=range]:-moz-focusring { @@ -1168,23 +1168,23 @@ input[type=range]::-ms-track { color: transparent; } input[type=range]::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-fill-upper { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]::-ms-thumb { border: none; height: 16px; width: 16px; border-radius: 50%; - background: #565656; + background: #787878; } input[type=range]:focus::-ms-fill-lower { - background: #9a9a9a; + background: #bbbbbb; } input[type=range]:focus::-ms-fill-upper { - background: #efefef; + background: #ffffff; } .btn-default .caret { border-top-color: #fff; @@ -1428,7 +1428,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel .informationBox { background: #FFB81D; - color: #343434; + color: #555555; width: 100%; position: absolute; height: 40px; @@ -1522,10 +1522,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .leftPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .leftPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app.browser-Explorer.browser-version-8 .leftPanel .closed .title { writing-mode: tb-lr; @@ -1592,10 +1592,10 @@ input[type=range]:focus::-ms-fill-upper { display: block; } #app .rightPanel .closed .expandButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .closed .expandFullButton:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .rightPanel .main { margin-right: 10px; @@ -1614,8 +1614,8 @@ input[type=range]:focus::-ms-fill-upper { line-height: 30px; } #app .centerPanel .content .acknowledgements { - background: #343434; - background: rgba(52, 52, 52, 0.7); + background: #555555; + background: rgba(85, 85, 85, 0.7); position: absolute; width: 190px; padding: 10px 10px 10px 10px; @@ -1652,19 +1652,19 @@ input[type=range]:focus::-ms-fill-upper { max-width: 100px; } #app .centerPanel .content .acknowledgements .main a:not(.toggle) { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):link { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):hover { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):visited { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main a:not(.toggle):active { - color: #26b5cc; + color: #869f33; } #app .centerPanel .content .acknowledgements .main .attribution { overflow: hidden; @@ -1916,7 +1916,7 @@ input[type=range]:focus::-ms-fill-upper { width: 24px; height: 24px; float: right; - background-color: #14a4c3; + background-color: #cc0000; } #app .overlay .middle { width: 100%; @@ -2024,7 +2024,7 @@ input[type=range]:focus::-ms-fill-upper { cursor: pointer; } #app .imageBtn:focus { - border: 1px solid #14a4c3; + border: 1px solid lightskyblue; } #app .action, #app a.action.black, @@ -2037,7 +2037,7 @@ input[type=range]:focus::-ms-fill-upper { } #app .headerPanel { position: relative; - background-color: #211f1f; + background-color: #1f1f1f; color: #fff; height: 40px; } @@ -2050,16 +2050,16 @@ input[type=range]:focus::-ms-fill-upper { } #app .leftPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .centerPanel { position: absolute; } #app .rightPanel { position: absolute; - background: #211f1f; - border: none; + background: #1f1f1f; + border: 1px solid #373737; } #app .footerPanel { position: relative; @@ -2069,8 +2069,49 @@ input[type=range]:focus::-ms-fill-upper { margin-left: 8px; } #app .headerPanel .options .centerOptions { - width: 390px; + width: 385px; +} +#app .overlay .top .close { + background-image: url('../../img/close.png'); + background-repeat: no-repeat; + height: 24px; + line-height: 24px; + cursor: pointer; + color: #fff; + text-decoration: none; + background-position: right center; + padding-right: 34px; + padding-left: 10px; +} +#app .overlay .top .close:link, +#app .overlay .top .close:visited, +#app .overlay .top .close:hover, +#app .overlay .top .close:active { + color: #fff; + text-decoration: none; +} +#app .overlay .middle .content { + padding-top: 10px; +} +#app .overlay .middle .content h1 { + margin: 0 0 0 0; + border-bottom: 1px solid #bbbbbb; +} +#app .footerPanel .search { + border: 1px solid #555555; +} +#app .footerPanel .searchPager { + border: 1px solid #555555; +} +#app .footerPanel .searchPager .controls { + margin-top: 0px; } #app .footerPanel .searchPager .controls .searchResultsInfo { width: 340px; } +#app .footerPanel .searchResults .searchResultPlacemarker { + background: url('../../img/placemarker_down.png'); +} +#app .footerPanel .searchOptions { + margin: 3px 0 0 0; +} diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/img/close.png b/dist/uv-1.6.17/themes/uv-en-GB-theme/img/close.png new file mode 100644 index 000000000..eac00b6a0 Binary files /dev/null and b/dist/uv-1.6.17/themes/uv-en-GB-theme/img/close.png differ diff --git a/dist/uv-1.6.17/themes/uv-en-GB-theme/img/placemarker_down.png b/dist/uv-1.6.17/themes/uv-en-GB-theme/img/placemarker_down.png new file mode 100644 index 000000000..46c331645 Binary files /dev/null and b/dist/uv-1.6.17/themes/uv-en-GB-theme/img/placemarker_down.png differ diff --git a/examples b/examples index b5067ed53..fa32f1725 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit b5067ed53110c75ed96f9528593ed7570e60a2ad +Subproject commit fa32f1725398ae9cb41b6732145a9ed322f711b6 diff --git a/src/lib/manifesto.js b/src/lib/manifesto.js index 2894c1992..0b2ae1cb4 100644 --- a/src/lib/manifesto.js +++ b/src/lib/manifesto.js @@ -216,6 +216,7 @@ String.prototype.utf8_to_b64 = function () { }; !function(e){if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else{var f;"undefined"!=typeof window?f=window:"undefined"!=typeof global?f=global:"undefined"!=typeof self&&(f=self),f.manifesto=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o /// /// +/// /// /// /// @@ -1933,6 +1935,7 @@ var Manifesto; Manifesto.Resource = Resource; })(Manifesto || (Manifesto = {})); +}).call(this,typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {}) },{"http":6,"lodash.assign":27,"lodash.endswith":37,"lodash.isarray":39,"lodash.isstring":40,"lodash.last":41,"lodash.map":42,"url":24}],2:[function(_dereq_,module,exports){ /*! * The buffer module from node.js, for the browser. diff --git a/src/typings/manifesto.d.ts b/src/typings/manifesto.d.ts index ce8ff0ba2..aa9128f91 100644 --- a/src/typings/manifesto.d.ts +++ b/src/typings/manifesto.d.ts @@ -216,9 +216,9 @@ declare module Manifesto { index: number; isLoaded: boolean; parentCollection: ICollection; - treeRoot: TreeNode; + treeRoot: ITreeNode; constructor(jsonld: any, options?: IManifestoOptions); - generateTreeNodeIds(treeNode: TreeNode, index?: number): void; + generateTreeNodeIds(treeNode: ITreeNode, index?: number): void; getAttribution(): string; getDescription(): string; getIIIFResourceType(): IIIFResourceType; @@ -227,7 +227,7 @@ declare module Manifesto { getNavDate(): Date; getSeeAlso(): any; getTitle(): string; - getTree(): TreeNode; + getTree(): ITreeNode; load(): Promise; } } @@ -248,7 +248,7 @@ declare module Manifesto { getSequences(): ISequence[]; getSequenceByIndex(sequenceIndex: number): ISequence; getTotalSequences(): number; - getTree(): TreeNode; + getTree(): ITreeNode; private _parseTreeNode(node, range); getManifestType(): ManifestType; isMultiSequence(): boolean; @@ -264,7 +264,7 @@ declare module Manifesto { getManifestByIndex(manifestIndex: number): Promise; getTotalCollections(): number; getTotalManifests(): number; - getTree(): TreeNode; + getTree(): ITreeNode; private _parseManifests(parentCollection); private _parseCollections(parentCollection); } @@ -274,7 +274,7 @@ declare module Manifesto { parentRange: Range; path: string; ranges: Range[]; - treeNode: TreeNode; + treeNode: ITreeNode; constructor(jsonld: any, options: IManifestoOptions); getCanvases(): string[]; getViewingDirection(): ViewingDirection; @@ -352,17 +352,30 @@ declare module Manifesto { } } declare module Manifesto { - class TreeNode { + interface ITreeNode { + data: any; + nodes: ITreeNode[]; + selected: boolean; + expanded: boolean; + id: string; label: string; + navDate: Date; + parentNode: ITreeNode; + addNode(node: ITreeNode): void; + } +} +declare module Manifesto { + class TreeNode implements ITreeNode { data: any; - nodes: TreeNode[]; + nodes: ITreeNode[]; selected: boolean; expanded: boolean; id: string; + label: string; navDate: Date; - parentNode: TreeNode; + parentNode: ITreeNode; constructor(label?: string, data?: any); - addNode(node: TreeNode): void; + addNode(node: ITreeNode): void; } } declare module Manifesto { @@ -429,7 +442,7 @@ declare module Manifesto { getManifestByIndex(index: number): Promise; getTotalCollections(): number; getTotalManifests(): number; - getTree(): TreeNode; + getTree(): ITreeNode; manifests: IManifest[]; } } @@ -463,12 +476,12 @@ declare module Manifesto { getNavDate(): Date; getSeeAlso(): any; getTitle(): string; - getTree(): TreeNode; + getTree(): ITreeNode; index: number; isLoaded: boolean; load(): Promise; parentCollection: ICollection; - treeRoot: TreeNode; + treeRoot: ITreeNode; } } declare module Manifesto { @@ -487,7 +500,7 @@ declare module Manifesto { getSequences(): ISequence[]; getSequenceByIndex(index: number): ISequence; getTotalSequences(): number; - getTree(): TreeNode; + getTree(): ITreeNode; getManifestType(): ManifestType; getViewingDirection(): Manifesto.ViewingDirection; isMultiSequence(): boolean; @@ -512,7 +525,7 @@ interface IManifesto { ElementType: Manifesto.ElementType; getRenderings(resource: any): Manifesto.IRendering[]; getService: (resource: any, profile: Manifesto.ServiceProfile | string) => Manifesto.IService; - getTreeNode(): Manifesto.TreeNode; + getTreeNode(): Manifesto.ITreeNode; IIIFResourceType: Manifesto.IIIFResourceType; isImageProfile(profile: Manifesto.ServiceProfile): boolean; loadExternalResources: (resources: Manifesto.IExternalResource[], tokenStorageStrategy: string, clickThrough: (resource: Manifesto.IExternalResource) => Promise, login: (resource: Manifesto.IExternalResource) => Promise, getAccessToken: (resource: Manifesto.IExternalResource) => Promise, storeAccessToken: (resource: Manifesto.IExternalResource, token: Manifesto.IAccessToken, tokenStorageStrategy: string) => Promise, getStoredAccessToken: (resource: Manifesto.IExternalResource, tokenStorageStrategy: string) => Promise, handleResourceResponse: (resource: Manifesto.IExternalResource) => Promise, options?: Manifesto.IManifestoOptions) => Promise; @@ -543,7 +556,7 @@ declare module Manifesto { parentRange: IRange; path: string; ranges: IRange[]; - treeNode: TreeNode; + treeNode: ITreeNode; } } declare module Manifesto {