diff --git a/ui (gen4)/css/layout.css b/ui (gen4)/css/layout.css index d8e54015..85f4064a 100644 --- a/ui (gen4)/css/layout.css +++ b/ui (gen4)/css/layout.css @@ -162,7 +162,7 @@ button:hover { -webkit-app-region: no-drag; } .title-bar .button:hover { - cursor: hand; + cursor: pointer; } .title-bar .close:hover { color: red; @@ -234,7 +234,7 @@ button:hover { font-weight: bold; color: silver; opacity: 0.9; - cursor: hand; + cursor: pointer; } .viewer:empty:after, .ribbon-set:empty:after { @@ -1186,6 +1186,80 @@ stretching in width... */ color: white; background: red; } +.overlay-info.full, +.overlay-info.minimal { + display: block; + /* XXX is this correct??? */ + z-index: 1000; +} +.overlay-info.minimal { + background: transparent; +} +.overlay-info.minimal .full-only { + display: none; +} +/* XXX REUSE: this is the same as selected/bookmarked image markers... */ +.overlay-info .marked, +.overlay-info .marked:after, +.overlay-info .marked:before, +.overlay-info .bookmarked:after { + display: block; + position: relative; + content: ""; + font-size: 0pt; + border: none; + margin: 4px; + margin-left: 6px; + width: 10px; + height: 10px; + box-shadow: 2px 2px 20px -2px rgba(0, 0, 0, 0.7); + box-sizing: border-box; + border-radius: 50%; + background: blue; + cursor: pointer; +} +/* tick... */ +.overlay-info .marked { + background: transparent; + margin-left: 6px; +} +.overlay-info .marked:before, +.overlay-info .marked:after { + position: absolute; + bottom: auto; + border-radius: 3px; + -webkit-transform: rotate(-45deg) scaleY(1) scaleX(1); + -moz-transform: rotate(-45deg) scaleY(1) scaleX(1); + -o-transform: rotate(-45deg) scaleY(1) scaleX(1); + -ms-transform: rotate(-45deg) scaleY(1) scaleX(1); + transform: rotate(-45deg) scaleY(1) scaleX(1); + /* This prevents elements from aligning to sub-pixels...*/ + /* + -webkit-transform-style: preserve-3d; + -moz-transform-style: preserve-3d; + transform-style: preserve-3d; + */ +} +.overlay-info .marked:before { + width: 3px; + height: 6px; +} +.overlay-info .marked:after { + width: 12px; + height: 3px; +} +.overlay-info .bookmarked:after { + background: yellow; +} +.overlay-info .marked:not(.on), +.overlay-info .bookmarked:not(.on) { + opacity: 0.5; +} +.overlay-info .marked:not(.on):before, +.overlay-info .marked:not(.on):after, +.overlay-info .bookmarked:not(.on):after { + background: gray; +} /*************************************************** Global status ***/ .global-status { display: block; @@ -1208,7 +1282,7 @@ stretching in width... */ width: 100px; margin-left: -50px; overflow: hidden; - cursor: hand; + cursor: pointer; } .up-indicator:after, .down-indicator:after { @@ -1340,12 +1414,12 @@ stretching in width... */ .global-mode-indicators .marks-visible, .context-mode-indicators .current-image-marked { color: blue; - cursor: hand; + cursor: pointer; text-shadow: rgba(0, 0, 0, 0.5) 0.1em 0.1em 0.4em, rgba(0, 0, 0, 0.5) 0.1em 0.1em; } .context-mode-indicators .current-image-bookmarked { color: yellow; - cursor: hand; + cursor: pointer; text-shadow: rgba(0, 0, 0, 0.5) 0.1em 0.1em 0.4em, rgba(0, 0, 0, 0.5) 0.1em 0.1em; } .global-mode-indicators .marked-only-visible .shown, @@ -1517,7 +1591,7 @@ progress:not(value)::-webkit-progress-bar { position: absolute; display: inline-block; color: red; - cursor: hand; + cursor: pointer; } .progress-bar progress { display: block; diff --git a/ui (gen4)/css/layout.less b/ui (gen4)/css/layout.less index 5bcedf54..0a7c4ea5 100755 --- a/ui (gen4)/css/layout.less +++ b/ui (gen4)/css/layout.less @@ -269,7 +269,7 @@ button:hover { -webkit-app-region: no-drag; } .title-bar .button:hover { - cursor: hand; + cursor: pointer; } .title-bar .close:hover { @@ -357,7 +357,7 @@ button:hover { color: silver; opacity: 0.9; - cursor: hand; + cursor: pointer; } .viewer:empty:after, .ribbon-set:empty:after { @@ -1048,6 +1048,85 @@ stretching in width... */ background: red; } +.overlay-info.full, +.overlay-info.minimal { + display: block; + /* XXX is this correct??? */ + z-index: 1000, +} + +.overlay-info.minimal { + background: transparent; +} +.overlay-info.minimal .full-only { + display: none; +} + +/* XXX REUSE: this is the same as selected/bookmarked image markers... */ +.overlay-info .marked, +.overlay-info .marked:after, +.overlay-info .marked:before, +.overlay-info .bookmarked:after { + display: block; + position: relative; + content: ""; + font-size: 0pt; + border: none; + + margin: 4px; + margin-left: 6px; + + width: 10px; + height: 10px; + + box-shadow: 2px 2px 20px -2px rgba(0,0,0,0.7); + + box-sizing: border-box; + border-radius: 50%; + + background: blue; + + cursor: pointer; +} + +/* tick... */ +.overlay-info .marked { + background: transparent; + margin-left: 6px; +} +.overlay-info .marked:before, +.overlay-info .marked:after { + position: absolute; + bottom: auto; + + border-radius: 3px; + + .rotate(-45deg); +} +.overlay-info .marked:before { + width: 3px; + height: 6px; +} +.overlay-info .marked:after { + width: 12px; + height: 3px; +} + + +.overlay-info .bookmarked:after { + background: yellow; +} + +.overlay-info .marked:not(.on), +.overlay-info .bookmarked:not(.on) { + opacity: 0.5; +} +.overlay-info .marked:not(.on):before, +.overlay-info .marked:not(.on):after, +.overlay-info .bookmarked:not(.on):after { + background: gray; +} + /*************************************************** Global status ***/ @@ -1078,7 +1157,7 @@ stretching in width... */ overflow: hidden; - cursor: hand; + cursor: pointer; } .up-indicator:after, .down-indicator:after { @@ -1217,13 +1296,13 @@ stretching in width... */ .global-mode-indicators .marks-visible, .context-mode-indicators .current-image-marked { color: blue; - cursor: hand; + cursor: pointer; text-shadow: rgba(0,0,0,0.5) 0.1em 0.1em 0.4em, rgba(0,0,0,0.5) 0.1em 0.1em; } .context-mode-indicators .current-image-bookmarked { color: yellow; - cursor: hand; + cursor: pointer; text-shadow: rgba(0,0,0,0.5) 0.1em 0.1em 0.4em, rgba(0,0,0,0.5) 0.1em 0.1em; } @@ -1422,7 +1501,7 @@ progress:not(value)::-webkit-progress-bar { position: absolute; display: inline-block; color: red; - cursor: hand; + cursor: pointer; } .progress-bar progress { display: block; diff --git a/ui (gen4)/features/ui.js b/ui (gen4)/features/ui.js index c38c7178..4b676d10 100755 --- a/ui (gen4)/features/ui.js +++ b/ui (gen4)/features/ui.js @@ -2505,36 +2505,130 @@ var makeStateIndicatorItem = function(container, type, text){ // XXX should we use this or makeStateIndicatorItem(..)??? // ...investigate the features of the above... // - .attr('text')??? -var makeExpandingInfoItem = function(container, cls, align){ +var makeExpandingInfoItem = function(container, cls, align, full_only){ var e = $('') - .addClass(cls + ' expanding-text ' + align) + .addClass(cls + ' expanding-text ' + align +' '+ (full_only && 'full-only')) .append($('')) .append($('