effective_bootstrap 0.7.3 → 0.7.4

data/app/assets/images/icons/x-octagon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x-octagon"><polygon points="7.86 2 16.14 2 22 7.86 22 16.14 16.14 22 7.86 22 2 16.14 2 7.86 7.86 2"></polygon><line x1="15" y1="9" x2="9" y2="15"></line><line x1="9" y1="9" x2="15" y2="15"></line></svg>

data/app/assets/images/icons/x-square.svg

@@ -1,15 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <rect x="3" y="3" width="18" height="18" rx="2" ry="2" />
-  <line x1="9" y1="9" x2="15" y2="15" />
-  <line x1="15" y1="9" x2="9" y2="15" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x-square"><rect x="3" y="3" width="18" height="18" rx="2" ry="2"></rect><line x1="9" y1="9" x2="15" y2="15"></line><line x1="15" y1="9" x2="9" y2="15"></line></svg>

data/app/assets/images/icons/x.svg

@@ -1,14 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <line x1="18" y1="6" x2="6" y2="18" />
-  <line x1="6" y1="6" x2="18" y2="18" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-x"><line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line></svg>

data/app/assets/images/icons/youtube.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-youtube"><path d="M22.54 6.42a2.78 2.78 0 0 0-1.94-2C18.88 4 12 4 12 4s-6.88 0-8.6.46a2.78 2.78 0 0 0-1.94 2A29 29 0 0 0 1 11.75a29 29 0 0 0 .46 5.33A2.78 2.78 0 0 0 3.4 19c1.72.46 8.6.46 8.6.46s6.88 0 8.6-.46a2.78 2.78 0 0 0 1.94-2 29 29 0 0 0 .46-5.25 29 29 0 0 0-.46-5.33z"></path><polygon points="9.75 15.02 15.5 11.75 9.75 8.48 9.75 15.02"></polygon></svg>

data/app/assets/images/icons/zap-off.svg

@@ -1,16 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <polyline points="12.41 6.75 13 2 10.57 4.92" />
-  <polyline points="18.57 12.91 21 10 15.66 10" />
-  <polyline points="8 8 3 14 12 14 11 22 16 16" />
-  <line x1="1" y1="1" x2="23" y2="23" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-zap-off"><polyline points="12.41 6.75 13 2 10.57 4.92"></polyline><polyline points="18.57 12.91 21 10 15.66 10"></polyline><polyline points="8 8 3 14 12 14 11 22 16 16"></polyline><line x1="1" y1="1" x2="23" y2="23"></line></svg>

data/app/assets/images/icons/zap.svg

@@ -1,13 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-zap"><polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2"></polygon></svg>

data/app/assets/images/icons/zoom-in.svg

@@ -1,16 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="11" cy="11" r="8" />
-  <line x1="21" y1="21" x2="16.65" y2="16.65" />
-  <line x1="11" y1="8" x2="11" y2="14" />
-  <line x1="8" y1="11" x2="14" y2="11" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-zoom-in"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line><line x1="11" y1="8" x2="11" y2="14"></line><line x1="8" y1="11" x2="14" y2="11"></line></svg>

data/app/assets/images/icons/zoom-out.svg

@@ -1,15 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="11" cy="11" r="8" />
-  <line x1="21" y1="21" x2="16.65" y2="16.65" />
-  <line x1="8" y1="11" x2="14" y2="11" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-zoom-out"><circle cx="11" cy="11" r="8"></circle><line x1="21" y1="21" x2="16.65" y2="16.65"></line><line x1="8" y1="11" x2="14" y2="11"></line></svg>

data/app/helpers/effective_bootstrap_helper.rb

@@ -72,29 +72,42 @@ module EffectiveBootstrapHelper
   # variations can be :dropup, :dropleft, :dropright
   # split can be true, false
   # right is to right align things
