patternfly-sass 2.0.0 → 2.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -1
  3. data/.travis.yml +10 -2
  4. data/Gemfile +1 -0
  5. data/Rakefile +2 -4
  6. data/assets/stylesheets/_patternfly.scss +4 -4
  7. data/assets/stylesheets/patternfly/_bootstrap-datepicker.scss +21 -1
  8. data/assets/stylesheets/patternfly/_cards.scss +80 -2
  9. data/assets/stylesheets/patternfly/{_bootstrap-combobox-css.scss → _ext-bootstrap-combobox.scss} +0 -0
  10. data/assets/stylesheets/patternfly/{_bootstrap-datepicker-css.scss → _ext-bootstrap-datepicker.scss} +0 -0
  11. data/assets/stylesheets/patternfly/{_bootstrap-select-css.scss → _ext-bootstrap-select.scss} +7 -8
  12. data/assets/stylesheets/patternfly/{_c3-css.scss → _ext-c3.scss} +0 -0
  13. data/assets/stylesheets/patternfly/_variables.scss +1 -0
  14. data/bower.json +20 -4
  15. data/lib/patternfly-sass/version.rb +2 -2
  16. data/patternfly-sass.gemspec +12 -0
  17. data/spec/compare_spec.rb +2 -3
  18. data/spec/html/basic.html +171 -171
  19. data/spec/html/bootstrap-datepicker.html +26 -7
  20. data/spec/html/cards.html +32 -24
  21. data/spec/html/datatables-columns.html +171 -171
  22. data/spec/html/datatables.html +171 -171
  23. data/spec/html/dist/css/patternfly-additions.css +110 -2
  24. data/spec/html/dist/css/patternfly-additions.css.map +1 -1
  25. data/spec/html/dist/css/patternfly-additions.min.css +1 -1
  26. data/spec/html/dist/css/patternfly-additions.min.css.map +1 -1
  27. data/spec/html/dist/css/patternfly.css.map +1 -1
  28. data/spec/html/dist/css/patternfly.min.css.map +1 -1
  29. data/spec/html/main.html +16 -0
  30. data/spec/html/spinner.html +1 -1
  31. data/spec/html/tab.html +171 -171
  32. data/tasks/converter.rb +16 -28
  33. metadata +174 -33
  34. data/.bowerrc +0 -3
data/tasks/converter.rb CHANGED
@@ -24,16 +24,7 @@ module Patternfly
24
24
  :fonts => 'assets/fonts/patternfly'
25
25
  }
26
26
  @test_dir = options[:test_dir]
27
- get_trees(
28
- PATTERNFLY_LESS_ROOT,
29
- BOOTSTRAP_LESS_ROOT,
30
- 'components/bootstrap-select',
31
- 'components/bootstrap-combobox',
32
- 'components/bootstrap-datepicker',
33
- 'components/c3',
34
- 'tests',
35
- 'dist'
36
- )
27
+ get_trees(PATTERNFLY_LESS_ROOT, BOOTSTRAP_LESS_ROOT, 'tests', 'dist')
37
28
  end
38
29
 
39
30
  def process_patternfly
@@ -139,11 +130,10 @@ module Patternfly
139
130
 
140
131
  when 'patternfly.less'
141
132
  file = fix_top_level(file)
142
- # Load external components with a '-css' suffix to distinguish them from our additions
143
- add_to_dist("bootstrap-select/dist/css/bootstrap-select.css", "_bootstrap-select-css.scss")
144
- add_to_dist("bootstrap-combobox/css/bootstrap-combobox.css", "_bootstrap-combobox-css.scss")
145
- add_to_dist("bootstrap-datepicker/dist/css/bootstrap-datepicker3.css", "_bootstrap-datepicker-css.scss")
146
- add_to_dist("c3/c3.css", "_c3-css.scss")
133
+ add_to_dist('bootstrap-select')
134
+ add_to_dist('bootstrap-combobox')
135
+ add_to_dist('bootstrap-datepicker', 'bootstrap-datepicker3')
136
+ add_to_dist('c3')
147
137
  end
148
138
 
