easy_menu 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d487df8a9a64414036d134da144d31370d3b8c6
-  data.tar.gz: 5a77584b843bf38439aa7b92275aa767f2a4478b
+  metadata.gz: c303be0f9c4637e4540b1849b11cba3223d412f1
+  data.tar.gz: f76059dd22aefd6983d5c57b3f34bc58add4f7a6
 SHA512:
-  metadata.gz: c7ac520b051771c54c55bc17877e73dceb176d0386cc4c6030db90acc2925924de970f630155c8047deff70f65c6e5c475a1c0c0035cd17587b64468d2e63d67
-  data.tar.gz: 690d1cbb2feae2d153f3bb5ce70b27c0cf170bf141ac9642795a63c923e8d0770e54206972a4cc55b718086764809b7f07fc20e5b9a4d0835403d7d3ad7d9a96
+  metadata.gz: 6a79eeb30d8c39ffc1ef398da0507c2c2437a4589cb1aa475205f4c68ee4613771976c0818eba0e003a09d9f7b4d1c8295696e02b72c6b4fbf8abe3bffc8e63b
+  data.tar.gz: 23e75e9f90b6730e564dfa222c1a42826f62ed2528d8e08e277a219945051e78eebfd99a6d5c40e2a09062a746d8a188ef97d5c88ad63d6fff6f96d97e88a6cc

data/app/assets/stylesheets/_easy_menu_mixins.scss

@@ -219,7 +219,7 @@ $menu-bar-item-pressed-zindex: 3;
   padding: $menu-item-vertical-padding $menu-item-horizontal-padding;
   cursor: pointer;
 
-  a {
+  > * {
     color: $menu-bar-item-text-color;
     padding: $menu-item-vertical-padding $menu-item-horizontal-padding;
     margin: (-$menu-item-vertical-padding) (-$menu-item-horizontal-padding);
@@ -228,25 +228,34 @@ $menu-bar-item-pressed-zindex: 3;
   }
 }
 @mixin menu_item_hover {
-  &.selected a {
-    background: asset_url("checkbox_selected.png") no-repeat 5px center;
+  &.selected > * {
+    @include icon(9, 5px);
 
     &:hover {
-      background: asset_url("checkbox_selected_hovered.png") no-repeat 5px center;
+      @include icon(10, 5px);
     }
   }
   &:hover {
-    background: #08C;
+    background: #3675ca;
     color: white;
+    // Make the highlight cover the borders
+    // Keep the text from shifting due to the margin change
+    margin: 0 -1px;
+    border: solid #3675ca;
+    border-width: 0 1px;
 
-    a {
+    > * {
       color: inherit;
     }
   }
 }
 @mixin menu_item_disabled{
-  &.disabled, &.disabled a{
+  &.disabled, &.disabled > *{
     cursor: default;
     color: $menu-item-disabled-text-color;
   }
 }
+
+@mixin icon($iconNumber, $indent:center){
+  background: asset_url('icons.png') $indent -24px * ($iconNumber - 1) no-repeat;
+}

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

@@ -83,6 +83,7 @@
       padding: $menu-vertical-padding 0;
       position: absolute;
       display: none;
+      min-width: 100%; // Don't be narrower than the menu bar trigger
 
       .menu_content{
         display: block;
@@ -122,11 +123,12 @@
     }
     &.with_menu {
       .menu_bar_item .arrow{
-        background: asset_url('arrows.png') center 87px;
-        display: inline-block;
-        margin-left: 3px;
-        height: 10px;
+        @include icon(5, center);
+        margin: -12px -9px -12px -4px;
+        padding: 24px 14px 0 0;
+        vertical-align: middle;
         width: 10px;
+        display: inline-block;
         vertical-align: middle;
       }
     }

data/lib/menu_bar.rb

@@ -224,7 +224,7 @@ class MenuBar
     end
 
     def click_blocker_html_options
-      html_opts = @click_blocker_html_options
+      html_opts = @click_blocker_html_options.dup
       html_opts.reverse_merge! :title => @options[:title] # Default the title text to be the same as the unblocked title text
 
       merge_class(html_opts, config[:click_blocker_class])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,9 +34,7 @@ files:
 - Gemfile
 - MIT-LICENSE
 - README
-- app/assets/images/arrows.png
-- app/assets/images/checkbox_selected.png
-- app/assets/images/checkbox_selected_hovered.png
+- app/assets/images/icons.png
 - app/assets/javascripts/easy_menu_jquery.js
 - app/assets/javascripts/easy_menu_prototype.js
 - app/assets/stylesheets/_easy_menu_mixins.scss