easy_menu 0.4.11 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67066f55569707ecc2b7bedec38a59e9e1ea638b0d91418ee321c12ddfa6809d
-  data.tar.gz: 852d321575f54dc6ce8fa566685fcd4f5beff1a925d15c2b25ba203ef8bdb0c3
+  metadata.gz: 3fe3886de8f0fb45b088479aa1b6bf867e24e714a0360afad384863998976b00
+  data.tar.gz: 985da2d2593dafc4b62f1b48506a0ef78de5988701a2948a45215b752922972a
 SHA512:
-  metadata.gz: 9b1f37db3f5419795b2389b1de05d8ca93cfb582a61c5cb646bf5845f61b321c1502babb42b36c6b41e477ddedaeeff27078b90bbc493e3569b6ecbc6aead7aa
-  data.tar.gz: 4e4651a676c1a447359ce411f58ebe47f6218f0329ee9abe2121509fef8b369737b8bb62eddd33f6b0ff311ae74ae729fa5f423906b1a78296fff0b4839b65ff
+  metadata.gz: 1b6809f1f149df70b300e617362bac169dcd032e1df5f8dccde0463f9a1431cbc410c75f8524faa583aac59338ab48bdfbefb781c5ef932643bdd0936b34a3e3
+  data.tar.gz: 7c6d3f722a95f8bc0d1c57700b42c5725e2bb7a475f051b837f9e55c12e1e0fa9e4e5d9236c5c661c5de996215f93fcc3bda6cc94512feb057ca78b2db7dbb42

data/app/assets/stylesheets/_easy_menu_mixins.scss

@@ -72,24 +72,18 @@ $menu-bar-item-pressed-zindex: 3;
   background-image: linear-gradient(top, $start 0%, $end 100%);
   background-repeat: no-repeat;
 }
-@mixin button_colour($light, $dark, $text-colour: white, $text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25), $shift: 15px){
-    color: $text-colour !important; // Make this important because host app may override hover colours, but we don't want to be affected
-    text-shadow: $text-shadow;
-    @include menu-bar-item-border($dark);
+@mixin button_colour($light, $dark, $text-colour: white, $text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)){
+  color: $text-colour !important; // Make this important because host app may override hover colours, but we don't want to be affected
+  text-shadow: $text-shadow;
+  @include menu-bar-item-border($dark);
 
-    background-color: mix($light, $dark);
+  background-color: mix($light, $dark);
 
-    // 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);
-      background-color: $dark;
-    }
-
-    &:hover:not(:active):not(.disabled):not(.selected){
-      -moz-transition: background-position 0.1s linear;
-      -webkit-transition: background-position 0.1s linear;
-      background-position: 0 (-$shift);
-    }
+  // 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);
+    background-color: $dark;
+  }
 }
 
 // STYLES
@@ -149,13 +143,16 @@ $menu-bar-item-pressed-zindex: 3;
     left: -9999px;
   }
 }
-@mixin menu_bar_item_hover{
-  &:hover{
+@mixin menu_bar_item_hover($gradient-shift: 15px) {
+  &:hover:not(.disabled):not(.selected) {
     border-color: #888; // Fallback
     border-color: rgba(0,0,0, $menu-bar-item-border-darken * 2);
     border-bottom-color: rgba(0,0,0, $menu-bar-item-border-shadow-darken * 2);
     z-index: $menu-bar-item-hover-zindex;
-    position: relative;
+
+    -moz-transition: background-position 0.1s linear;
+    -webkit-transition: background-position 0.1s linear;
+    background-position: 0 (-$gradient-shift);
   }
 }
 @mixin menu_bar_item_pressed{
@@ -171,14 +168,14 @@ $menu-bar-item-pressed-zindex: 3;
 @mixin menu_bar_item_disabled{
   @include button_colour(#fefefe, #dddede, $menu-bar-item-disabled-text-color, 0 1px 1px rgba(255, 255, 255, 0.75));
   cursor: default;
-  
+
   &:active{
     box-shadow: none;
   }
 }
 
 @mixin menu_bar_item_default_colour{
-  @include button_colour($menu-bar-item-light-colour, $menu-bar-item-dark-colour, $menu-bar-item-text-color, 0 1px 1px rgba(255, 255, 255, 0.75), 5px);
+  @include button_colour($menu-bar-item-light-colour, $menu-bar-item-dark-colour, $menu-bar-item-text-color, 0 1px 1px rgba(255, 255, 255, 0.75));
 }
 @mixin menu_bar_item_danger_colour{
   @include button_colour(#EE5F5B, #BD362F);
@@ -232,7 +229,7 @@ $menu-bar-item-pressed-zindex: 3;
   }
 }
 @mixin menu_item_hover {
-  &.selected > * {
+  &.selected {
     @include easy_menu_icon(9, 5px);
 
     &:hover {
@@ -261,5 +258,7 @@ $menu-bar-item-pressed-zindex: 3;
 }
 
 @mixin easy_menu_icon($iconNumber, $indent:center){
-  background: asset_url('icons.png') $indent -24px * ($iconNumber - 1) no-repeat;
+  background-image: asset_url('icons.png');
+  background-position: $indent -24px * ($iconNumber - 1);
+  background-repeat: no-repeat;
 }

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

@@ -10,7 +10,7 @@
 // STYLES
 .menu_bar.default_theme{
   display: block;
-  margin: 0;
+  margin: 0 (-$menu-bar-item-spacing / 2);
   padding: 0;
   list-style: none;
   height: $menu-bar-height;
@@ -20,9 +20,11 @@
   // MENU BAR_GROUP
   .menu_bar_group{
     padding: 0;
+    margin: 0 $menu-bar-item-spacing/2; // The group takes on the menu bar item margin since internally they will be touching.
 
     .menu_bar_content{
-      margin-left: -$menu-bar-item-spacing - $menu-bar-item-border-width;
+      margin-right: 0;
+      margin-left: -1px;
 
       .menu_bar_item{
         border-radius: 0;
@@ -30,16 +32,12 @@
     }
 
     .menu_bar_content:first-child{
-      margin-left: 0;
-
       .menu_bar_item{
         border-top-left-radius: $menu-bar-item-border-radius;
         border-bottom-left-radius: $menu-bar-item-border-radius;
       }
     }
     .menu_bar_content:last-child{
-      margin-right: 0;
-
       .menu_bar_item{
         border-top-right-radius: $menu-bar-item-border-radius;
         border-bottom-right-radius: $menu-bar-item-border-radius;
@@ -52,7 +50,7 @@
   .menu_bar_content{
     display: inline-block;
     vertical-align: middle;
-    margin: 0 $menu-bar-item-spacing 0 0;
+    margin: 0 ($menu-bar-item-spacing / 2);
 
     // MENU BAR ITEMS
     .menu_bar_item{
@@ -152,7 +150,6 @@
     // Allow right alignment of buttons
     &.right{
       float: right;
-      margin: 0 0 0 $menu-bar-item-spacing;
 
       .menu {
         right: 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_menu
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - Nicholas Jakobsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,9 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.3.23
 signing_key: 
 specification_version: 4
-summary: Simple menu bar dsl for Rails views
+summary: Simple menu bar DSL for Rails views
 test_files: []