maglove-widgets 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b30408d90f30a8c8c88029bcbb4f040fcb5ab8c
-  data.tar.gz: 5fc3b4b58b82ca7dd5c87fd1d8dd3292e2d0caa4
+  metadata.gz: 5dc7652853ab41d54619008cf3b26b415bd6da9c
+  data.tar.gz: 0f7c0c83f0a73d8395a9ac5b3e39af23ba9bedf9
 SHA512:
-  metadata.gz: deb601e0fece761e934ee1ffdb7188048ea6f6cf813e02ad1e20cdacb64f06f94f2928681c3e49c0d4ab2a6fd07e3b08f0d65e13b546abb35372f4af729c216a
-  data.tar.gz: c89129fdd685b6bd9a1cf5496aa91d93939f346dd6fc935d9d52924f56418bb32f8bba23b16fc4c6d1c78a49b3d1a26e74abcaf512d7f1a9e9e6be4a490cfaa9
+  metadata.gz: 36a96c291501ff25f03864cf6dab14a9f7af047330de33de2c5918e646a1e555ecca4ea5daf3bbda0ce74497addfcc07e1431e02fa31bad0654fb9e4bd2096f7
+  data.tar.gz: b0cdb230efec492dd9292ec5084e8879b0706695b00f6cf05338d630d6185d47ebfbdb74ac224445ff0c3bdf6b711c1c4f7ef45eac929a88d9b6dede5478e2ce

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maglove-widgets (2.0.3)
+    maglove-widgets (2.0.4)
       hamloft (~> 2.0)
 
 GEM

data/lib/maglove/widgets/base.rb

@@ -20,22 +20,14 @@ module Maglove
       end
 
       def widget_options
-        attributes = { "type" => identifier }
-        classes = []
-        classes.push("mobile-#{@options[:mobile]}") if @options[:mobile]
-        if @options[:effect]
-          classes.push("effect")
-          classes.push("effect-#{@options[:effect]}")
+        attributes = { widget: true }
+        @options.each do |key, value|
+          attributes[key.to_s.dasherize.to_s] = value
         end
-        attributes["class"] = classes.join(" ") if classes.any?
-        widget_style_keys = %i[padding padding_top padding_bottom padding_left padding_right background_color background_image background_size background_position]
-        widget_options = @options.except(*widget_style_keys)
-        styles = @options.slice(*widget_style_keys)
-        attributes["style"] = style_string(styles, :padding, :background_color, :background_size, :background_position) do |sb|
-          sb.add(:background_image, styles[:background_image], "url(<%= value %>)")
-        end
-        widget_options.each do |key, value|
-          attributes["attribute-#{key.to_s.dasherize}"] = value
+        if attributes["padding"]
+          attributes["padding"] = attributes["padding"].join(" ")
+        else
+          attributes["padding"] = "0 0 0 0"
         end
         attributes
       end

data/lib/maglove/widgets/columns.rb

@@ -5,62 +5,19 @@ module Maglove
       attr_reader :column_count
       attr_reader :total_columns
 
-      def initialize(options, scope)
-        super(options, scope)
-        @column_count = 0
-        column_array = @options[:columns].to_s.split("x")
-        if column_array.length == 1
-          @total_columns = column_array[0].to_i
-          @columns = Array.new(@total_columns) { 12 / @total_columns }
-        else
-          @total_columns = column_array.length
-          @columns = column_array
-        end
-      end
-
-      def next_span
-        value = @columns[@column_count]
-        @column_count += 1
-        value
-      end
-
-      def row_options
-        {
-          class: "row row-#{@options[:style]}"
-        }
-      end
-
       def identifier
         "columns"
       end
 
       def defaults
         {
-          columns: "2",
-          style: "default",
+          layout: "6x6",
           collapse_options: "sm"
         }
       end
 
       def template(&block)
-        haml_tag :div, row_options do
-          yield(self) if block
-        end
-      end
-
-      def column(&block)
-        span = next_span
-        if span
-          phone_cols = options[:collapse_options] == "xs" ? span : "12"
-          haml_tag :div, class: "column col-#{phone_cols} col-tablet-#{span} col-#{options[:collapse_options]}-#{span}" do
-            yield if block
-            drop_container
-          end
-        else
-          haml_tag :pre do
-            haml_concat "ERROR: Row does not allow column at position #{column_count}"
-          end
-        end
+        yield if block
       end
     end
   end

