Merge remote-tracking branch 'upstream/master' into master

ePages-de · Oct 20, 2020 · ccf3b94 · ccf3b94
2 parents 1d9e1d3 + e29b85f
commit ccf3b94
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+### v0.19.1.pre
+
+* bug-fixes
+  * Fix menu display for vertical align
+  * Fix block comment on menu generator template
+
+* features
+  * Add `margin--clear` class for removing all margins
+
 ### v0.19.0.pre
 
 * bug-fixes

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beyond_canvas (0.19.0.pre)
+    beyond_canvas (0.19.1.pre)
       attr_encrypted (~> 3.1)
       beyond_api (~> 0.11)
       bourbon (~> 5.1)
@@ -78,7 +78,7 @@ GEM
     ast (2.4.1)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    beyond_api (0.12.1.pre)
+    beyond_api (0.13.0.pre)
       faraday (~> 0.15)
     bourbon (5.1.0)
       sass (~> 3.4)

diff --git a/app/assets/stylesheets/beyond_canvas/components/_margins.scss b/app/assets/stylesheets/beyond_canvas/components/_margins.scss
@@ -1,4 +1,8 @@
 .margin {
+  &--clear {
+    margin: 0 !important;
+  }
+
   &--top {
     margin-top: 30px;
   }

diff --git a/app/assets/stylesheets/beyond_canvas/components/_menu.scss b/app/assets/stylesheets/beyond_canvas/components/_menu.scss
@@ -15,14 +15,24 @@
     height: $menu-logo-height;
   }
 
+  &--left {
+    display: inherit;
+  }
+
   &--center {
     left: 50%;
     position: absolute;
     transform: translateX(-50%);
+    display: inherit;
+  }
+
+  &--right {
+    display: inherit;
   }
 
   &__item {
     @include margin(0 15px);
+    line-height: 1;
     color: $menu-item-color;
 
     &:hover {

diff --git a/lib/beyond_canvas/version.rb b/lib/beyond_canvas/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  VERSION = '0.19.0.pre'
+  VERSION = '0.19.1.pre'
 end
diff --git a/lib/generators/beyond_canvas/custom_menu/templates/beyond_canvas_custom_menu.html.erb b/lib/generators/beyond_canvas/custom_menu/templates/beyond_canvas_custom_menu.html.erb
@@ -7,25 +7,25 @@
   <div class="menu--center">
 
 <%
-=begin
+=begin %>
     Add here your menu links. You can use `menu__item` as class name and add
     `menu__item--selected` as secondary class for selected menu item. E.g:
 
     <%= link_to 'About us', about_us_path, class: "menu__item #{ 'menu__item--selected' if params[:controller] == 'about_us' }" %>
     <%= link_to 'Support', support_path, class: "menu__item #{ 'menu__item--selected' if params[:controller] == 'support' }" %>
-=end
-%>
+<%
+=end %>
 
   </div>
 
   <div class="menu--right">
 
 <%
-=begin
+=begin %>
     You can also add here some content that will be right-aligned, like a user
     avatar image or a dropdown account menu.
-=end
-%>
+<%
+=end %>
 
   </div>