effective_bootstrap 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cb74427ba892b8619697fdbc5326ba5501f5af
-  data.tar.gz: c4a4e3c701a95d3ead37342482f062ad38f81da6
+  metadata.gz: 4af69c9c4a9ae59f62bedf31c4cdbe3a4e737a9b
+  data.tar.gz: 8e8deb930540714b3cf8a5f925ff4071203641bf
 SHA512:
-  metadata.gz: 299e0d77e352e6fd9ca97c619896dec1ad9c85c215ee3eff0c4ea367992f1b52627b99a85e25e532b465b4a9e75661bac23d1204ecda6576c8cea9b284c4cd55
-  data.tar.gz: 71a77943a61d77d15fe376e89f76ca5bc32bbe8c9fd360dd4344f52e0f723f05f72b7a11eef7847f91d37133d343eef5791c6c165ea17b6c9087611f33d053a5
+  metadata.gz: 136e7e09f5a6dbd8b1a646c79c80ae0df121a2a58dbe3c2c4aaa52f8aded515d6c07b4e3215938156809f8914f5e908f1bfbfe2febc00c1821f3919ea2c21108
+  data.tar.gz: a12111fae308ef8504516805bd37d5d40004633133a255b77cf9a3b4f7e3b047f4ca94ce84dfcd3fe74da7254a5aef080412fd8c761bdc6cfecf86cf3a9757c4

data/app/assets/stylesheets/effective_bootstrap/forms.scss

@@ -13,7 +13,7 @@
 .form-actions-inline.justify-content-end {
   margin-left: 0.5em;
 
-  svg {
+  > svg {
     position: absolute;
     left: -1.6em;
   }
@@ -22,7 +22,7 @@
 .form-actions-inline.justify-content-start {
   margin-right: 0.5em;
 
-  svg {
+  > svg {
     position: absolute;
     right: -1.6em;
   }

data/app/models/effective/form_inputs/save.rb

@@ -3,13 +3,20 @@ module Effective
     class Save < Effective::FormInput
 
       def to_html(&block)
-        content_tag(:button, name, options[:input])
+        content_tag(:button, options[:input]) do
+          icon_name.present? ? (icon(icon_name) + name) : name
+        end
       end
 
       def input_html_options
         { class: 'btn btn-primary', type: 'submit', name: 'commit', value: name }
       end
 
+      def icon_name
+        return @icon unless @icon.nil?
+        @icon = options[:input].delete(:icon) || ''.html_safe
+      end
+
     end
   end
 end

data/app/models/effective/form_inputs/submit.rb

@@ -11,7 +11,15 @@ module Effective
           icon('check', style: 'display: none;'),
           icon('x', style: 'display: none;'),
           icon('spinner'),
-          (block_given? ? capture(&block) : content_tag(:button, name, options[:input]))
+          (
+            if block_given?
+              capture(&block)
+            else
+              content_tag(:button, options[:input]) do
+                icon_name.present? ? (icon(icon_name) + name) : name
+              end
+            end
+          )
         ]
 
         (left? ? tags.reverse.join : tags.join).html_safe
@@ -69,6 +77,11 @@ module Effective
         @right = (options.delete(:right) || false)
       end
 
+      def icon_name
+        return @icon unless @icon.nil?
+        @icon = options[:input].delete(:icon) || ''.html_safe
+      end
+
       def feedback_options
         # case layout
         # when :inline

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails