consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing conflicts [#5]

Browse Source
This commit is contained in:
rgarcia
2015-07-16 20:18:33 +02:00
parent a63b272f8b 24fb2765b9
commit c24c78e5e7
6 changed files with 1512 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -33,6 +33,7 @@ gem 'sdoc', '~> 0.4.0', group: :doc
# gem 'capistrano-rails', group: :development # gem 'capistrano-rails', group: :development
gem "responders" gem "responders"
gem 'foundation-rails'
group :development, :test do group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console # Call 'byebug' anywhere in the code to stop execution and get a debugger console

4
Gemfile.lock
View File

@@ -65,6 +65,9 @@ GEM
factory_girl_rails (4.5.0) factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0) factory_girl (~> 4.5.0)
railties (>= 3.0.0) railties (>= 3.0.0)
foundation-rails (5.5.2.1)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
globalid (0.3.5) globalid (0.3.5)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
i18n (0.7.0) i18n (0.7.0)
@@ -178,6 +181,7 @@ DEPENDENCIES
capybara capybara
coffee-rails (~> 4.1.0) coffee-rails (~> 4.1.0)
factory_girl_rails factory_girl_rails
foundation-rails
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-rails jquery-rails
rails (= 4.2.3) rails (= 4.2.3)

3
app/assets/javascripts/application.js
View File

@@ -12,5 +12,8 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require foundation
//= require turbolinks //= require turbolinks
//= require_tree . //= require_tree .
$(function(){ $(document).foundation(); });

2
app/assets/stylesheets/application.css
View File

@@ -12,4 +12,6 @@
* *
*= require_tree . *= require_tree .
*= require_self *= require_self
*= require foundation_and_overrides
*/ */

1488
app/assets/stylesheets/foundation_and_overrides.scss Normal file
View File

File diff suppressed because it is too large Load Diff

25
app/views/layouts/application.html.erb
View File

@@ -1,17 +1,18 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<title>Participacion</title> <meta charset="utf-8" />
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
<title><%= content_for?(:title) ? yield(:title) : "foundation-rails" %></title>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/modernizr" %>
<%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body style="margin-left:50px"> <body style="margin-left:50px">
<p id="notice"><%= notice %></p>
<div>
<%= yield %> <%= yield %>
</div> </body>
</body>
</html> </html>