diff --git a/ui (gen4)/css/experimenting.css b/ui (gen4)/css/experimenting.css index bc40baf2..bd19790e 100755 --- a/ui (gen4)/css/experimenting.css +++ b/ui (gen4)/css/experimenting.css @@ -262,7 +262,7 @@ body { */ /* XXX experimental key mappings... */ -.browse-widget.show-keys .list>div:after { +.browse-widget.browse-actions.show-keys .list>div:after { display: inline; position: relative; content: attr(keys); @@ -274,17 +274,23 @@ body { opacity: 0.3; font-style: italic; } -.browse-widget.show-keys .list>div.disabled:after { +.browse-widget.browse-actions.show-keys .list>div.disabled:after { opacity: 0.5; } -.browse-widget.show-keys .list>div:hover:after { +.browse-widget.browse-actions.show-keys .list>div:hover:after { opacity: 0.5; } -.browse-widget.show-keys .list>div.disabled:hover:after { +.browse-widget.browse-actions.show-keys .list>div.disabled:hover:after { opacity: 1; } +/* make buttons a bit different in action browser... */ +.browse-widget.browse-actions.show-keys .list .button { + background-color: rgba(0, 0, 0, 0.1); +} + + /* DEBUG stuff... */ .container-center { diff --git a/ui (gen4)/css/widget/browse.css b/ui (gen4)/css/widget/browse.css index 2c16b156..2c86edcf 100755 --- a/ui (gen4)/css/widget/browse.css +++ b/ui (gen4)/css/widget/browse.css @@ -210,8 +210,6 @@ padding-left: 10px; padding-right: 10px; box-sizing: border-box; - /* XXX not sure about this yet... */ - background-color: rgba(0, 0, 0, 0.1); } .browse-widget .list .button:hover { opacity: 0.9; diff --git a/ui (gen4)/features/base.js b/ui (gen4)/features/base.js index 5761fd9e..21430fb9 100755 --- a/ui (gen4)/features/base.js +++ b/ui (gen4)/features/base.js @@ -1142,10 +1142,10 @@ module.ImageGroupActions = actions.Actions({ } }], // shorthands to .groupTo(..) - groupBack: ['Group|Edit/Group target image with the image or group before it', + groupBack: ['Group|Edit/Group backwards', {journal: true}, function(target){ this.groupTo(target, 'prev') }], - groupForward: ['Group|Edit/Group target image with the image or group after it', + groupForward: ['Group|Edit/Group forwards', {journal: true}, function(target){ this.groupTo(target, 'next') }], diff --git a/ui (gen4)/features/ui-widgets.js b/ui (gen4)/features/ui-widgets.js index f4f17b77..24f5cb7d 100755 --- a/ui (gen4)/features/ui-widgets.js +++ b/ui (gen4)/features/ui-widgets.js @@ -763,7 +763,8 @@ var BrowseActionsActions = actions.Actions({ '80:Edit', '70:Navigate', '60:Image', - '50:Crop', + '50:Ribbon', + '40:Crop', 'Crop/80:Crop marked images', 'Crop/80:Crop bookmarked images', // NOTE: we can also add separators here...