hamloft 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +7 -8
  3. data/lib/hamloft/helpers.rb +2 -1
  4. data/lib/hamloft/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 051661285f92ad34a8ed4528fe0642c816d237cd
4
- data.tar.gz: 755d6db680a81f7520840d192892a1b2d02fac6a
3
+ metadata.gz: 816f99856672df7f62531837ed5f5ed00784beec
4
+ data.tar.gz: f7a9386db71c0660e7cfb38f7ae899ac820f9f26
5
5
  SHA512:
6
- metadata.gz: 38a09f945e5e4cf93a5f57ca43b30f08826d341b2a6792e1c5a63d6cd38956752fa415a8806b0139e1f6eb52a55f7f220d8c98e894d77a2dd53f6b09f7679a04
7
- data.tar.gz: 2d58dea7d5dff0761dbc204aed3f92e1e57ff1d80193ac0542f7bfed541c3dfa6c8f77068fadbbd1845caa48a27bb47dadd11b1a4761febe681d77d862a6cac3
6
+ metadata.gz: 3d22f5d27195bb6b3e33f4f7aa7be12eb3785c7afd56d41a523600a9800962e5e022678b0ddfdd8567e7990b01cb1184a7540c5a501ea548c1160acb0b23b4d5
7
+ data.tar.gz: 8be69597c31f1b3d92afde1ef45ff848d0d186921ba8f03befe9271d16baa9f59773d940ec7cce6c54e38ec8fbcbe733926fd533ed92fbd05b7d33671f13b44f
data/Gemfile.lock CHANGED
@@ -1,16 +1,15 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- hamloft (0.1.0)
4
+ hamloft (0.1.4)
5
5
  activesupport (~> 4.2)
6
- bundler (~> 1.10)
7
6
  haml (~> 4.0)
8
7
  nokogiri (~> 1.6)
9
8
 
10
9
  GEM
11
10
  remote: https://rubygems.org/
12
11
  specs:
13
- activesupport (4.2.3)
12
+ activesupport (4.2.5)
14
13
  i18n (~> 0.7)
15
14
  json (~> 1.7, >= 1.7.7)
16
15
  minitest (~> 5.1)
@@ -21,19 +20,19 @@ GEM
21
20
  parser (~> 2.2)
22
21
  coderay (1.1.0)
23
22
  diff-lcs (1.2.5)
24
- haml (4.0.6)
23
+ haml (4.0.7)
25
24
  tilt
26
25
  i18n (0.7.0)
27
26
  json (1.8.3)
28
27
  method_source (0.8.2)
29
28
  mini_portile (0.6.2)
30
- minitest (5.8.0)
31
- nokogiri (1.6.6.2)
29
+ minitest (5.8.3)
30
+ nokogiri (1.6.6.4)
32
31
  mini_portile (~> 0.6.0)
33
32
  parser (2.2.2.6)
34
33
  ast (>= 1.1, < 3.0)
35
34
  powerpack (0.1.1)
36
- pry (0.10.1)
35
+ pry (0.10.3)
37
36
  coderay (~> 1.1.0)
38
37
  method_source (~> 0.8.1)
39
38
  slop (~> 3.4)
@@ -74,4 +73,4 @@ DEPENDENCIES
74
73
  rubocop (~> 0.32)
75
74
 
76
75
  BUNDLED WITH
77
- 1.10.5
76
+ 1.10.6
data/lib/hamloft/helpers.rb CHANGED
@@ -72,7 +72,8 @@ module Hamloft
72
72
  # get and increase span
73
73
  next_span = row.next_span
74
74
  if next_span
75
- haml_tag :div, :class => "column col-12 col-tablet-#{next_span} col-#{row.options[:collapse_options]}-#{next_span}" do
75
+ phone_cols = (row.options[:collapse_options] == "xs") ? next_span : "12"
76
+ haml_tag :div, :class => "column col-#{phone_cols} col-tablet-#{next_span} col-#{row.options[:collapse_options]}-#{next_span}" do
76
77
  block.call if block
77
78
  drop_container
78
79
  end
data/lib/hamloft/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Hamloft
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hamloft
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tobias Strebitzer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-09 00:00:00.000000000 Z
11
+ date: 2015-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: haml