149
139
  name_out = "#{File.basename(name, ".less")}.scss"
@@ -157,16 +147,14 @@ module Patternfly
157
147
  FileUtils.mv("#{save_to}/_patternfly.scss", File.expand_path("#{save_to}/../_patternfly.scss"))
158
148
  end
159
149
 
160
- def add_to_dist(name, name_out)
161
- in_file = File.join('components', name);
150
+ # Load external components from rails-assets.org
151
+ def add_to_dist(gemname, file=nil)
152
+ file = "app/assets/stylesheets/#{gemname}/#{file.nil? ? gemname : file}.scss"
153
+ in_file = File.join(Gem::Specification.find_by_name("rails-assets-#{gemname}").gem_dir, file)
162
154
  puts in_file
163
- in_dir = File.dirname(in_file)
164
- dir_files = get_paths_by_directory(in_dir)
165
- file = read_files(dir_files)[in_file]
166
- raise "add_to_dist failed for #{name}" if file.nil?
167
- out_path = File.join(@save_to[:scss], name_out)
168
- save_file(out_path, file)
169
- log_processed("Moving #{File.join(in_dir, in_file)} to #{out_path}")
155
+ out_file = File.join(@save_to[:scss], "_ext-#{gemname}.scss")
156
+ FileUtils.cp(in_file, out_file)
157
+ log_processed("Moving #{in_file} to #{out_file}")
170
158
  end
171
159
 
172
160
  def convert_less(less, *transforms)
@@ -220,11 +208,11 @@ module Patternfly
220
208
  file = replace_all(file, %r{@import\s+"variables";}, "")
