Skip to content

Commit 45531a7

Browse files
committed
build using rails_apps_composer 2.4.39
1 parent e6209e8 commit 45531a7

File tree

6 files changed

+25
-47
lines changed

6 files changed

+25
-47
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ db/*.sqlite3
2121
/log/*
2222
/tmp/*
2323

24-
# configuration file introduced in Rails 4.1
25-
/config/secrets.yml
26-
2724
# various artifacts
2825
**.war
2926
*.rbc

Gemfile.lock

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ GEM
2828
thread_safe (~> 0.1)
2929
tzinfo (~> 1.1)
3030
arel (5.0.0)
31-
atomic (1.1.15)
31+
atomic (1.1.16)
3232
better_errors (1.1.0)
3333
coderay (>= 1.0.0)
3434
erubis (>= 2.6.6)
@@ -46,13 +46,13 @@ GEM
4646
debug_inspector (0.0.2)
4747
erubis (2.7.0)
4848
execjs (2.0.2)
49-
foundation-rails (5.2.0.0)
49+
foundation-rails (5.2.2.0)
5050
railties (>= 3.1.0)
5151
sass (>= 3.2.0)
5252
high_voltage (2.1.0)
5353
hike (1.2.3)
5454
i18n (0.6.9)
55-
jbuilder (2.0.4)
55+
jbuilder (2.0.5)
5656
activesupport (>= 3.0.0)
5757
multi_json (>= 1.2.0)
5858
jquery-rails (3.1.0)
@@ -63,8 +63,8 @@ GEM
6363
mime-types (~> 1.16)
6464
treetop (~> 1.4.8)
6565
mime-types (1.25.1)
66-
minitest (5.3.0)
67-
multi_json (1.9.0)
66+
minitest (5.3.2)
67+
multi_json (1.9.2)
6868
polyglot (0.3.4)
6969
quiet_assets (1.0.2)
7070
railties (>= 3.1, < 5.0)
@@ -81,19 +81,20 @@ GEM
8181
bundler (>= 1.3.0, < 2.0)
8282
railties (= 4.1.0.rc1)
8383
sprockets-rails (~> 2.0.0)
84-
rails_layout (1.0.10)
84+
rails_layout (1.0.13)
8585
railties (4.1.0.rc1)
8686
actionpack (= 4.1.0.rc1)
8787
activesupport (= 4.1.0.rc1)
8888
rake (>= 0.8.7)
8989
thor (>= 0.18.1, < 2.0)
90-
rake (10.1.1)
90+
rake (10.2.2)
9191
rdoc (4.1.1)
9292
json (~> 1.4)
93-
sass (3.2.14)
94-
sass-rails (4.0.1)
93+
sass (3.2.18)
94+
sass-rails (4.0.2)
9595
railties (>= 4.0.0, < 5.0)
96-
sass (>= 3.1.10)
96+
sass (~> 3.2.0)
97+
sprockets (~> 2.8, <= 2.11.0)
9798
sprockets-rails (~> 2.0.0)
9899
sdoc (0.4.0)
99100
json (~> 1.8)
@@ -109,8 +110,8 @@ GEM
109110
activesupport (>= 3.0)
110111
sprockets (~> 2.8)
111112
sqlite3 (1.3.9)
112-
thor (0.18.1)
113-
thread_safe (0.2.0)
113+
thor (0.19.1)
114+
thread_safe (0.3.1)
114115
atomic (>= 1.1.7, < 2)
115116
tilt (1.4.1)
116117
treetop (1.4.15)
@@ -120,7 +121,7 @@ GEM
120121
coffee-rails
121122
tzinfo (1.1.0)
122123
thread_safe (~> 0.1)
123-
uglifier (2.4.0)
124+
uglifier (2.5.0)
124125
execjs (>= 0.3.0)
125126
json (>= 1.8.0)
126127

README.textile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
h1. !http://railsapps.github.io/images/rails-36x36.jpg(Rails Foundation)! Rails and Foundation
22

3-
Rails 4.1 example application that integrates Rails and Foundation 5.0.
3+
Rails 4.1 example application that integrates Rails and Foundation 5.2.
44

55
"Zurb Foundation":http://foundation.zurb.com/ provides CSS stylesheets and JavaScript code for the visual design of websites. Foundation is a framework for client-side (browser-based or “front end”) development, much like Ruby on Rails is a framework for server-side development.
66

77
You can build this application in only a few minutes using the "Rails Composer":http://railsapps.github.io/rails-composer/ tool, adding Devise for authentication and other options.
88

99
Use this example application as a starter app for your own web applications.
1010

11+
h4. Quickstart Guide
12+
13+
The RailsApps project provides a "Rails and Foundation":http://railsapps.github.io/rails-foundation.html Quickstart Guide with details about integrating Rails and Foundation.
14+
1115
h4. !http://railsapps.github.io/images/join/join-railsapps.png(Join RailsApps)!:http://railsapps.github.io/
1216

1317
h4. What is the RailsApps Project?

app/assets/stylesheets/application.css.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
66
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
77
*
8-
* You're free to add application-wide styles to this file and they'll appear at the top of the
9-
* compiled file, but it's generally better to create a new file per style scope.
8+
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
9+
* compiled file so the styles you add here take precedence over styles defined in any styles
10+
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
11+
* file per style scope.
1012
*
11-
*= require_self
1213
*= require_tree .
14+
*= require_self
1315
*/

app/views/layouts/_navigation.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<nav class="top-bar" data-topbar>
33
<ul class="title-area">
44
<li class="name"><%= link_to 'Home', root_path %></li>
5-
<li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li>
5+
<li class="toggle-topbar menu-icon"><a href="#">Menu</a></li>
66
</ul>
77
<div class="top-bar-section">
88
<ul>

config/locales/simple_form.en.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)