easy_menu 0.4.15 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6a638bcdfe297bb6e2f41352565b316fad190ee0fc6b533b259e7a72789ed09
-  data.tar.gz: cf459de8ccd8c0fa2091fbb0b2a5b2d2ea13b5542a33345724194d2b4fccb41e
+  metadata.gz: 8c74da57817315dcfcff6acaf5d4fff133d0bb836878027f2d509c2660e1e7f0
+  data.tar.gz: 95fbbfca37f5f27a38042d31a64d439b6e8e84308d3f35067d0d77cb1f409454
 SHA512:
-  metadata.gz: 2a6d582f91d3e1af6a17b2cbf6859034b125274606ee8789c3c3b4333bdef06adace04cfa7b5a60ca552ab64a8b3d060a1510c1be085e68802911b0904627342
-  data.tar.gz: 12f98d925d7c7b6ae7717d4c43c6928f487958c1be35d655dfc8fb1e7adfef058ef36955f50a191675956f5e8fd4346c487de0953b7e9c027b5a5591792d4595
+  metadata.gz: a32e544bc8e0cb80fc1b993d38d99ff78865dcc3a2346f446bba16ad4704f3a850462ea5430ae4f0b65ba9a93ea30d5596f2a744b20d3de6387ee89429e69b15
+  data.tar.gz: a9b0fbd467c361a7266e556304b375b830a6d7fbe38f3ee0bac37bf3ae18292fa2faa8470f5c64a97c05d5aa9bca215d7a5284c10da38ad7f0886404f26b92f0

data/app/assets/stylesheets/_easy_menu_mixins.scss

@@ -20,7 +20,7 @@ $menu-border-width: 1px;
 $menu-vertical-padding: 0.2em;
 $menu-item-vertical-padding: 0.4em;
 $menu-item-horizontal-padding: 2em;
-$menu-item-disabled-text-color: #AAA;
+$menu-item-disabled-text-colour: #AAA;
 // Make the button border appear even when in a group by popping the button up above its siblings
 $menu-bar-item-zindex: 1;
 $menu-bar-item-hover-zindex: 2;
@@ -79,6 +79,12 @@ $menu-bar-item-pressed-zindex: 3;
 
   background-color: mix($light, $dark);
 
+  @if is-light($text-colour) {
+    --icon-filter: brightness(6);
+  } @else {
+    --icon-filter: brightness(1);
+  }
+
   // Don't override the background if the browser doesn't support gradients otherwise the buttons will be too dark
   &:not(oldbrowser){
     @include gradient($light, $dark);
@@ -253,7 +259,7 @@ $menu-bar-item-pressed-zindex: 3;
 @mixin menu_item_disabled{
   &.disabled, &.disabled > *{
     cursor: default;
-    color: $menu-item-disabled-text-color;
+    color: $menu-item-disabled-text-colour;
   }
 }
 
@@ -261,4 +267,11 @@ $menu-bar-item-pressed-zindex: 3;
   background-image: asset_url('icons.png');
   background-position: $indent -24px * ($iconNumber - 1);
   background-repeat: no-repeat;
+  filter: var(--icon-filter);
+}
+
+@function is-light($color) {
+  $result: invert($color);
+  $lightness: lightness($result);
+  @return $lightness < 50;
 }

data/app/assets/stylesheets/easy_menu.css.scss

@@ -137,10 +137,9 @@
 
     }
     &.with_menu {
-      .menu_bar_item .arrow{
+      .menu_bar_item .arrow {
         @include easy_menu_icon(5, center);
-        margin: -12px -9px -12px -4px;
-        padding: 24px 14px 0 0;
+        padding: 24px 0 0 0;
         vertical-align: middle;
         width: 10px;
         display: inline-block;
@@ -149,7 +148,7 @@
     }
     &.with_menu.no_js:hover, &.with_menu.open{
       .menu_bar_item {
-        background: white;
+        @include button_colour(white, white, $text-colour: $menu-bar-item-text-color, $text-shadow: none);
         border-radius: 2px 2px 0 0;
         @include menu-bar-item-border-colour-with-fallback;
         border-bottom: none;

data/lib/menu_bar.rb

@@ -84,7 +84,7 @@ class MenuBar
     arrow = @template.content_tag(:span, '', :class => config[:menu_bar_item_arrow_class])
 
     m = Menu.new(config, options)
-    mbt = MenuBarTrigger.new(config, button_text.html_safe + arrow, m, options[:menu_bar_item])
+    mbt = MenuBarTrigger.new(config, button_text.html_safe + ' ' + arrow, m, options[:menu_bar_item])
 
     yield m if block_given?
 
@@ -170,7 +170,7 @@ class MenuBar
     end
 
     def to_s
-      empty? ? '' : wrap_content(@content.join.html_safe) # Don't render anything if empty
+      empty? ? ''.html_safe : wrap_content(@content.join.html_safe) # Don't render anything if empty
     end
 
     def right_aligned?

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.4.17
 platform: ruby
 authors:
 - Nicholas Jakobsen
 - Ryan Wallace
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-17 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,8 +25,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -44,10 +44,10 @@ files:
 - lib/easy_menu_configuration.rb
 - lib/easy_menu_helpers.rb
 - lib/menu_bar.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.23
-signing_key: 
+rubygems_version: 3.5.13
+signing_key:
 specification_version: 4
 summary: Simple menu bar DSL for Rails views
 test_files: []