From e83f84b029606ac91a86fdda62f2545d69978141 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Fri, 27 Dec 2013 11:01:59 +0800 Subject: [PATCH] Added Seed data for user and some fonts --- Gemfile | 1 + Gemfile.lock | 3 +++ app/assets/stylesheets/sticky-footer-navbar.css | 4 ++-- app/views/layouts/application.html.erb | 7 +++++++ db/seeds.rb | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 3c58129..8a4e60f 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,7 @@ gem "font-awesome-rails", github: "bokmann/font-awesome-rails" gem 'rmagick' # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' +gem 'apipie-rails' # Use Uglifier as compressor for JavaScript assets gem 'uglifier', '>= 1.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index cfbcb20..f09acfc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,6 +67,8 @@ GEM multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) + apipie-rails (0.0.24) + rails (>= 3.0.10) arel (4.0.1) atomic (1.1.14) bcrypt-ruby (3.1.2) @@ -180,6 +182,7 @@ PLATFORMS DEPENDENCIES anjlab-bootstrap-rails! + apipie-rails bson_ext carrierwave carrierwave-mongoid diff --git a/app/assets/stylesheets/sticky-footer-navbar.css b/app/assets/stylesheets/sticky-footer-navbar.css index 6978a99..e6cd4dd 100644 --- a/app/assets/stylesheets/sticky-footer-navbar.css +++ b/app/assets/stylesheets/sticky-footer-navbar.css @@ -4,9 +4,9 @@ html, body { height: 100%; + font-family: 'Average Sans', sans-serif; /* The html and body elements cannot have any padding or margin. */ -} - +} /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6e16f13..e0f136a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,7 +5,14 @@ RulingOrbit - Template & Module Store <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> <%= javascript_include_tag "application", "data-turbolinks-track" => true %> + + <%= csrf_meta_tags %> +