magic_stylez 0.0.0.52 → 0.0.0.53

Sign up to get free protection for your applications and to get access to all the features.
Files changed (39) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +10 -0
  3. data/lib/generators/magic_stylez/install_generator.rb +44 -30
  4. data/lib/generators/magic_stylez/update_generator.rb +89 -0
  5. data/lib/magic_stylez/version.rb +1 -1
  6. data/test/dummy/app/assets/images/ico/apple-touch-icon-114x114-precomposed.png +0 -0
  7. data/test/dummy/app/assets/images/ico/apple-touch-icon-144x144-precomposed.png +0 -0
  8. data/test/dummy/app/assets/images/ico/apple-touch-icon-57x57-precomposed.png +0 -0
  9. data/test/dummy/app/assets/images/ico/apple-touch-icon-72x72-precomposed.png +0 -0
  10. data/test/dummy/app/assets/images/ico/apple-touch-icon-precomposed.png +0 -0
  11. data/test/dummy/app/assets/images/ico/apple-touch-icon.png +0 -0
  12. data/test/dummy/app/assets/images/ico/favicon.ico +0 -0
  13. data/test/dummy/app/assets/images/ico/favicon.png +0 -0
  14. data/test/dummy/app/assets/images/logo.jpg +0 -0
  15. data/test/dummy/app/assets/images/logo.png +0 -0
  16. data/test/dummy/app/assets/javascripts/views/content/buttons.jst.eco +41 -3
  17. data/test/dummy/app/assets/javascripts/views/layout/section.jst.eco +26 -0
  18. data/test/dummy/app/assets/stylesheets/corporate/_colors.scss +6 -1
  19. data/test/dummy/app/assets/stylesheets/corporate/_fonts.scss +0 -2
  20. data/test/dummy/app/assets/stylesheets/corporate/_typo.scss +0 -2
  21. data/test/dummy/app/assets/stylesheets/corporate/_variables.scss +11 -1
  22. data/test/dummy/app/views/front/start.html.erb +13 -0
  23. data/test/dummy/app/views/layouts/application.html.erb +13 -0
  24. data/test/dummy/public/favicon.ico +0 -0
  25. data/test/dummy/public/favicon.png +0 -0
  26. data/test/dummy/public/html/aside-nav.html +2 -2
  27. data/test/dummy/public/html/fixed-header.html +2 -2
  28. data/test/dummy/public/html/fixed-subnav.html +2 -2
  29. data/test/dummy/public/html/index.html +23 -3
  30. data/test/dummy/public/html/slidebar-header.html +2 -2
  31. data/test/dummy/public/html/slidebar-subnav.html +2 -2
  32. data/vendor/assets/stylesheets/corporate/_colors.scss +6 -1
  33. data/vendor/assets/stylesheets/corporate/_fonts.scss +0 -2
  34. data/vendor/assets/stylesheets/corporate/_typo.scss +0 -2
  35. data/vendor/assets/stylesheets/corporate/_variables.scss +11 -1
  36. data/vendor/assets/stylesheets/magic/content/_buttons.scss +46 -0
  37. data/vendor/assets/stylesheets/magic/layout/_section.scss +50 -2
  38. data/vendor/assets/stylesheets/magic/lib/_helper.scss +5 -0
  39. metadata +23 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 886d1cf261d7cded6591f3f83ba02fece0b5a6e4
4
- data.tar.gz: e1a6c26ecb8f8bd92e577d5e43370a8a690e7ff0
3
+ metadata.gz: cbd4700f4c485073660935c732434aba5c54375e
4
+ data.tar.gz: 37da605d34de87305c9f2a40cb5e37b14410ab88
5
5
  SHA512:
6
- metadata.gz: 66ef874723d861512a342963f826f8c0c24a254af2c187ac0fbf026ad1bf0f12578ef120799355908879b3f109e6c9fb9a7d9a350b3d6b2aea1fba8a9d2bd2ec
7
- data.tar.gz: ffb0cb9110d348295e7dcbe0565260a696b4d148aaef684ed16e47fff12344a195a0384fbdeaf6c7ec468ee8dcbaf9dec5f10d7f860d3c8427cc66cff8126bd0
6
+ metadata.gz: be3b9dc36bf1bb11288008f0534f0e6d560241b2d690e125df0d73870242e71fdc14f00916046f3e2657c0c34cd85e97d1bef17d634a48c2813c38368f588115
7
+ data.tar.gz: aec06fe08a39bc82942c0ca0fe8ed45520a86e45dc63c751f1d51a30dfb2e7807378bb2267576eaa18b65387de33a24ff27e520a97ceda5d15c96e132f6ecafe
data/README.md CHANGED
@@ -34,6 +34,16 @@
34
34
  //= 'magic-min'; /* import basic */
