flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 18:30:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup + tweaking crop/collection button highlighing...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2021-03-03 01:31:11 +03:00
parent de5fbc29c3
commit 993efe9e23
2 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Viewer/css/layout.less
View File

@ -366,6 +366,14 @@ button:hover {
/* Custom buttons... */ /* 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 { .buttons .button.ui-settings {
opacity: 0.5; opacity: 0.5;
} }
@ -529,12 +537,12 @@ button:hover {
} }
/* XXX not sure if this is the right way to go... */ /* XXX not sure if this is the right way to go... */
.single-image-mode .main-buttons:not(:hover) .button, .single-image-mode .main-buttons:not(:hover),
.single-image-mode .app-buttons:not(:hover) .button { .single-image-mode .app-buttons:not(:hover) {
opacity: 0.1; opacity: 0.1;
} }
.slideshow-running .main-buttons:not(:hover) .button, .slideshow-running .main-buttons:not(:hover),
.slideshow-running .app-buttons:not(:hover) .button { .slideshow-running .app-buttons:not(:hover) {
opacity: 0; opacity: 0;
} }

26
Viewer/features/ui-widgets.js
View File

@ -3199,12 +3199,6 @@ var ButtonsActions = actions.Actions({
'&#10634;': ['right', 'nextImage -- Next image'], '&#10634;': ['right', 'nextImage -- Next image'],
'&#8615;': ['down', 'shiftImageDown -- Shift image down'], '&#8615;': ['down', 'shiftImageDown -- Shift image down'],
}, },
'button-highlight-color': 'white',
'button-highlight-colors': [
'white',
'yellow',
],
}, },
toggleMainButtons: ['Interface/Main buttons', toggleMainButtons: ['Interface/Main buttons',
@ -3229,14 +3223,6 @@ var ButtonsActions = actions.Actions({
right.apply(this, arguments) 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 = var Buttons =
@ -3275,12 +3261,6 @@ module.Buttons = core.ImageGridFeatures.Feature({
'reload', 'reload',
], ],
function(){ 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 var l = (this.crop_stack || []).length
$('.main-buttons.buttons .crop.button sub') $('.main-buttons.buttons .crop.button sub')
@ -3305,12 +3285,6 @@ module.Buttons = core.ImageGridFeatures.Feature({
'collectionUnloaded', 'collectionUnloaded',
], ],
function(){ 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 var l = this.collections_length
// current collection unsaved indicator... // current collection unsaved indicator...