card-mod-bootstrap 0.11.3 → 0.11.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/lib/bootstrap/component/layout.rb +14 -6
  3. data/set/abstract/bs_badge/tab_badge.haml +1 -1
  4. data/set/type/customized_bootswatch_skin.rb +11 -7
  5. metadata +12 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c1b5216862da9c755299809d5aefbbe6b315e9f74fb1366f7288d51747d2bc5
4
- data.tar.gz: 3d172118cb636bed038468871c601b2346b82835fb71b626e8a0fe54ca5c3dfc
3
+ metadata.gz: 55d82665bf9f0dbe95249c6ca217b2680bc4d5b5c686603d6c2492326ef509d6
4
+ data.tar.gz: a1b37069189c92055118ff4f83d5bdd36b0cbd4ffe8cb5a7c04cb8608de2d56f
5
5
  SHA512:
6
- metadata.gz: 5e2be7b0326866ece8530eb570bd1c0b8e08ef28253f8a656609147fcd22b3bc6836121735b3fd4a9849d02491df2b71cef1848f7234b298b20604df1100afb9
7
- data.tar.gz: d189d5ce0aa14a32bd8ea4c8fba790dd20f4faf2a1b4330da31738d3892973ef426ff622ff0267031a27348e4018f7ce18fb23be48f0b42255da9c90eb965961
6
+ metadata.gz: cadf0a9e8215088ea069a2a03200f8485ca417c9c3cf4450286d812f32b543e13e135a045f39e41886734591d5724376e124054d53337c535e750915522e8fde
7
+ data.tar.gz: 3ee09c23802cc22827423258bfaf33f95aeef889e979b813f530585fc4d0c5fa1f055416fe8eb8addbb2fa3e8843cec9f818b2c5097083789fdf759b2791e885
data/lib/bootstrap/component/layout.rb CHANGED
@@ -81,13 +81,21 @@ class Bootstrap
81
81
  def col_widths args, opts
82
82
  opts = args.pop if args.one? && args.last.is_a?(Hash)
83
83
  if args.present?
84
- raise Error, "bad argument" unless args.all? { |a| a.is_a? Integer }
85
- { md: Array.wrap(args) }
84
+ col_widths_from_args args
86
85
  else
87
- %i[lg xs sm md].each_with_object({}) do |k, cols_w|
88
- next unless (widths = opts.delete(k))
89
- cols_w[k] = Array.wrap widths
90
- end
86
+ col_widths_from_opts opts
87
+ end
88
+ end
89
+
90
+ def col_widths_from_args args
91
+ raise Error, "bad argument" unless args.all? { |a| a.is_a? Integer }
92
+ { md: Array.wrap(args) }
93
+ end
94
+
95
+ def col_widths_from_opts opts
96
+ %i[lg xs sm md].each_with_object({}) do |k, cols_w|
97
+ next unless (widths = opts.delete(k))
98
+ cols_w[k] = Array.wrap widths
91
99
  end
92
100
  end
93
101
  end
data/set/abstract/bs_badge/tab_badge.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  %div.tab-badge.count-number.clearfix{ class: klass }
2
2
  %span.badge.badge-secondary{ class: "badge-#{color}" }
3
- = count
3
+ = number_with_delimiter count
4
4
  %span.badge-label
5
5
  = label
data/set/type/customized_bootswatch_skin.rb CHANGED
@@ -37,13 +37,17 @@ def theme_codename
37
37
  end
38
38
 
39
39
  event :validate_theme_template, :validate, on: :create do
40
- if theme_name
41
- if Card.fetch_type_id(theme_card_name) != Card::BootswatchSkinID
42
- errors.add :abort, tr(:not_valid_theme, theme_name: theme_name)
43
- elsif !Dir.exist? source_dir
44
- puts method(:source_dir).source_location
45
- errors.add :abort, tr(:cannot_source_theme, theme_name: theme_name)
46
- end
40
+ return unless (tname = theme_name) && (etype = theme_error_type)
41
+
42
+ errors.add :abort, t("bootstrap_#{etype}", theme_name: tname)
43
+ end
44
+
45
+ def theme_error_type
46
+ if Card.fetch_type_id(theme_card_name) != Card::BootswatchSkinID
47
+ :not_valid_theme
48
+ elsif !Dir.exist? source_dir
49
+ # puts method(:source_dir).source_location
50
+ :cannot_source_theme
47
51
  end
48
52
  end
49
53
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card-mod-bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.3
4
+ version: 0.11.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-04-01 00:00:00.000000000 Z
13
+ date: 2021-05-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: card
@@ -18,70 +18,70 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.101.3
21
+ version: 1.101.4
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 1.101.3
28
+ version: 1.101.4
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: card-mod-edit
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.11.3
35
+ version: 0.11.4
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.11.3
42
+ version: 0.11.4
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: card-mod-bar_and_box
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.11.3
49
+ version: 0.11.4
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.11.3
56
+ version: 0.11.4
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: card-mod-style
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - '='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.11.3
63
+ version: 0.11.4
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.11.3
70
+ version: 0.11.4
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: card-mod-script
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - '='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.11.3
77
+ version: 0.11.4
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.11.3
84
+ version: 0.11.4
85
85
  description: ''
86
86
  email:
87
87
  - info@decko.org