35
35
  ```
36
36
 
37
+ ## NEW*
38
+
39
+ - **magic-styles update generator**
40
+ - in the process I often add new variables to the corporate files
41
+ (*what causes "Missing variable!" when you update to new version*)
42
+ - this generator adds all new variables without touching your settings
43
+ ```ruby
44
+ $ rails g magic_stylez:update
45
+ ```
46
+
37
47
 
38
48
 
39
49
  ### Thanks
@@ -17,39 +17,53 @@ module MagicStylez
17
17
 
18
18
  def copy_corporate
19
19
  puts("...")
20
- empty_directory "app/assets/stylesheets/corporate"
21
- %w(colors fonts typo variables).each do |that|
22
- copy_file "vendor/assets/stylesheets/corporate/_#{that}.scss", "app/assets/stylesheets/corporate/_#{that}.scss"
20
+ if File.directory?("#{::Rails.root}/app/assets/stylesheets/corporate")
21
+ puts("... C A U T I O N !!!")
22
+ puts("...")
23
+ puts("... please use update generator (rails g magic_stylez:update) to keep your changes!")
24
+ puts("...")
25
+ else
26
+ empty_directory "app/assets/stylesheets/corporate"
27
+ Dir.glob("#{::MagicStylez::Rails::Engine.root}/vendor/assets/stylesheets/corporate/**/*").each do |fl|
28
+ file_name = File.basename( fl )
29
+ if file_name.match(/^_([a-z]*).scss$/)
30
+ puts("add file: corporate/#{file_name.match(/^_([a-z]*).scss$/)[0]}")
31
+ copy_file "vendor/assets/stylesheets/corporate/#{file_name}", "app/assets/stylesheets/corporate/#{file_name}"
32
+ end
33
+ end
34
+ puts("...")
35
+ end_desc
23
36
  end
24
- puts("...")
25
37
  end
26
38
 
27
- def end_desc
28
- puts("========================================================================================================")
29
- puts("- - - - - - - - M A G I C S T Y L E Z - - - - - - - -")
30
- puts("--------------------------------------------------------------------------------------------------------")
31
- puts(" . . . T O D O s: . . . ")
32
- puts(" . . . . . . ")
33
- puts(" . . . -> add magic-styles to your app's stylesheets! . . . ")
34
- puts(" . . . . . . ")
35
- puts(" . . . sass: @import 'magic-stylez'; // import all . . . ")
36
- puts(" . . . @import 'magic-min'; // import basic . . . ")
37
- puts(" . . . . . . ")
38
- puts(" . . . css: //= 'magic-stylez'; // import all . . . ")
39
- puts(" . . . //= 'magic-min'; // import basic . . . ")
40
- puts(" . . . . . . ")
41
- puts(" . . . . . . ")
42
- puts(" . . . -> add magic-styles to your app's javascripts! . . . ")
43
- puts(" . . . . . . ")
44
- puts(" . . . //= 'magic-stylez'; // import all . . . ")
45
- puts(" . . . //= 'magic-min'; // import basic . . . ")
46
- puts(" . . . . . . ")
47
- puts(" . . . -> check the documentation for possible stuff . . . ")
48
- puts(" . . . . . . ")
49
- puts(" . . . http://berlinmagic.github.io/magic_stylez/ . . . ")
50
- puts(" . . . . . . ")
51
- puts("========================================================================================================")
52
- end
39
+
40
+ private
41
+
42
+ def end_desc
43
+ puts("========================================================================================================")
44
+ puts("- - - - - - - - M A G I C S T Y L E Z - - - - - - - -")
45
+ puts("--------------------------------------------------------------------------------------------------------")
46
+ puts(" . . . Version #{::MagicStylez::VERSION.to_s.ljust(10)} . . . ")
47
+ puts(" . . . http://berlinmagic.github.io/magic_stylez/ . . . ")
48
+ puts(" . . . . . . ")
49
+ puts(" . . . T O D O s: . . . ")
50
+ puts(" . . . . . . ")
51
+ puts(" . . . -> add magic-styles to your app's stylesheets! . . . ")
52
+ puts(" . . . . . . ")
53
+ puts(" . . . sass: @import 'magic-stylez'; // import all . . . ")
54
+ puts(" . . . @import 'magic-min'; // import basic . . . ")
55
+ puts(" . . . . . . ")
56
+ puts(" . . . css: //= 'magic-stylez'; // import all . . . ")
57
+ puts(" . . . //= 'magic-min'; // import basic . . . ")
58
+ puts(" . . . . . . ")
59
+ puts(" . . . . . . ")
60
+ puts(" . . . -> add magic-styles to your app's javascripts! . . . ")
61
+ puts(" . . . . . . ")
62
+ puts(" . . . //= 'magic-stylez'; // import all . . . ")
63
+ puts(" . . . //= 'magic-min'; // import basic . . . ")
64
+ puts(" . . . . . . ")
65
+ puts("========================================================================================================")
66
+ end
53
67
 
54
68
  end
55
69
  end
@@ -0,0 +1,89 @@
1
+ # encoding: utf-8
2
+ module MagicStylez
3
+ module Generators
4
+ class UpdateGenerator < ::Rails::Generators::Base
5
+ include Thor::Actions
6
+
7
+ desc "Creates a corporate folder to customize magic-stylez."
8
+
9
+ source_root("#{::MagicStylez::Rails::Engine.root}/app/assets/stylesheets/corporate")
10
+ destination_root = "#{::Rails.root}/app/assets/stylesheets/corporate"
11
+
12
+ def initial_desc
13
+ puts(' * * * * * * * * * * * * * * * * * * * * * * * * * * ')
14
+ puts(' - - - - - - - - - - M A G I C S T Y L E Z - - - - - - - - - - ')
15
+ puts(' * * * * * * * * * * * * * * * * * * * * * * * * * * ')
16
+ end
17
+
18
+ def update_corporates
19
+ puts("...")
20
+ puts("... Updating Corporate-folder to version #{::MagicStylez::VERSION}")
21
+ puts("...")
22
+ if File.directory?("#{::Rails.root}/app/assets/stylesheets/corporate")
23
+ Dir.glob("#{::MagicStylez::Rails::Engine.root}/vendor/assets/stylesheets/corporate/**/*").each do |fl|
24
+ file_name = File.basename( fl )
25
+ if file_name.match(/^_([a-z]*).scss$/)
26
+ destination = "#{::Rails.root}/app/assets/stylesheets/corporate/#{file_name}"
27
+ short_name = file_name.match(/^_([a-z]*).scss$/)[0]
28
+ puts("check: corporate/#{short_name}")
29
+ if File.exists?( destination )
30
+ diffrents = compare_style_file( file_name )
31
+ if diffrents.present?
32
+ append_to_file destination, diffrents
33
+ puts("> add new variables")
34
+ puts("...")
35
+ end
36
+ else
37
+ copy_file file_name, file_name
38
+ puts("copied new file: corporate/#{short_name}")
39
+ end
40
+ end
41
+ end
42
+ else
43
+ puts("E R R O R !!!")
44
+ puts("corporate folder doesn't exist!")
45
+ puts("please run the install generator first.")
46
+ end
47
+ puts("...")
48
+ end
49
+
50
+ def end_desc
51
+ puts("========================================================================================================")
52
+ puts("- - - - - - - - M A G I C S T Y L E Z - - - - - - - -")
53
+ puts("--------------------------------------------------------------------------------------------------------")
54
+ puts(" . . . Version #{::MagicStylez::VERSION.to_s.ljust(10)} . . . ")
55
+ puts(" . . . http://berlinmagic.github.io/magic_stylez/ . . . ")
56
+ puts("========================================================================================================")
57
+ end
58
+
59
+ private
60
+
61
+ def compare_style_file( this )
62
+ source = IO.readlines("#{::MagicStylez::Rails::Engine.root}/vendor/assets/stylesheets/corporate/#{this}").map(&:chomp)
63
+ target = IO.readlines("#{::Rails.root}/app/assets/stylesheets/corporate/#{this}").map(&:chomp)
64
+ # ---
65
+ diffrents = source - target
66
+ diffrents.reject! { |stl| stl.match(/^\$([a-zA-Z0-9\-]*):.*$/) && target.find_index{ |x| x.match(/\$#{stl.match(/^\$([a-zA-Z0-9\-]*):.*$/)[0]}:.*/) } }
67
+ diffrents = diffrents.map{ |d| "/* #{ (source.index(d) + 1).to_s.rjust(4) } */ #{d}" }
68
+ additional = ""
69
+ if diffrents.any?
70
+ additional = <<-STYLES
71
+
72
+
73
+
74
+ // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
75
+ // magic_styles v-#{::MagicStylez::VERSION} additional variables (#{Time.zone.now.strftime("%Y-%m-%d %H:%M")})
76
+ // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
77
+ // line | style
78
+ #{ diffrents.join("\n") }
79
+ // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
80
+
81
+
82
+ STYLES
83
+ end
84
+ additional
85
+ end
86
+
87
+ end
88
+ end
89
+ end
@@ -1,3 +1,3 @@
1
1
  module MagicStylez
2
- VERSION = "0.0.0.52"
2
+ VERSION = "0.0.0.53"
3
3
  end
@@ -188,7 +188,7 @@
188
188
  <% cstm_btns = ["one", "two", "three"] %>
189
189
 
190
190
  <% buttons = { default: dflt_btns, socials: scl_btns, brand: brnd_btns, custom: cstm_btns } %>
191
- <div class="col-md-4">
191
+ <div class="col-md-3">
192
192
  <h4 class="center_text">Flat</h4>
193
193
  <% for key, value of buttons: %>
194
194
  <hr/>
@@ -200,7 +200,7 @@
200
200
  <% end %>
201
201
  <% end %>
202
202
  </div>
203
- <div class="col-md-4">
203
+ <div class="col-md-3">
204
204
  <h4 class="center_text">Blank</h4>
205
205
  <% for key, value of buttons: %>
206
206
  <hr/>
@@ -213,7 +213,20 @@
213
213
  <% end %>
214
214
  </div>
215
215
 
216
- <div class="col-md-4">
216
+ <div class="col-md-3">
217
+ <h4 class="center_text">Blur</h4>
218
+ <% for key, value of buttons: %>
219
+ <hr/>
220
+ <h5 class="center_text"><%= key %></h5>
221
+ <% for btn, i in value: %>
222
+ <div class="btn btn-<%= btn %> btn-blur btn-lg btn-block">
223
+ .btn-<%= btn %> + .btn-blur
224
+ </div>
225
+ <% end %>
226
+ <% end %>
227
+ </div>
228
+
229
+ <div class="col-md-3">
217
230
  <h4 class="center_text">Nice</h4>
218
231
  <% for key, value of buttons: %>
219
232
  <hr/>
@@ -229,6 +242,31 @@
229
242
  </div>
230
243
  </div>
231
244
 
245
+ <div class="section">
246
+ <div class="corset">
247
+ <h2>Special Classes:</h2>
248
+ <% btns = ["btn-xs", "btn-sm", "", "btn-lg", "btn-xl"] %>
249
+ <h4>Round</h4>
250
+ <% for btn in btns: %>
251
+ <button class="btn btn-success btn-round <%= btn %>">
252
+ .btn-round + .<%= btn %>
253
+ </button>
254
+ <% end %>
255
+ <h4>Borderless</h4>
256
+ <% for btn in btns: %>
257
+ <button class="btn btn-success btn-borderless btn-blur <%= btn %>">
258
+ .btn-borderless + .<%= btn %>
259
+ </button>
260
+ <% end %>
261
+ <h4>Width</h4>
262
+ <% for btn in btns: %>
263
+ <button class="btn btn-primary btn-width <%= btn %>">
264
+ .btn-width + .<%= btn %>
265
+ </button>
266
+ <% end %>
267
+ </div>
268
+ </div>
269
+
232
270
  <br/>
233
271
  <br/>
234
272
  <br/>
@@ -39,6 +39,21 @@
39
39
  <h4>.brand</h4>
40
40
  </div>
41
41
  </div>
42
+ <div class="section one">
43
+ <div class="corset">
44
+ <h4>.one</h4>
45
+ </div>
46
+ </div>
47
+ <div class="section two">
48
+ <div class="corset">
49
+ <h4>.two</h4>
50
+ </div>
51
+ </div>
52
+ <div class="section three">
53
+ <div class="corset">
54
+ <h4>.three</h4>
55
+ </div>
56
+ </div>
42
57
  <div class="section blank">
43
58
  <div class="corset">
44
59
  <h4>.blank</h4>
@@ -46,6 +61,17 @@
46
61
  </div>
47
62
 
48
63
 
64
+ <div class="section bright speech">
65
+ <div class="corset">
66
+ <h4>.bright + .speech</h4>
67
+ </div>
68
+ </div>
69
+ <div class="section brand speech">
70
+ <div class="corset">
71
+ <h4>.brand + .speech</h4>
72
+ </div>
73
+ </div>
74
+
49
75
 
50
76
 
51
77
  <div class="section shine-top shine-bottom compact">
@@ -63,6 +63,10 @@ $blue-bg: $blue-soft !default;
63
63
  $brand-bg: $brand-color !default;
64
64
  $bright-bg: $white !default;
65
65
 
66
+ $brand-one-bg: $brand-one !default;
67
+ $brand-two-bg: $brand-two !default;
68
+ $brand-three-bg: $brand-three !default;
69
+
66
70
 
67
71
  // -------------------------
68
72
  // Global Border color
@@ -304,4 +308,5 @@ $navbar-inverse-brand-hover-bg: transparent !default;
304
308
  // Inverted navbar toggle
305
309
  $navbar-inverse-toggle-hover-bg: #333 !default;
306
310
  $navbar-inverse-toggle-icon-bar-bg: #fff !default;
307
- $navbar-inverse-toggle-border-color: #333 !default;
311
+ $navbar-inverse-toggle-border-color: #333 !default;
312
+
@@ -157,5 +157,3 @@ $magicDefaultLineHight: 18px;
157
157
  line-height: $magicDefaultLineHight;
158
158
  } // ..
159
159
 
160
-
161
-
@@ -83,5 +83,3 @@ ul, ol, li, p, span, h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
83
83
  &.brand { color: $brand-color; }
84
84
  }
85
85
 
86
-
87
-
@@ -82,6 +82,15 @@ $section-brand-input-bg: $white !default;
82
82
  $section-soft-background: $soft-bg !default;
83
83
  $section-soft-input-bg: $white !default;
84
84
 
85
+ $section-one-background: $brand-one-bg !default;
86
+ $section-one-input-bg: $white !default;
87
+
88
+ $section-two-background: $brand-two-bg !default;
89
+ $section-two-input-bg: $white !default;
90
+
91
+ $section-three-background: $brand-three-bg !default;
92
+ $section-three-input-bg: $white !default;
93
+
85
94
 
86
95
  $section-head-line-height: 30px !default;
87
96
  $section-head-font-size: 20px !default;
@@ -755,4 +764,5 @@ $page-header-border-color: $gray-lighter !default;
755
764
  $hr-border: $gray-lighter !default;
756
765
 
757
766
  //** Horizontal offset for forms and lists.
758
- $component-offset-horizontal: 180px !default;
767
+ $component-offset-horizontal: 180px !default;
768
+
@@ -66,6 +66,19 @@ CSS:
66
66
  </div>
67
67
 
68
68
 
69
+ <div class="section hard-top">
70
+ <div class="corset tight">
71
+ <h2 class="loud">NEW*</h2>
72
+ <hr/>
73
+ <p class="highlight"><i class="olicons-hide-filter"></i> magic-styles update generator</p>
74
+ <p class="loud"><i class="olicons-hide-filter"></i> in the process I often add new variables to the corporate files</p>
75
+ <p class="loud"><i class="olicons-hide-filter"></i> what causes "Missing variable!" when you update to new version</p>
76
+ <p class="loud"><i class="olicons-hide-filter"></i> this generator adds all new variables without touching your settings</p>
77
+ <pre><code>$ rails g magic_stylez:update</code></pre>
78
+ </div>
79
+ </div>
80
+
81
+
69
82
  <div class="section hard-top">
70
83
  <div class="corset tight">
71
84
  <h3>Thanks</h3>
@@ -6,6 +6,19 @@
6
6
  <%= javascript_include_tag 'application' %>
7
7
  <%= csrf_meta_tags %>
8
8
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
9
+ <%# === Site - Icon === #%>
10
+ <link href="<%= asset_path("ico/favicon.ico") %>" rel="shortcut icon" type="image/vnd.microsoft.icon" />
11
+ <link href="<%= asset_path("ico/favicon.png") %>" rel="shortcut icon" type="image/png" />
12
+ <%# iPad 3 Retina Display #%>
13
+ <link rel="apple-touch-icon-precomposed" sizes="144x144"href="<%= asset_path("ico/apple-touch-icon-144x144-precomposed.png") %>" />
14
+ <%# iPhone 4 Retina display #%>
15
+ <link rel="apple-touch-icon-precomposed" sizes="114x114"href="<%= asset_path("ico/apple-touch-icon-114x114-precomposed.png") %>" />
16
+ <%# iPad non-Retina display #%>
17
+ <link rel="apple-touch-icon-precomposed" sizes="72x72"href="<%= asset_path("ico/apple-touch-icon-72x72-precomposed.png") %>" />
18
+ <%# Non-Retina iPhone, iPod Touch, Android 2.1+ #%>
19
+ <link rel="apple-touch-icon-precomposed" href="<%= asset_path("ico/apple-touch-icon-57x57-precomposed.png") %>" />
20
+ <%# Nokia #%>
21
+ <link rel="apple-touch-icon" href="<%= asset_path("ico/apple-touch-icon.png") %>" />
9
22
  <script type="text/javascript" charset="utf-8">
10
23
  App = {};
11
24
  App.Environment = "<%= Rails.env.to_s %>";
Binary file
Binary file
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
6
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
10
  <script type="text/javascript" charset="utf-8">
11
11
  App = {};
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
6
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
10
  <script type="text/javascript" charset="utf-8">
11
11
  App = {};
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
6
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
10
  <script type="text/javascript" charset="utf-8">
11
11
  App = {};
@@ -2,11 +2,18 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
6
- <script src="//berlinmagic.github.io/magic_stylez/assets/application-0f7b4393eed52dca4ecec8d36e95122e.js"></script>
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
+ <script src="//berlinmagic.github.io/magic_stylez/assets/application-ebb0e3d77a8bf5e1035379b7e53b8023.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
+ <link href="//berlinmagic.github.io/magic_stylez/assets/ico/favicon-f1706407301f788c54691b6995f60a8f.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
11
+ <link href="//berlinmagic.github.io/magic_stylez/assets/ico/favicon-f34b54df445838a4f6bdac98bd904570.png" rel="shortcut icon" type="image/png" />
12
+ <link rel="apple-touch-icon-precomposed" sizes="144x144"href="//berlinmagic.github.io/magic_stylez/assets/ico/apple-touch-icon-144x144-precomposed-95cd4cdaa08b7ce4607374cb845aa89f.png" />
13
+ <link rel="apple-touch-icon-precomposed" sizes="114x114"href="//berlinmagic.github.io/magic_stylez/assets/ico/apple-touch-icon-114x114-precomposed-dff6f19fe419b0d0ca7a513b54eb8b34.png" />
14
+ <link rel="apple-touch-icon-precomposed" sizes="72x72"href="//berlinmagic.github.io/magic_stylez/assets/ico/apple-touch-icon-72x72-precomposed-9deaa78f902e5d66b931681b43fa5129.png" />
15
+ <link rel="apple-touch-icon-precomposed" href="//berlinmagic.github.io/magic_stylez/assets/ico/apple-touch-icon-57x57-precomposed-0b5096220f084a3e886573eea7adf21e.png" />
16
+ <link rel="apple-touch-icon" href="//berlinmagic.github.io/magic_stylez/assets/ico/apple-touch-icon-222472c72cf52e4aaf027b6a8a3f6bb3.png" />
10
17
  <script type="text/javascript" charset="utf-8">
11
18
  App = {};
12
19
  App.Environment = "production";
@@ -150,6 +157,19 @@ CSS:
150
157
  </div>
151
158
 
152
159
 
160
+ <div class="section hard-top">
161
+ <div class="corset tight">
162
+ <h2 class="loud">NEW*</h2>
163
+ <hr/>
164
+ <p class="highlight"><i class="olicons-hide-filter"></i> magic-styles update generator</p>
165
+ <p class="loud"><i class="olicons-hide-filter"></i> in the process I often add new variables to the corporate files</p>
166
+ <p class="loud"><i class="olicons-hide-filter"></i> what causes "Missing variable!" when you update to new version</p>
167
+ <p class="loud"><i class="olicons-hide-filter"></i> this generator adds all new variables without touching your settings</p>
168
+ <pre><code>$ rails g magic_stylez:update</code></pre>
169
+ </div>
170
+ </div>
171
+
172
+
153
173
  <div class="section hard-top">
154
174
  <div class="corset tight">
155
175
  <h3>Thanks</h3>
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
6
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
10
  <script type="text/javascript" charset="utf-8">
11
11
  App = {};
@@ -2,10 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <title>Magic-Stylez</title>
5
- <link href="//berlinmagic.github.io/magic_stylez/assets/application-972c9b1a1bc9f205a30ffecc0ae4d3d6.css" media="all" rel="stylesheet" />
5
+ <link href="//berlinmagic.github.io/magic_stylez/assets/application-ef333a7bb827c0fd71107737d7faa101.css" media="all" rel="stylesheet" />
6
6
  <script src="//berlinmagic.github.io/magic_stylez/assets/blank-f61f67c5c51c1b2adbcfdfc46056dabb.js"></script>
7
7
  <meta content="authenticity_token" name="csrf-param" />
8
- <meta content="jDOV0RVo1AZcOPoNRBT15AKaI6H8ZT+EnTq1M9XlP6g=" name="csrf-token" />
8
+ <meta content="KmqKWQjWhpVkFcmeqxz/68ezzbMF/ggaa7IAMUfgkP0=" name="csrf-token" />
9
9
  <link href='http://fonts.googleapis.com/css?family=Gloria+Hallelujah' rel='stylesheet' type='text/css'>
10
10
  <script type="text/javascript" charset="utf-8">
11
11
  App = {};
@@ -63,6 +63,10 @@ $blue-bg: $blue-soft !default;
63
63
  $brand-bg: $brand-color !default;
64
64
  $bright-bg: $white !default;
65
65
 
66
+ $brand-one-bg: $brand-one !default;
67
+ $brand-two-bg: $brand-two !default;
68
+ $brand-three-bg: $brand-three !default;
69
+
66
70
 
67
71
  // -------------------------
68
72
  // Global Border color
@@ -304,4 +308,5 @@ $navbar-inverse-brand-hover-bg: transparent !default;
304
308
  // Inverted navbar toggle
305
309
  $navbar-inverse-toggle-hover-bg: #333 !default;
306
310
  $navbar-inverse-toggle-icon-bar-bg: #fff !default;
307
- $navbar-inverse-toggle-border-color: #333 !default;
311
+ $navbar-inverse-toggle-border-color: #333 !default;
312
+
@@ -157,5 +157,3 @@ $magicDefaultLineHight: 18px;
157
157
  line-height: $magicDefaultLineHight;
158
158
  } // ..
159
159
 
160
-
161
-
@@ -83,5 +83,3 @@ ul, ol, li, p, span, h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
83
83
  &.brand { color: $brand-color; }
84
84
  }
85
85
 
86
-
87
-
@@ -82,6 +82,15 @@ $section-brand-input-bg: $white !default;
82
82
  $section-soft-background: $soft-bg !default;
83
83
  $section-soft-input-bg: $white !default;
84
84
 
85
+ $section-one-background: $brand-one-bg !default;
86
+ $section-one-input-bg: $white !default;
87
+
88
+ $section-two-background: $brand-two-bg !default;
89
+ $section-two-input-bg: $white !default;
90
+
91
+ $section-three-background: $brand-three-bg !default;
92
+ $section-three-input-bg: $white !default;
93
+
85
94
 
86
95
  $section-head-line-height: 30px !default;
87
96
  $section-head-font-size: 20px !default;
@@ -755,4 +764,5 @@ $page-header-border-color: $gray-lighter !default;
755
764
  $hr-border: $gray-lighter !default;
756
765
 
757
766
  //** Horizontal offset for forms and lists.
758
- $component-offset-horizontal: 180px !default;
767
+ $component-offset-horizontal: 180px !default;
768
+
@@ -4,6 +4,13 @@
4
4
  max-width: $wdth;
5
5
  }
6
6
 
7
+ .btn-xl, .btn-group-xl > .btn {
8
+ padding: 12px 20px;
9
+ font-size: 24px;
10
+ line-height: 1.33;
11
+ border-radius: round($border-radius-large * 1.2);
12
+ }
13
+
7
14
 
8
15
  .btn-splited, .btn-divided {
9
16
  display: table;
@@ -105,35 +112,42 @@
105
112
  .btn-default {
106
113
  @include btn-variant($btn-default-color, $btn-default-bg, $btn-default-border);
107
114
  &.btn-blank { @include btn-blank-variant($btn-default-color, $btn-default-border, #fff); }
115
+ &.btn-blur { @include btn-blur-variant( $btn-default-color, $btn-default-bg, $btn-default-border ); }
108
116
  }
109
117
  .btn-primary {
110
118
  @include btn-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
111
119
  &.btn-blank { @include btn-blank-variant($btn-primary-bg, $btn-primary-border, #fff); }
120
+ &.btn-blur { @include btn-blur-variant( $btn-primary-color, $btn-primary-bg, $btn-primary-border ); }
112
121
  }
113
122
  // Success appears as green
114
123
  .btn-success {
115
124
  @include btn-variant($btn-success-color, $btn-success-bg, $btn-success-border);
116
125
  &.btn-blank { @include btn-blank-variant($btn-success-bg, $btn-success-border, #fff); }
126
+ &.btn-blur { @include btn-blur-variant( $btn-success-color, $btn-success-bg, $btn-success-border ); }
117
127
  }
118
128
  // Info appears as blue-green
119
129
  .btn-info {
120
130
  @include btn-variant($btn-info-color, $btn-info-bg, $btn-info-border);
121
131
  &.btn-blank { @include btn-blank-variant($btn-info-bg, $btn-info-border, #444); }
132
+ &.btn-blur { @include btn-blur-variant( $btn-info-color, $btn-info-bg, $btn-info-border ); }
122
133
  }
123
134
  // Warning appears as orange
124
135
  .btn-warning {
125
136
  @include btn-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
126
137
  &.btn-blank { @include btn-blank-variant($btn-warning-bg, $btn-warning-border, #444); }
138
+ &.btn-blur { @include btn-blur-variant( $btn-warning-color, $btn-warning-bg, $btn-warning-border ); }
127
139
  }
128
140
  // Danger and error appear as red
129
141
  .btn-danger {
130
142
  @include btn-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
131
143
  &.btn-blank { @include btn-blank-variant($btn-danger-bg, $btn-danger-border, #fff); }
144
+ &.btn-blur { @include btn-blur-variant( $btn-danger-color, $btn-danger-bg, $btn-danger-border ); }
132
145
  }
133
146
 
134
147
  .btn-brand {
135
148
  @include btn-variant($btn-brand-color, $btn-brand-bg, $btn-brand-border);
136
149
  &.btn-blank { @include btn-blank-variant($btn-brand-bg, $btn-brand-border, #fff); }
150
+ &.btn-blur { @include btn-blur-variant( $btn-brand-color, $btn-brand-bg, $btn-brand-border ); }
137
151
  }
138
152
 
139
153
 
@@ -142,34 +156,41 @@
142
156
  .btn-facebook {
143
157
  @include btn-variant($btn-facebook-color, $btn-facebook-bg, $btn-facebook-border);
144
158
  &.btn-blank { @include btn-blank-variant($btn-facebook-bg, $btn-facebook-border, #fff); }
159
+ &.btn-blur { @include btn-blur-variant( $btn-facebook-color, $btn-facebook-bg, $btn-facebook-border ); }
145
160
  }
146
161
  .btn-google {
147
162
  @include btn-variant($btn-google-color, $btn-google-bg, $btn-google-border);
148
163
  &.btn-blank { @include btn-blank-variant($btn-google-bg, $btn-google-border, #fff); }
164
+ &.btn-blur { @include btn-blur-variant( $btn-google-color, $btn-google-bg, $btn-google-border ); }
149
165
  }
150
166
  .btn-twitter {
151
167
  @include btn-variant($btn-twitter-color, $btn-twitter-bg, $btn-twitter-border);
152
168
  &.btn-blank { @include btn-blank-variant($btn-twitter-bg, $btn-twitter-border, #fff); }
169
+ &.btn-blur { @include btn-blur-variant( $btn-twitter-color, $btn-twitter-bg, $btn-twitter-border ); }
153
170
  }
154
171
  .btn-paypal {
155
172
  @include btn-variant($btn-paypal-color, $btn-paypal-bg, $btn-paypal-border);
156
173
  &.btn-blank { @include btn-blank-variant($btn-paypal-bg, $btn-paypal-border, #fff); }
174
+ &.btn-blur { @include btn-blur-variant( $btn-paypal-color, $btn-paypal-bg, $btn-paypal-border ); }
157
175
  }
158
176
 
159
177
 
160
178
  .btn-one {
161
179
  @include btn-variant($btn-one-color, $btn-one-bg, $btn-one-border);
162
180
  &.btn-blank { @include btn-blank-variant($btn-one-bg, $btn-one-border, #fff); }
181
+ &.btn-blur { @include btn-blur-variant( $btn-one-color, $btn-one-bg, $btn-one-border ); }
163
182
  }
164
183
 
165
184
  .btn-two {
166
185
  @include btn-variant($btn-two-color, $btn-two-bg, $btn-two-border);
167
186
  &.btn-blank { @include btn-blank-variant($btn-two-bg, $btn-two-border, #fff); }
187
+ &.btn-blur { @include btn-blur-variant( $btn-two-color, $btn-two-bg, $btn-two-border ); }
168
188
  }
169
189
 
170
190
  .btn-three {
171
191
  @include btn-variant($btn-three-color, $btn-three-bg, $btn-three-border);
172
192
  &.btn-blank { @include btn-blank-variant($btn-three-bg, $btn-three-border, #fff); }
193
+ &.btn-blur { @include btn-blur-variant( $btn-three-color, $btn-three-bg, $btn-three-border ); }
173
194
  }
174
195
 
175
196
 
@@ -195,6 +216,31 @@
195
216
  }
196
217
 
197
218
 
219
+ .btn-round {
220
+ @include horizontal-padding( 18px );
221
+ -webkit-border-radius: 100px !important;
222
+ -moz-border-radius: 100px !important;
223
+ -ms-border-radius: 100px !important;
224
+ -o-border-radius: 100px !important;
225
+ border-radius: 100px !important;
226
+ &.btn-xs { @include horizontal-padding( 12px ); }
227
+ &.btn-sm { @include horizontal-padding( 15px ); }
228
+ &.btn-lg { @include horizontal-padding( 23px ); }
229
+ &.btn-xl { @include horizontal-padding( 30px ); }
230
+ }
231
+
232
+ .btn-borderless {
233
+ border: none !important;
234
+ }
235
+
236
+ .btn-width {
237
+ @include horizontal-padding( 30px );
238
+ &.btn-xs { @include horizontal-padding( 10px ); }
239
+ &.btn-sm { @include horizontal-padding( 20px ); }
240
+ &.btn-lg { @include horizontal-padding( 40px ); }
241
+ &.btn-xl { @include horizontal-padding( 50px ); }
242
+ }
243
+
198
244
 
199
245
 
200
246
  // # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -4,15 +4,18 @@
4
4
  padding: $section-padding 0;
5
5
  // background: $white;
6
6
  text-align: center;
7
- z-index: 1;
7
+
8
8
  font-size: $font-size-base;
9
9
  .corset, .container { background: inherit; }
10
10
 
11
11
 
12
+ &.z, &.zindex, &.z-index { z-index: 1; }
13
+
12
14
  //
13
15
  // Sections with shine
14
16
  //
15
17
  &.shine-top {
18
+ z-index: 1;
16
19
  overflow: hidden;
17
20
  &:before {
18
21
  display: block; position: absolute; content: ""; z-index: 11;
@@ -23,6 +26,7 @@
23
26
  }
24
27
  }
25
28
  &.shine-bottom {
29
+ z-index: 1;
26
30
  overflow: hidden;
27
31
  &:after {
28
32
  display: block; position: absolute; content: ""; z-index: 11;
@@ -60,7 +64,6 @@
60
64
  &.dotted-top, &.dotted-bottom {
61
65
  @include box-shadow( inset 0 1px 1px 0 rgba(255,255,255,.75), 0 1px 1px 0 rgba(255,255,255,.75) );
62
66
  }
63
-
64
67
 
65
68
  //
66
69
  // Section Sizes
@@ -100,6 +103,19 @@
100
103
  @include all_form_elements { background: $section-soft-input-bg; }
101
104
  }
102
105
  &.blank { background: transparent; }
106
+
107
+ &.one {
108
+ background: $section-one-background;
109
+ @include all_form_elements { background: $section-one-input-bg; }
110
+ }
111
+ &.two {
112
+ background: $section-two-background;
113
+ @include all_form_elements { background: $section-two-input-bg; }
114
+ }
115
+ &.three {
116
+ background: $section-three-background;
117
+ @include all_form_elements { background: $section-three-input-bg; }
118
+ }
103
119
 
104
120
  &.head {
105
121
  z-index: 2;
@@ -117,6 +133,38 @@
117
133
  }
118
134
 
119
135
 
136
+ &.speech {
137
+ &:after {
138
+ display: block; position: absolute; content: "";
139
+ margin: 0; padding: 0;
140
+ width: 0; height: 0;
141
+ border: solid 10px transparent;
142
+ border-right: solid 10px $section-background;
143
+ border-bottom: solid 10px $section-background;
144
+ bottom: -8px;
145
+ left: 50%;
146
+ margin-left: -8px;
147
+ @include rotation( 45 );
148
+ z-index: 99;
149
+ }
150
+ &.dark:after {
151
+ border-right: solid 10px $section-dark-background;
152
+ border-bottom: solid 10px $section-dark-background;
153
+ }
154
+ &.bright:after {
155
+ border-right: solid 10px $section-bright-background;
156
+ border-bottom: solid 10px $section-bright-background;
157
+ }
158
+ &.brand:after {
159
+ border-right: solid 10px $section-brand-background;
160
+ border-bottom: solid 10px $section-brand-background;
161
+ }
162
+ &.soft:after {
163
+ border-right: solid 10px $section-soft-background;
164
+ border-bottom: solid 10px $section-soft-background;
165
+ }
166
+ }
167
+
120
168
 
121
169
  }
122
170
 
@@ -110,6 +110,11 @@
110
110
  }
111
111
  }
112
112
 
113
+ @mixin btn-blur-variant($color, $background, $border) {
114
+ @include btn-variant( $color, transparentize($background, .6), transparentize($border, .6) );
115
+ }
116
+
117
+
113
118
  // Labels
114
119
  // -------------------------
115
120
  @mixin label-variant( $background, $color: $label-color, $color-hover: $label-link-hover-color ) {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: magic_stylez
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.0.52
4
+ version: 0.0.0.53
5
5
  platform: ruby
6
6
  authors:
7
7
  - Torsten Wetzel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-17 00:00:00.000000000 Z
11
+ date: 2014-09-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -205,6 +205,7 @@ files:
205
205
  - README.md
206
206
  - Rakefile
207
207
  - lib/generators/magic_stylez/install_generator.rb
208
+ - lib/generators/magic_stylez/update_generator.rb
208
209
  - lib/magic_stylez.rb
209
210
  - lib/magic_stylez/engine.rb
210
211
  - lib/magic_stylez/version.rb
@@ -213,6 +214,16 @@ files:
213
214
  - test/dummy/README.md
214
215
  - test/dummy/Rakefile
215
216
  - test/dummy/app/assets/images/.keep
217
+ - test/dummy/app/assets/images/ico/apple-touch-icon-114x114-precomposed.png
218
+ - test/dummy/app/assets/images/ico/apple-touch-icon-144x144-precomposed.png
219
+ - test/dummy/app/assets/images/ico/apple-touch-icon-57x57-precomposed.png
220
+ - test/dummy/app/assets/images/ico/apple-touch-icon-72x72-precomposed.png
221
+ - test/dummy/app/assets/images/ico/apple-touch-icon-precomposed.png
222
+ - test/dummy/app/assets/images/ico/apple-touch-icon.png
223
+ - test/dummy/app/assets/images/ico/favicon.ico
224
+ - test/dummy/app/assets/images/ico/favicon.png
225
+ - test/dummy/app/assets/images/logo.jpg
226
+ - test/dummy/app/assets/images/logo.png
216
227
  - test/dummy/app/assets/javascripts/app.js.coffee
217
228
  - test/dummy/app/assets/javascripts/application.js
218
229
  - test/dummy/app/assets/javascripts/assets.js.coffee.erb
@@ -431,6 +442,16 @@ test_files:
431
442
  - test/dummy/README.md
432
443
  - test/dummy/Rakefile
433
444
  - test/dummy/app/assets/images/.keep
445
+ - test/dummy/app/assets/images/ico/apple-touch-icon-114x114-precomposed.png
446
+ - test/dummy/app/assets/images/ico/apple-touch-icon-144x144-precomposed.png
447
+ - test/dummy/app/assets/images/ico/apple-touch-icon-57x57-precomposed.png
448
+ - test/dummy/app/assets/images/ico/apple-touch-icon-72x72-precomposed.png
449
+ - test/dummy/app/assets/images/ico/apple-touch-icon-precomposed.png
450
+ - test/dummy/app/assets/images/ico/apple-touch-icon.png
451
+ - test/dummy/app/assets/images/ico/favicon.ico
452
+ - test/dummy/app/assets/images/ico/favicon.png
453
+ - test/dummy/app/assets/images/logo.jpg
454
+ - test/dummy/app/assets/images/logo.png
434
455
  - test/dummy/app/assets/javascripts/app.js.coffee
435
456
  - test/dummy/app/assets/javascripts/application.js
436
457
  - test/dummy/app/assets/javascripts/assets.js.coffee.erb