bootstrappers 0.0.8 → 0.0.9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+0.0.9 (Nov 12, 2012)
+  * fix application.css double loading css
+  * bootstrap-helper bump to 2.1.2
 0.0.8 (Oct 12, 2012)
   * fix db config replace problem
 0.0.7 (Oct 10, 2012)

data/TODO.md

@@ -18,3 +18,5 @@
 * View Turtorial
   - menu
   - ajax
+* <https://speakerdeck.com/ken_c_lo/zurui-design> 
+* lib/tasks/dev.rake

data/lib/bootstrappers/app_builder.rb

@@ -33,10 +33,12 @@ module Bootstrappers
     end
 
     def create_common_javascripts
+      remove_file 'app/assets/javascripts/application.js'
       directory 'javascripts', 'app/assets/javascripts'
     end
 
     def create_common_stylesheets
+      remove_file 'app/assets/stylesheets/application.css'
       directory 'stylesheets', 'app/assets/stylesheets'
     end
 

data/lib/bootstrappers/generators/app_generator.rb

@@ -25,7 +25,6 @@ module Bootstrappers
       invoke :setup_database
       invoke :configure_app
       invoke :create_initializers
-      invoke :setup_stylesheets
       invoke :remove_routes_comment_lines
       invoke :setup_root_route
       invoke :setup_git
@@ -64,8 +63,6 @@ module Bootstrappers
 
     def add_common_js_library
       say 'Add add_common_js_library to the standard application.js'
-      build :add_jquery_ui
-      build :add_bootstrap_js
     end
 
 
@@ -109,11 +106,6 @@ module Bootstrappers
     end
 
 
-    def setup_stylesheets
-      say 'Set up stylesheets'
-      build :setup_stylesheets
-    end
-
     def remove_routes_comment_lines
       build :remove_routes_comment_lines
     end

data/lib/bootstrappers/version.rb

@@ -1,3 +1,3 @@
 module Bootstrappers
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/templates/Gemfile_additions

@@ -4,7 +4,7 @@ gem 'seo_helper', '~> 1.0'
 gem "settingslogic"
 
 gem 'anjlab-bootstrap-rails', '>= 2.1', :require => 'bootstrap-rails'
-gem "bootstrap_helper", "2.1.0"
+gem "bootstrap_helper", '>= 2.1.2'
 
 gem "simple_form", "2.0.3"
 gem "will_paginate", "3.0.3"

data/templates/common/_facebook_js.erb

@@ -4,6 +4,6 @@
   var js, fjs = d.getElementsByTagName(s)[0];
   if (d.getElementById(id)) {return;}
   js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=289554394417824";
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=<%= Setting.facebook_app_id%>";
   fjs.parentNode.insertBefore(js, fjs);
 }(document, 'script', 'facebook-jssdk'));</script>

data/templates/javascripts/application.js

@@ -0,0 +1,5 @@
+//= require_self
+//= require jquery
+//= require jquery_ujs
+//= require jquery-ui
+//= require twitter/bootstrap/alert

data/templates/stylesheets/application.css.scss

@@ -0,0 +1,2 @@
+//= require_self
+//= require common

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - xdite
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-12 00:00:00 +08:00
+date: 2012-11-12 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,13 +82,15 @@ files:
 - templates/common/_search_form.html.erb
 - templates/common/_user_nav.html.erb
 - templates/config_yml.erb
-- templates/import_scss_styles
 - templates/initializers/seo_helper.rb
 - templates/javascripts/README
+- templates/javascripts/application.js
 - templates/mysql_database.yml.erb
 - templates/setting.rb
+- templates/stylesheets/application.css.scss
 - templates/stylesheets/bootstrap-override.css.scss
 - templates/stylesheets/bootstrap-setting.css.scss
+- templates/stylesheets/common.css.scss
 - templates/welcome.html.erb
 has_rdoc: true
 homepage: ""
@@ -104,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3216173812893648341
+      hash: 2197860383841598612
       segments: 
       - 0
       version: "0"
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3216173812893648341
+      hash: 2197860383841598612
       segments: 
       - 0
       version: "0"