twitter-bootstrap-components-rails 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cacb231b7e92b5e36741654726564a3865bb3304
-  data.tar.gz: 81b85b6b71d556ddbebb4b1f79a1bd8bf60b81fc
+  metadata.gz: ab91cf36f3a1102b09f44938b28f855f2642892a
+  data.tar.gz: b9e0e48b6457589d3252c2bb452fe5362222dc07
 SHA512:
-  metadata.gz: 2020b5663d5c244acb2e0563fc82c7f17757d599ad54a64c866ac9b8fa47eff84a33c3dbac047fa2c755c2b6700ba18517b86cb50097ba94e2cf3c684f83decf
-  data.tar.gz: cbaabb1cf1828c9761683ca6a68690ac66c840f798d4fcd452750cc689018baaa39f8b785ba34053ad56c00f0ae56d813ea23b7d07c8a22605c92662f87b1679
+  metadata.gz: cd419a150249dce16e6bb1f4a0ae3e886ee2ce9899b6ef75e997560017b6588a4e9da8bdf680a743142935c176fef088e3d99d2d41c2ed04daffb95e385c7a99
+  data.tar.gz: 73040eb841aaec2b082af74e4dafd35ee13533ee8f61c2e80527600cd3c4bc49c10c2b1da8c03d42739a1d8bfb6c0046a88319e93edb5b5c4a27c76e586c26ec

data/app/components/twitter/bootstrap/components/v3/media_object.rb

@@ -10,6 +10,7 @@ module Twitter
               block_output:             @block_output,
               context:                  context,
               div_media_object_classes: div_media_object_classes,
+              div_container_classes:    div_container_classes,
               image_options:            image_options,
               link_target:              link_target,
               horizontal_alignment:     horizontal_alignment
@@ -20,6 +21,14 @@ module Twitter
             ["media-#{horizontal_alignment}", "media-#{vertical_alignment}"]
           end
 
+          def div_container_classes
+            ['media', additional_div_container_classes]
+          end
+
+          def additional_div_container_classes
+            @options[:additional_div_container_classes] || ''
+          end
+
           def context
             @options[:context]
           end

data/app/components/twitter/bootstrap/components/v3/responsive_media_object.rb

@@ -3,9 +3,23 @@ module Twitter
     module Components
       module V3
         class ResponsiveMediaObject < Twitter::Bootstrap::Components::V3::MediaObject
+          private
+
           def div_media_object_classes
             ["responsive-media-#{horizontal_alignment}", "responsive-media-#{vertical_alignment}"]
           end
+
+          def view_locals
+            super.merge(media_columns: media_columns)
+          end
+
+          def media_columns
+            @options[:media_columns] || 2
+          end
+
+          def div_container_classes
+            ['responsive-media', 'col-lg-12', additional_div_container_classes]
+          end
         end
       end
     end

data/app/components/twitter/bootstrap/components/v4/badge.rb

@@ -25,7 +25,7 @@ module Twitter
           end
 
           def context
-            @options[:context]
+            @options[:context] || :default
           end
         end
       end

data/app/helpers/twitter/bootstrap/components/rails/v4/components_helper.rb

@@ -8,7 +8,7 @@ module Twitter
               Twitter::Bootstrap::Components::V4::Alert.new(self, options, &block).perform
             end
 
-            def bootstrap_badge(options, &block)
+            def bootstrap_badge(options = {}, &block)
               Twitter::Bootstrap::Components::V4::Badge.new(self, options, &block).perform
             end
 

data/app/views/twitter/bootstrap/components/v3/_media_object.html.haml

@@ -1,4 +1,4 @@
-.media
+%div{ class: div_container_classes }
   - if horizontal_alignment == :left
     %div{ class: div_media_object_classes.join(' ') }
       -if link_target.present?

data/app/views/twitter/bootstrap/components/v3/_responsive_media_object.html.haml

@@ -1,14 +1,15 @@
-.responsive-media.col-lg-12
-  - image_div_css_classes = ["col-lg-2"]
-  - image_div_css_classes << "col-lg-push-10" if horizontal_alignment == :right
-  - if image_options[:src].present?
-    %div{ class: image_div_css_classes }
-      -if link_target.present?
-        %a{ href: link_target }
+%div{ class: div_container_classes }
+  .row
+    - image_div_css_classes = ["col-lg-#{media_columns}", "responsive-media-#{horizontal_alignment}"]
+    - image_div_css_classes << "col-lg-push-#{12 - media_columns}" if horizontal_alignment == :right
+    - if image_options[:src].present?
+      %div{ class: image_div_css_classes }
+        -if link_target.present?
+          %a{ href: link_target }
+            %img.responsive-media-object{ image_options }/
+        -else
           %img.responsive-media-object{ image_options }/
-      -else
-        %img.responsive-media-object{ image_options }/
-  - content_div_css_classes = ["responsive-media-body", "col-lg-10"]
-  - content_div_css_classes << "col-lg-pull-2" if horizontal_alignment == :right
-  %div{ class: content_div_css_classes }
-    = block_output
+    - content_div_css_classes = ["responsive-media-body", "responsive-media-body-#{horizontal_alignment}", "col-lg-#{12 - media_columns}"]
+    - content_div_css_classes << "col-lg-pull-#{media_columns}" if horizontal_alignment == :right
+    %div{ class: content_div_css_classes }
+      = block_output

data/lib/twitter/bootstrap/components/rails/version.rb

@@ -2,7 +2,7 @@ module Twitter
   module Bootstrap
     module Components
       module Rails
-        VERSION = '0.2.1'
+        VERSION = '0.2.2'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-components-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails