diff --git a/Viewer/css/layout.less b/Viewer/css/layout.less index c8875f1e..17a4ae4d 100755 --- a/Viewer/css/layout.less +++ b/Viewer/css/layout.less @@ -366,6 +366,14 @@ button:hover { /* Custom buttons... */ + +/* XXX do we need both this and the active update??? */ +.crop-mode .buttons .button.crop, +.collection-mode .buttons .button.collections { + //text-decoration: underline; + opacity: 0.7; +} + .buttons .button.ui-settings { opacity: 0.5; } @@ -529,12 +537,12 @@ button:hover { } /* XXX not sure if this is the right way to go... */ -.single-image-mode .main-buttons:not(:hover) .button, -.single-image-mode .app-buttons:not(:hover) .button { +.single-image-mode .main-buttons:not(:hover), +.single-image-mode .app-buttons:not(:hover) { opacity: 0.1; } -.slideshow-running .main-buttons:not(:hover) .button, -.slideshow-running .app-buttons:not(:hover) .button { +.slideshow-running .main-buttons:not(:hover), +.slideshow-running .app-buttons:not(:hover) { opacity: 0; } diff --git a/Viewer/features/ui-widgets.js b/Viewer/features/ui-widgets.js index 9ce69c64..a27ac397 100755 --- a/Viewer/features/ui-widgets.js +++ b/Viewer/features/ui-widgets.js @@ -3199,12 +3199,6 @@ var ButtonsActions = actions.Actions({ '⦊': ['right', 'nextImage -- Next image'], '↧': ['down', 'shiftImageDown -- Shift image down'], }, - - 'button-highlight-color': 'white', - 'button-highlight-colors': [ - 'white', - 'yellow', - ], }, toggleMainButtons: ['Interface/Main buttons', @@ -3229,14 +3223,6 @@ var ButtonsActions = actions.Actions({ right.apply(this, arguments) }) })()], - - toggleButtonHighlightColor: ['Interface/Theme/Button highlight color', - {mode: 'advancedBrowseModeAction'}, - core.makeConfigToggler( - 'button-highlight-color', - function(){ return this.config['button-highlight-colors'] }, - // update the buttons... - function(){ this.reload() })], }) var Buttons = @@ -3275,12 +3261,6 @@ module.Buttons = core.ImageGridFeatures.Feature({ 'reload', ], function(){ - // XXX is this the right way to go??? - $('.main-buttons.buttons .crop.button') - .css({ 'color': this.cropped ? - (this.config['button-highlight-color'] || 'white') - : '', }) - var l = (this.crop_stack || []).length $('.main-buttons.buttons .crop.button sub') @@ -3305,12 +3285,6 @@ module.Buttons = core.ImageGridFeatures.Feature({ 'collectionUnloaded', ], function(){ - // XXX is this the right way to go??? - $('.main-buttons.buttons .collections.button') - .css({ 'color': this.collection ? - (this.config['button-highlight-color'] || 'white') - : '', }) - var l = this.collections_length // current collection unsaved indicator...