-  def dropdown(variation: nil, split: true, btn_class: nil, right: false, &block)
+  def dropdown(variation: nil, split: true, btn_class: nil, btn_content: nil, right: false, &block)
     raise 'expected a block' unless block_given?
 
     btn_class = btn_class.presence || 'btn-outline-primary'
 
-    @_dropdown_link_tos = []; yield
+    @_dropdown_link_tos = []
+    @_dropdown_split = split
+
+    # process dropdown_link_tos
+    yield
 
     return @_dropdown_link_tos.first if @_dropdown_link_tos.length <= 1
 
-    retval = if split
-      first = @_dropdown_link_tos.first
-      menu = content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
-      split = content_tag(:button, class: "btn #{btn_class} dropdown-toggle dropdown-toggle-split", type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
-        content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
-      end
+    # Build tags
+    first = @_dropdown_link_tos.first
+
+    button = content_tag(:button, class: "btn #{btn_class} dropdown-toggle" + (split ? " dropdown-toggle-split" : ''), type: 'button', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) do
+      btn_content || content_tag(:span, 'Toggle Dropdown', class: 'sr-only')
+    end
 
+    menu = if split
+      content_tag(:div, @_dropdown_link_tos[1..-1].join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+    else
+      content_tag(:div, @_dropdown_link_tos.join.html_safe, class: ['dropdown-menu', ('dropdown-menu-right' if right)].compact.join(' '))
+    end
+
+    retval = if split
       content_tag(:div, class: 'btn-group') do
         content_tag(:div, class: ['btn-group', variation.to_s.presence].compact.join(' '), role: 'group') do
-          [:dropleft].include?(variation) ? (split + menu) : (first + split + menu)
+          [:dropleft].include?(variation) ? (button + menu) : (first + button + menu)
         end + ([:dropleft].include?(variation) ? first : '').html_safe
       end
     else
-      raise 'split false is unsupported'
+      content_tag(:div, class: 'dropdown') do
+        button + menu
+      end
     end
 
     @_dropdown_link_tos = nil
@@ -129,7 +142,7 @@ module EffectiveBootstrapHelper
       return link_to(label, path, options)
     end
 
-    if @_dropdown_link_tos.length == 0
+    if @_dropdown_link_tos.length == 0 && @_dropdown_split
       options[:class] = [options[:class], 'btn', btn_class].compact.join(' ')
     else
       options[:class] = [options[:class], 'dropdown-item'].compact.join(' ')

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.7.3'.freeze
+  VERSION = '0.7.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-22 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,6 +114,7 @@ files:
 - app/assets/images/icons/align-right.svg
 - app/assets/images/icons/anchor.svg
 - app/assets/images/icons/aperture.svg
+- app/assets/images/icons/archive.svg
 - app/assets/images/icons/arrow-down-circle.svg
 - app/assets/images/icons/arrow-down-left.svg
 - app/assets/images/icons/arrow-down-right.svg
@@ -168,6 +169,9 @@ files:
 - app/assets/images/icons/cloud.svg
 - app/assets/images/icons/code.svg
 - app/assets/images/icons/codepen.svg
+- app/assets/images/icons/codesandbox.svg
+- app/assets/images/icons/coffee.svg
+- app/assets/images/icons/columns.svg
 - app/assets/images/icons/command.svg
 - app/assets/images/icons/compass.svg
 - app/assets/images/icons/copy.svg
@@ -200,6 +204,7 @@ files:
 - app/assets/images/icons/facebook.svg
 - app/assets/images/icons/fast-forward.svg
 - app/assets/images/icons/feather.svg
+- app/assets/images/icons/figma.svg
 - app/assets/images/icons/file-minus.svg
 - app/assets/images/icons/file-plus.svg
 - app/assets/images/icons/file-text.svg
@@ -210,6 +215,9 @@ files:
 - app/assets/images/icons/folder-minus.svg
 - app/assets/images/icons/folder-plus.svg
 - app/assets/images/icons/folder.svg
+- app/assets/images/icons/framer.svg
+- app/assets/images/icons/frown.svg
+- app/assets/images/icons/gift.svg
 - app/assets/images/icons/git-branch.svg
 - app/assets/images/icons/git-commit.svg
 - app/assets/images/icons/git-merge.svg
@@ -224,12 +232,14 @@ files:
 - app/assets/images/icons/headphones.svg
 - app/assets/images/icons/heart.svg
 - app/assets/images/icons/help-circle.svg
+- app/assets/images/icons/hexagon.svg
 - app/assets/images/icons/home.svg
 - app/assets/images/icons/image.svg
 - app/assets/images/icons/inbox.svg
 - app/assets/images/icons/info.svg
 - app/assets/images/icons/instagram.svg
 - app/assets/images/icons/italic.svg
+- app/assets/images/icons/key.svg
 - app/assets/images/icons/layers.svg
 - app/assets/images/icons/layout.svg
 - app/assets/images/icons/life-buoy.svg
@@ -246,6 +256,7 @@ files:
 - app/assets/images/icons/map.svg
 - app/assets/images/icons/maximize-2.svg
 - app/assets/images/icons/maximize.svg
+- app/assets/images/icons/meh.svg
 - app/assets/images/icons/menu.svg
 - app/assets/images/icons/message-circle.svg
 - app/assets/images/icons/message-square.svg
@@ -260,6 +271,7 @@ files:
 - app/assets/images/icons/moon.svg
 - app/assets/images/icons/more-horizontal.svg
 - app/assets/images/icons/more-vertical.svg
+- app/assets/images/icons/mouse-pointer.svg
 - app/assets/images/icons/move.svg
 - app/assets/images/icons/music.svg
 - app/assets/images/icons/navigation-2.svg
@@ -269,6 +281,7 @@ files:
 - app/assets/images/icons/paperclip.svg
 - app/assets/images/icons/pause-circle.svg
 - app/assets/images/icons/pause.svg
+- app/assets/images/icons/pen-tool.svg
 - app/assets/images/icons/percent.svg
 - app/assets/images/icons/phone-call.svg
 - app/assets/images/icons/phone-forwarded.svg
@@ -314,6 +327,7 @@ files:
 - app/assets/images/icons/slash.svg
 - app/assets/images/icons/sliders.svg
 - app/assets/images/icons/smartphone.svg
+- app/assets/images/icons/smile.svg
 - app/assets/images/icons/speaker.svg
 - app/assets/images/icons/spinner.svg
 - app/assets/images/icons/square.svg
@@ -331,13 +345,16 @@ files:
 - app/assets/images/icons/thumbs-up.svg
 - app/assets/images/icons/toggle-left.svg
 - app/assets/images/icons/toggle-right.svg
+- app/assets/images/icons/tool.svg
 - app/assets/images/icons/trash-2.svg
 - app/assets/images/icons/trash.svg
+- app/assets/images/icons/trello.svg
 - app/assets/images/icons/trending-down.svg
 - app/assets/images/icons/trending-up.svg
 - app/assets/images/icons/triangle.svg
 - app/assets/images/icons/truck.svg
 - app/assets/images/icons/tv.svg
+- app/assets/images/icons/twitch.svg
 - app/assets/images/icons/twitter.svg
 - app/assets/images/icons/type.svg
 - app/assets/images/icons/umbrella.svg
@@ -363,8 +380,10 @@ files:
 - app/assets/images/icons/wifi.svg
 - app/assets/images/icons/wind.svg
 - app/assets/images/icons/x-circle.svg
+- app/assets/images/icons/x-octagon.svg
 - app/assets/images/icons/x-square.svg
 - app/assets/images/icons/x.svg
+- app/assets/images/icons/youtube.svg
 - app/assets/images/icons/zap-off.svg
 - app/assets/images/icons/zap.svg
 - app/assets/images/icons/zoom-in.svg