data/lib/maglove/widgets/container.rb

@@ -13,45 +13,14 @@ module Maglove
           border_width: "",
           border_style: "",
           border_color: "transparent",
-          style: "default",
           min_height: "",
           max_height: "",
           overflow_y: ""
         }
       end
 
-      def container_options
-        result = { class: container_classes, style: container_styles }
-        result["data-parallax-style"] = @options[:parallax_effect] if !@options[:parallax_effect].empty? and @options[:parallax_effect] != "none"
-        result
-      end
-
-      def image_options
-        { class: "one-container-image", style: image_styles }
-      end
-
-      def container_classes
-        classes = ["one-container"]
-        classes.push("animate #{@options[:animate]}") if @options[:animate] != "none"
-        classes.push("container-#{@options[:style]}") unless @options[:style].empty?
-        classes.push("container-parallax") if !@options[:parallax_effect].empty? and @options[:parallax_effect] != "none"
-        classes.join(" ")
-      end
-
-      def container_styles
-        style_string @options, :border, :border_radius, :border_width, :border_style, :border_color, :min_height
-      end
-
-      def image_styles
-        style_string @options, :max_height, :overflow_y
-      end
-
       def template(&block)
-        haml_tag :section, container_options do
-          haml_tag :div, image_options do
-            yield if block
-          end
-        end
+        yield if block
       end
     end
   end

data/lib/maglove/widgets/heading.rb

@@ -8,18 +8,14 @@ module Maglove
       def defaults
         {
           type: "h1",
-          style: "default",
           align: "left",
-          line_height: ""
+          line_height: "1.3",
+          padding: "0 0 8 0"
         }
       end
 
       def template(&block)
-        haml_tag :header, class: "#{options[:style]} align-#{options[:align]}" do
-          haml_tag options[:type], contenteditable: true, style: style_string(options, :line_height) do
-            yield if block
-          end
-        end
+        yield if block
       end
     end
   end

data/lib/maglove/widgets/image.rb

@@ -19,28 +19,8 @@ module Maglove
         }
       end
 
-      def image_classes
-        classes = ["image-widget"]
-        classes.push("align-#{@options[:align]}")
-        classes.push("popup-position-#{@options[:tooltip_position]}") if popup?
-        classes.join(" ")
-      end
-
-      def popup?
-        !@options[:tooltip_text].blank?
-      end
-
       def template(&block)
-        haml_tag :div, class: image_classes do
-          if popup?
-            haml_tag :i, class: "popup fa fa-lg fa-#{options[:tooltip_icon]}"
-            haml_tag :div, class: "popup-box", style: "font-size: #{options[:tooltip_text_size]}, text-align: #{options[:tooltip_text_alignment]};" do
-              haml_concat(options[:tooltip_text])
-            end
-          end
-          haml_tag :img, class: "image #{options[:style]} #{options[:magnify] ? 'magnific-image' : ''}", src: options[:source]
-          haml_tag :div, class: "image-drop-target"
-        end
+        yield if block
       end
     end
   end

data/lib/maglove/widgets/paragraph.rb

@@ -7,7 +7,6 @@ module Maglove
 
       def defaults
         {
-          style: "default",
           align: "left",
           size: "md",
           drop_cap: "",
@@ -17,16 +16,7 @@ module Maglove
       end
 
       def template(&block)
-        scope.haml_tag :div, class: "paragraph #{options[:style]} align-#{options[:align]} size-#{options[:size]}" do
-          unless options[:drop_cap].empty?
-            haml_tag :span, class: "__dropcap", style: "color: #{options[:drop_cap_color]};" do
-              haml_concat(options[:drop_cap])
-            end
-          end
-          haml_tag :span, contenteditable: true, class: "paragraph-content", style: style_string(options, :line_height) do
-            yield if block
-          end
-        end
+        yield if block
       end
     end
   end

data/maglove-widgets.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "maglove-widgets"
-  s.version     = "2.0.3"
+  s.version     = "2.0.4"
   s.licenses    = ["BSD-3-Clause"]
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tobias Strebitzer"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maglove-widgets
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamloft