rails_layout 1.0.26 → 1.0.27

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.textile +4 -0
  3. data/README.textile +8 -6
  4. data/lib/generators/layout/install/install_generator.rb +8 -8
  5. data/lib/rails_layout/version.rb +1 -1
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e229fa2a209b9e826992509aa863411675755c87
4
- data.tar.gz: 920f971e942ab205bdd246e17d8f5d93334199f0
3
+ metadata.gz: 16e1150262e76212d02157ab6fa9a958785356fc
4
+ data.tar.gz: 81b23773d71f52459fb7a25446787115a2a33faa
5
5
  SHA512:
6
- metadata.gz: ba0a3634fb67fe98836bc08c8bf0ec0b8c58444b5d9511989cee1dd7e5f736c107beea0679820826f9a32b6a0159541c10bd02a09fe9cbec7dd6a66109ee92b1
7
- data.tar.gz: b94fd188b6f0c4ed8d3b82286b2a6629e03f5b7f366b0e1b79fc2ce1333b0d861228f34cc5b71c9dbfb9c3c7c9ac1a4d50ee8b8661b2e79cf45ab7e3fec0078a
6
+ metadata.gz: 14bfb434e57d09d4205c368dc47f11878586c0371e0c9f2844829babf6de557c0f0291cb64baf84dc2f4b4f943db09d5f8ca3155c8a6fae70637135acbdbdff0
7
+ data.tar.gz: 7629023203c22dafbcc30d8e3c4880c8ea55d3b3bcf6acdc79f1e44bcb1201941df5ebf86029811ecc23425ffa50ec8e0faec8b3299c83e3a8af6c5457bda848
data/CHANGELOG.textile CHANGED
@@ -1,5 +1,9 @@
1
1
  h1. CHANGELOG
2
2
 
3
+ h3. 1.0.27 October 18, 2015
4
+
5
+ * create a file '1st_load_framework' instead of 'framework_and_overrides' to force loading a framework first (the asset pipeline loads files in a tree in alpha order)
6
+
3
7
  h3. 1.0.26 May 8, 2015
4
8
 
5
9
  * use Rails 'try' when testing if the current_user is an admin (contributed by bogdanvlviv)
data/README.textile CHANGED
@@ -119,7 +119,9 @@ The command will rename *application.css* to *application.css.scss*.
119
119
 
120
120
  It will add:
121
121
 
122
- * *framework_and_overrides.css.scss*
122
+ * *1st_load_framework.css.scss*
123
+
124
+ The Rails asset pipeline loads asset files in alphabetical order (unless the assets are specified explicitly in the manifest file). The file is named @1st_load_framework.css.scss@ so the framework will be loaded first before any custom CSS files added by the developer.
123
125
 
124
126
  And modify the JavaScript asset file:
125
127
 
@@ -209,7 +211,7 @@ See the files that are generated:
209
211
 
210
212
  The RailsLayout gem will create the file:
211
213
 
212
- * "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5_and_overrides.css.scss
214
+ * "app/assets/stylesheets/1st_load_framework.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation5_and_overrides.css.scss
213
215
 
214
216
  and modify the file:
215
217
 
@@ -256,7 +258,7 @@ See the files that are generated:
256
258
 
257
259
  The RailsLayout gem will create the file:
258
260
 
259
- * "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4_and_overrides.css.scss
261
+ * "app/assets/stylesheets/1st_load_framework.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/foundation4_and_overrides.css.scss
260
262
 
261
263
  and modify the file:
262
264
 
@@ -284,7 +286,7 @@ See the files that are generated:
284
286
 
285
287
  The RailsLayout gem will create the file:
286
288
 
287
- * "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss
289
+ * "app/assets/stylesheets/1st_load_framework.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap3_and_overrides.css.scss
288
290
 
289
291
  and modify the file:
290
292
 
@@ -312,7 +314,7 @@ See the files that are generated:
312
314
 
313
315
  The RailsLayout gem will create the file:
314
316
 
315
- * "app/assets/stylesheets/framework_and_overrides.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap2_and_overrides.css.scss
317
+ * "app/assets/stylesheets/1st_load_framework.css.scss":https://github.com/RailsApps/rails_layout/blob/master/lib/generators/layout/install/templates/bootstrap2_and_overrides.css.scss
316
318
 
317
319
  and modify the file:
318
320
 
@@ -358,7 +360,7 @@ The RailsLayout gem will remove any files it may have added:
358
360
  * app/assets/stylesheets/simple.css
359
361
  * app/assets/stylesheets/bootstrap_and_overrides.css.scss
360
362
  * app/assets/stylesheets/foundation_and_overrides.css.scss
361
- * app/assets/stylesheets/framework_and_overrides.css.scss
363
+ * app/assets/stylesheets/1st_load_framework.css.scss
362
364
 
363
365
  Additionally, it will restore these files to the default versions:
364
366
 
data/lib/generators/layout/install/install_generator.rb CHANGED
@@ -20,30 +20,30 @@ module Layout
20
20
  remove_file 'app/assets/stylesheets/simple.css'
21
21
  remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
22
22
  remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
23
- remove_file 'app/assets/stylesheets/framework_and_overrides.css.scss'
23
+ remove_file 'app/assets/stylesheets/1st_load_framework.css.scss'
24
24
  when 'simple'
25
25
  copy_file 'simple.css', 'app/assets/stylesheets/simple.css'
26
26
  copy_file 'application.js', 'app/assets/javascripts/application.js'
27
27
  remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
28
28
  remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
29
- remove_file 'app/assets/stylesheets/framework_and_overrides.css.scss'
29
+ remove_file 'app/assets/stylesheets/1st_load_framework.css.scss'
30
30
  when 'bootstrap2'
31
- copy_file 'bootstrap2_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
31
+ copy_file 'bootstrap2_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
32
32
  copy_file 'bootstrap-application.js', 'app/assets/javascripts/application.js'
33
33
  remove_file 'app/assets/stylesheets/simple.css'
34
34
  remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
35
35
  when 'bootstrap3'
36
- copy_file 'bootstrap3_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
36
+ copy_file 'bootstrap3_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
37
37
  copy_file 'bootstrap-application.js', 'app/assets/javascripts/application.js'
38
38
  remove_file 'app/assets/stylesheets/simple.css'
39
39
  remove_file 'app/assets/stylesheets/foundation_and_overrides.css.scss'
40
40
  when 'foundation4'
41
- copy_file 'foundation4_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
41
+ copy_file 'foundation4_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
42
42
  copy_file 'foundation4-application.js', 'app/assets/javascripts/application.js'
43
43
  remove_file 'app/assets/stylesheets/simple.css'
44
44
  remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
45
45
  when 'foundation5'
46
- copy_file 'foundation5_and_overrides.css.scss', 'app/assets/stylesheets/framework_and_overrides.css.scss'
46
+ copy_file 'foundation5_and_overrides.css.scss', 'app/assets/stylesheets/1st_load_framework.css.scss'
47
47
  copy_file 'foundation5-application.js', 'app/assets/javascripts/application.js'
48
48
  remove_file 'app/assets/stylesheets/simple.css'
49
49
  remove_file 'app/assets/stylesheets/bootstrap_and_overrides.css.scss'
@@ -65,11 +65,11 @@ module Layout
65
65
  when 'bootstrap2'
66
66
  # TODO
67
67
  when 'bootstrap3'
68
- append_file 'app/assets/stylesheets/framework_and_overrides.css.scss', File.read("#{dir}/bootstrap3-forms.css.scss")
68
+ append_file 'app/assets/stylesheets/1st_load_framework.css.scss', File.read("#{dir}/bootstrap3-forms.css.scss")
69
69
  when 'foundation4'
70
70
  # TODO
71
71
  when 'foundation5'
72
- append_file 'app/assets/stylesheets/framework_and_overrides.css.scss', File.read("#{dir}/foundation5-forms.css.scss")
72
+ append_file 'app/assets/stylesheets/1st_load_framework.css.scss', File.read("#{dir}/foundation5-forms.css.scss")
73
73
  end
74
74
  end
75
75
 
data/lib/rails_layout/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsLayout
2
- VERSION = "1.0.26"
2
+ VERSION = "1.0.27"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_layout
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.26
4
+ version: 1.0.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Kehoe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-20 00:00:00.000000000 Z
11
+ date: 2015-10-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  version: '0'
150
150
  requirements: []
151
151
  rubyforge_project:
152
- rubygems_version: 2.4.6
152
+ rubygems_version: 2.4.8
153
153
  signing_key:
154
154
  specification_version: 4
155
155
  summary: Rails generator creates application layout files for Bootstrap and other