diff --git a/core/misc/dropbutton/dropbutton.base-rtl.css b/core/misc/dropbutton/dropbutton.base-rtl.css index 000b59a..64684f5 100644 --- a/core/misc/dropbutton/dropbutton.base-rtl.css +++ b/core/misc/dropbutton/dropbutton.base-rtl.css @@ -17,8 +17,8 @@ right: auto; } .dropbutton-multiple .dropbutton-widget { - left: 0; - right: auto; + left: auto; + right: 0; } .dropbutton-multiple .dropbutton-widget { padding-left: 2em; diff --git a/core/misc/dropbutton/dropbutton.base.css b/core/misc/dropbutton/dropbutton.base.css index b5e5c19..5876f6f 100644 --- a/core/misc/dropbutton/dropbutton.base.css +++ b/core/misc/dropbutton/dropbutton.base.css @@ -48,7 +48,7 @@ display: block; padding-right: 2em; /* LTR */ position: absolute; - right: 0; /* LTR */ + left: 0; /* LTR */ } .dropbutton-multiple.open, .dropbutton-multiple.open .dropbutton-widget { @@ -74,10 +74,10 @@ .dropbutton-multiple .dropbutton-link { display: block; } -.dropbutton-multiple .dropbutton-content .secondary { +.dropbutton-multiple .dropbutton-content .secondary-actions { display: none; } -.dropbutton-multiple.open .dropbutton-content .secondary { +.dropbutton-multiple.open .dropbutton-content .secondary-actions { display: block; } .dropbutton-arrow { diff --git a/core/misc/dropbutton/dropbutton.js b/core/misc/dropbutton/dropbutton.js index 89cb17e..6adf0b2 100644 --- a/core/misc/dropbutton/dropbutton.js +++ b/core/misc/dropbutton/dropbutton.js @@ -27,7 +27,7 @@ */ var defaults = { title: Drupal.t('Open dropbutton') -} +}; /** * A DropButton presents an HTML list as a button with a primary action. @@ -88,7 +88,7 @@ function DropButton (dropbutton, options) { 'class': classes.join(' '), 'id': id, 'html': $('
', { - 'class': 'dropbutton-widget', + 'class': 'dropbutton-widget' }) }) ) @@ -99,7 +99,7 @@ function DropButton (dropbutton, options) { this.$secondaryActions = this.$list .find('li') .not(':first') - .addClass('secondary'); + .addClass('secondary-actions'); if (this.$secondaryActions.length) { this.$dropbutton.addClass('dropbutton-multiple'); // Build the dropbutton-toggle. @@ -123,14 +123,14 @@ function DropButton (dropbutton, options) { 'click.dropbutton': $.proxy(this, 'toggleClickHandler') }, '.dropbutton-link'); }, - hoverIn: function (event) { + hoverIn: function () { // Clear any previous timer we were using. if (this.timerID) { clearTimeout(this.timerID); } this.isHovered = true; }, - hoverOut: function (event) { + hoverOut: function () { this.isHovered = false; this.toggle(); }, diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css index 5841e8e..ad66c73 100644 --- a/core/themes/seven/style.css +++ b/core/themes/seven/style.css @@ -967,11 +967,11 @@ div.add-or-remove-shortcuts { /* Dropbutton */ .dropbutton-widget { - background-color: white; - background-image: -moz-linear-gradient(-90deg, rgba(255, 255, 255, 0), rgb(231, 231, 231)); - background-image: -o-linear-gradient(-90deg, rgba(255, 255, 255, 0), rgb(231, 231, 231)); - background-image: -webkit-linear-gradient(-90deg, rgba(255, 255, 255, 0), rgb(231, 231, 231)); - background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0), rgb(231, 231, 231)); + background-color: #fff; + background-image: -moz-linear-gradient(-90deg, rgba(255, 255, 255, 0), #e7e7e7); + background-image: -o-linear-gradient(-90deg, rgba(255, 255, 255, 0), #e7e7e7); + background-image: -webkit-linear-gradient(-90deg, rgba(255, 255, 255, 0), #e7e7e7); + background-image: linear-gradient(-90deg, rgba(255, 255, 255, 0), #e7e7e7); border-radius: 5px; } .dropbutton-widget:hover { @@ -979,7 +979,7 @@ div.add-or-remove-shortcuts { border-color: #b8b8b8; } .dropbutton-multiple.open .dropbutton-widget:hover { - background-color: white; + background-color: #fff; } .dropbutton-content li:first-child > * { text-overflow: ellipsis;