221
209
  file = replace_all(file, /@import "([^\.]{2})/, '@import "patternfly/\1')
222
210
  file = replace_all(file, %r{../components/font-awesome/less/font-awesome}, "font-awesome")
223
- file = replace_all(file, %r{../components/bootstrap-select/less/bootstrap-select}, "patternfly/bootstrap-select-css")
211
+ file = replace_all(file, %r{../components/bootstrap-select/less/bootstrap-select}, "patternfly/ext-bootstrap-select")
224
212
  file = replace_all(file, %r{@import\s+"../components/bootstrap/less/bootstrap";}, fetch_bootstrap_sass)
225
- file = replace_all(file, %r{../components/bootstrap-combobox/less/combobox}, "patternfly/bootstrap-combobox-css")
226
- file = replace_all(file, %r{../components/bootstrap-datepicker/less/datepicker3}, "patternfly/bootstrap-datepicker-css")
227
- file = replace_all(file, %r{../components/c3/c3.css}, "patternfly/c3-css")
213
+ file = replace_all(file, %r{../components/bootstrap-combobox/less/combobox}, "patternfly/ext-bootstrap-combobox")
214
+ file = replace_all(file, %r{../components/bootstrap-datepicker/less/datepicker3}, "patternfly/ext-bootstrap-datepicker")
215
+ file = replace_all(file, %r{../components/c3/c3.css}, "patternfly/ext-c3")
228
216
 
229
217
 
230
218
  # Remove undesired lines from the merged top level file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: patternfly-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 2.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dávid Halász
@@ -9,146 +9,286 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-08-12 00:00:00.000000000 Z
12
+ date: 2015-09-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sass
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: 3.4.15
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: 3.4.15
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: bootstrap-sass
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
- - - ~>
32
+ - - "~>"
33
33
  - !ruby/object:Gem::Version
34
34
  version: 3.3.5
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
- - - ~>
39
+ - - "~>"
40
40
  - !ruby/object:Gem::Version
41
41
  version: 3.3.5
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: font-awesome-sass
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ~>
46
+ - - "~>"
47
47
  - !ruby/object:Gem::Version
48
48
  version: 4.3.0
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
- - - ~>
53
+ - - "~>"
54
54
  - !ruby/object:Gem::Version
55
55
  version: 4.3.0
56
+ - !ruby/object:Gem::Dependency
57
+ name: rails-assets-bootstrap-combobox
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - "~>"
61
+ - !ruby/object:Gem::Version
62
+ version: 1.1.6
63
+ type: :development
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: 1.1.6
70
+ - !ruby/object:Gem::Dependency
71
+ name: rails-assets-bootstrap-datepicker
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - "~>"
75
+ - !ruby/object:Gem::Version
76
+ version: 1.4.0
77
+ type: :development
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: 1.4.0
84
+ - !ruby/object:Gem::Dependency
85
+ name: rails-assets-bootstrap-select
86
+ requirement: !ruby/object:Gem::Requirement
87
+ requirements:
88
+ - - "~>"
89
+ - !ruby/object:Gem::Version
90
+ version: 1.7.3
91
+ type: :development
92
+ prerelease: false
93
+ version_requirements: !ruby/object:Gem::Requirement
94
+ requirements:
95
+ - - "~>"
96
+ - !ruby/object:Gem::Version
97
+ version: 1.7.3
98
+ - !ruby/object:Gem::Dependency
99
+ name: rails-assets-bootstrap-treeview
100
+ requirement: !ruby/object:Gem::Requirement
101
+ requirements:
102
+ - - "~>"
103
+ - !ruby/object:Gem::Version
104
+ version: 1.2.0
105
+ type: :development
106
+ prerelease: false
107
+ version_requirements: !ruby/object:Gem::Requirement
108
+ requirements:
109
+ - - "~>"
110
+ - !ruby/object:Gem::Version
111
+ version: 1.2.0
112
+ - !ruby/object:Gem::Dependency
113
+ name: rails-assets-c3
114
+ requirement: !ruby/object:Gem::Requirement
115
+ requirements:
116
+ - - "~>"
117
+ - !ruby/object:Gem::Version
118
+ version: 0.4.10
119
+ type: :development
120
+ prerelease: false
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - "~>"
124
+ - !ruby/object:Gem::Version
125
+ version: 0.4.10
126
+ - !ruby/object:Gem::Dependency
127
+ name: rails-assets-datatables
128
+ requirement: !ruby/object:Gem::Requirement
129
+ requirements:
130
+ - - "~>"
131
+ - !ruby/object:Gem::Version
132
+ version: 1.10.7
133
+ type: :development
134
+ prerelease: false
135
+ version_requirements: !ruby/object:Gem::Requirement
136
+ requirements:
137
+ - - "~>"
138
+ - !ruby/object:Gem::Version
139
+ version: 1.10.7
140
+ - !ruby/object:Gem::Dependency
141
+ name: rails-assets-datatables-colreorder
142
+ requirement: !ruby/object:Gem::Requirement
143
+ requirements:
144
+ - - "~>"
145
+ - !ruby/object:Gem::Version
146
+ version: 1.1.3
147
+ type: :development
148
+ prerelease: false
149
+ version_requirements: !ruby/object:Gem::Requirement
150
+ requirements:
151
+ - - "~>"
152
+ - !ruby/object:Gem::Version
153
+ version: 1.1.3
154
+ - !ruby/object:Gem::Dependency
155
+ name: rails-assets-datatables-colvis
156
+ requirement: !ruby/object:Gem::Requirement
157
+ requirements:
158
+ - - "~>"
159
+ - !ruby/object:Gem::Version
160
+ version: 1.1.2
161
+ type: :development
162
+ prerelease: false
163
+ version_requirements: !ruby/object:Gem::Requirement
164
+ requirements:
165
+ - - "~>"
166
+ - !ruby/object:Gem::Version
167
+ version: 1.1.2
168
+ - !ruby/object:Gem::Dependency
169
+ name: rails-assets-google-code-prettify
170
+ requirement: !ruby/object:Gem::Requirement
171
+ requirements:
172
+ - - "~>"
173
+ - !ruby/object:Gem::Version
174
+ version: 1.0.4
175
+ type: :development
176
+ prerelease: false
177
+ version_requirements: !ruby/object:Gem::Requirement
178
+ requirements:
179
+ - - "~>"
180
+ - !ruby/object:Gem::Version
181
+ version: 1.0.4
182
+ - !ruby/object:Gem::Dependency
183
+ name: rails-assets-matchHeight
184
+ requirement: !ruby/object:Gem::Requirement
185
+ requirements:
186
+ - - "~>"
187
+ - !ruby/object:Gem::Version
188
+ version: 0.6.0
189
+ type: :development
190
+ prerelease: false
191
+ version_requirements: !ruby/object:Gem::Requirement
192
+ requirements:
193
+ - - "~>"
194
+ - !ruby/object:Gem::Version
195
+ version: 0.6.0
56
196
  - !ruby/object:Gem::Dependency
57
197
  name: rake
58
198
  requirement: !ruby/object:Gem::Requirement
59
199
  requirements:
60
- - - ~>
200
+ - - "~>"
61
201
  - !ruby/object:Gem::Version
62
202
  version: '10.4'
63
203
  type: :development
64
204
  prerelease: false
65
205
  version_requirements: !ruby/object:Gem::Requirement
66
206
  requirements:
67
- - - ~>
207
+ - - "~>"
68
208
  - !ruby/object:Gem::Version
69
209
  version: '10.4'
70
210
  - !ruby/object:Gem::Dependency
71
211
  name: term-ansicolor
72
212
  requirement: !ruby/object:Gem::Requirement
73
213
  requirements:
74
- - - '>='
214
+ - - ">="
75
215
  - !ruby/object:Gem::Version
76
216
  version: '0'
77
217
  type: :development
78
218
  prerelease: false
79
219
  version_requirements: !ruby/object:Gem::Requirement
80
220
  requirements:
81
- - - '>='
221
+ - - ">="
82
222
  - !ruby/object:Gem::Version
83
223
  version: '0'
84
224
  - !ruby/object:Gem::Dependency
85
225
  name: rspec
86
226
  requirement: !ruby/object:Gem::Requirement
87
227
  requirements:
88
- - - ~>
228
+ - - "~>"
89
229
  - !ruby/object:Gem::Version
90
230
  version: '3.2'
91
231
  type: :development
92
232
  prerelease: false
93
233
  version_requirements: !ruby/object:Gem::Requirement
94
234
  requirements:
95
- - - ~>
235
+ - - "~>"
96
236
  - !ruby/object:Gem::Version
97
237
  version: '3.2'
98
238
  - !ruby/object:Gem::Dependency
99
239
  name: nokogiri
100
240
  requirement: !ruby/object:Gem::Requirement
101
241
  requirements:
102
- - - ~>
242
+ - - "~>"
103
243
  - !ruby/object:Gem::Version
104
244
  version: '1.6'
105
245
  type: :development
106
246
  prerelease: false
107
247
  version_requirements: !ruby/object:Gem::Requirement
108
248
  requirements:
109
- - - ~>
249
+ - - "~>"
110
250
  - !ruby/object:Gem::Version
111
251
  version: '1.6'
112
252
  - !ruby/object:Gem::Dependency
113
253
  name: rmagick
114
254
  requirement: !ruby/object:Gem::Requirement
115
255
  requirements:
116
- - - ~>
256
+ - - "~>"
117
257
  - !ruby/object:Gem::Version
118
258
  version: '2.15'
119
259
  type: :development
120
260
  prerelease: false
121
261
  version_requirements: !ruby/object:Gem::Requirement
122
262
  requirements:
123
- - - ~>
263
+ - - "~>"
124
264
  - !ruby/object:Gem::Version
125
265
  version: '2.15'
126
266
  - !ruby/object:Gem::Dependency
127
267
  name: imgur-api
128
268
  requirement: !ruby/object:Gem::Requirement
129
269
  requirements:
130
- - - ~>
270
+ - - "~>"
131
271
  - !ruby/object:Gem::Version
132
272
  version: 0.0.4
133
273
  type: :development
134
274
  prerelease: false
135
275
  version_requirements: !ruby/object:Gem::Requirement
136
276
  requirements:
137
- - - ~>
277
+ - - "~>"
138
278
  - !ruby/object:Gem::Version
139
279
  version: 0.0.4
140
280
  - !ruby/object:Gem::Dependency
141
281
  name: selenium-webdriver
142
282
  requirement: !ruby/object:Gem::Requirement
143
283
  requirements:
144
- - - ~>
284
+ - - "~>"
145
285
  - !ruby/object:Gem::Version
146
286
  version: '2.46'
147
287
  type: :development
148
288
  prerelease: false
149
289
  version_requirements: !ruby/object:Gem::Requirement
150
290
  requirements:
151
- - - ~>
291
+ - - "~>"
152
292
  - !ruby/object:Gem::Version
153
293
  version: '2.46'
154
294
  description:
@@ -157,11 +297,10 @@ executables: []
157
297
  extensions: []
158
298
  extra_rdoc_files: []
159
299
  files:
160
- - .bowerrc
161
- - .gitignore
162
- - .rspec
163
- - .rubocop.yml
164
- - .travis.yml
300
+ - ".gitignore"
301
+ - ".rspec"
302
+ - ".rubocop.yml"
303
+ - ".travis.yml"
165
304
  - Gemfile
166
305
  - LICENSE.txt
167
306
  - README.md
@@ -233,21 +372,21 @@ files:
233
372
  - assets/stylesheets/patternfly/_alerts.scss
234
373
  - assets/stylesheets/patternfly/_badges.scss
235
374
  - assets/stylesheets/patternfly/_blank-slate.scss
236
- - assets/stylesheets/patternfly/_bootstrap-combobox-css.scss
237
375
  - assets/stylesheets/patternfly/_bootstrap-combobox.scss
238
- - assets/stylesheets/patternfly/_bootstrap-datepicker-css.scss
239
376
  - assets/stylesheets/patternfly/_bootstrap-datepicker.scss
240
- - assets/stylesheets/patternfly/_bootstrap-select-css.scss
241
377
  - assets/stylesheets/patternfly/_bootstrap-select.scss
242
378
  - assets/stylesheets/patternfly/_bootstrap-treeview.scss
243
379
  - assets/stylesheets/patternfly/_breadcrumbs.scss
244
380
  - assets/stylesheets/patternfly/_buttons.scss
245
- - assets/stylesheets/patternfly/_c3-css.scss
246
381
  - assets/stylesheets/patternfly/_cards.scss
247
382
  - assets/stylesheets/patternfly/_charts.scss
248
383
  - assets/stylesheets/patternfly/_close.scss
249
384
  - assets/stylesheets/patternfly/_datatables.scss
250
385
  - assets/stylesheets/patternfly/_dropdowns.scss
386
+ - assets/stylesheets/patternfly/_ext-bootstrap-combobox.scss
387
+ - assets/stylesheets/patternfly/_ext-bootstrap-datepicker.scss
388
+ - assets/stylesheets/patternfly/_ext-bootstrap-select.scss
389
+ - assets/stylesheets/patternfly/_ext-c3.scss
251
390
  - assets/stylesheets/patternfly/_fonts.scss
252
391
  - assets/stylesheets/patternfly/_forms.scss
253
392
  - assets/stylesheets/patternfly/_icons.scss
@@ -319,6 +458,7 @@ files:
319
458
  - spec/html/labels.html
320
459
  - spec/html/list-group.html
321
460
  - spec/html/login.html
461
+ - spec/html/main.html
322
462
  - spec/html/modals.html
323
463
  - spec/html/navbar.html
324
464
  - spec/html/pagination.html
@@ -347,12 +487,12 @@ require_paths:
347
487
  - lib
348
488
  required_ruby_version: !ruby/object:Gem::Requirement
349
489
  requirements:
350
- - - '>='
490
+ - - ">="
351
491
  - !ruby/object:Gem::Version
352
492
  version: '0'
353
493
  required_rubygems_version: !ruby/object:Gem::Requirement
354
494
  requirements:
355
- - - '>='
495
+ - - ">="
356
496
  - !ruby/object:Gem::Version
357
497
  version: '0'
358
498
  requirements: []
@@ -403,6 +543,7 @@ test_files:
403
543
  - spec/html/labels.html
404
544
  - spec/html/list-group.html
405
545
  - spec/html/login.html
546
+ - spec/html/main.html
406
547
  - spec/html/modals.html
407
548
  - spec/html/navbar.html
408
549
  - spec/html/pagination.html