Permalink
Browse files

Merge branch 'master' of github.com:anjlab/bootstrap-rails

  • Loading branch information...
2 parents c4245ec + bda9ea4 commit 9fa7a3f2b32a87d2fe7ec98b64d2fafec73218fd @yury yury committed Dec 5, 2013
Showing with 13 additions and 13 deletions.
  1. +5 −5 README.md
  2. +6 −6 Rakefile
  3. +1 −1 app/assets/stylesheets/twitter/bootstrap/_component-animations.scss
  4. +1 −1 bootstrap-rails.gemspec
View
@@ -1,5 +1,5 @@
-# Twitter Bootstrap v3.0.2 for Rails 3/4
-Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
+# Bootstrap v3.0.2 for Rails 3/4
+Bootstrap is a toolkit originated at Twitter that's designed to kickstart development of webapps and sites.
It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
Note: if you are looking for bootstrapped date and time pickers please take a look at [anjlab-widgets](https://github.com/anjlab/anjlab-widgets) gem.
@@ -27,7 +27,7 @@ and run bundle install.
## Stylesheets
1. Rename application.css to application.css.scss
-2. Import twitter bootstrap `@import "twitter/bootstrap";`
+2. Import bootstrap `@import "twitter/bootstrap";`
3. You can override vars above `@import "twitter/bootstrap";`
```scss
@@ -46,7 +46,7 @@ $link-color: red;
Add necessary javascript(s) files to app/assets/javascripts/application.js
``` javascript
-// Include all twitter's javascripts
+// Include all bootstrap javascripts
//= require twitter/bootstrap
// Or peek any of them yourself
@@ -70,7 +70,7 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
## Thanks
Thanks Twitter for Bootstrap
-http://twitter.github.com/bootstrap
+http://getbootstrap.com
Inspired by Seyhun Akyürek and his [twitter-bootstrap-rails gem](https://github.com/seyhunak/twitter-bootstrap-rails)
View
@@ -4,7 +4,7 @@ require 'rake/testtask'
namespace :twitter do
- desc "Pulls Twitter's Bootstrap Scss"
+ desc "Pulls Bootstrap Scss"
task :pull do
if !system "cd bootstrap && git pull"
abort "...."
@@ -30,10 +30,10 @@ namespace :twitter do
file target => [source] { cp source, target, verbose: true }
end
- desc "Update Twitter's Bootstrap Fonts"
+ desc "Update Bootstrap Fonts"
task :fonts => ASSETS_FONTS
- desc "Update Twitter's Bootstrap JS"
+ desc "Update Bootstrap JS"
task :js => ASSETS_JS do
js = {}
ASSETS_JS.pathmap("%f").each { |f| js[f] = 1 }
@@ -46,7 +46,7 @@ namespace :twitter do
File.write "app/assets/javascripts/twitter/bootstrap.js", list.map {|f| "//= require #{f}"}.join("\n")
end
- desc "Update Twitter's icons"
+ desc "Update Bootstrap Glyphicons icons"
task :icons do
vars_path = 'app/assets/stylesheets/twitter/bootstrap/_variables.scss'
variables = File.read vars_path
@@ -59,7 +59,7 @@ namespace :twitter do
File.write(icons_path, icons)
end
- desc "Update Twitter's Bootstrap SCSS"
+ desc "Update Bootstrap SCSS"
task :scss => ASSETS_SCSS do
File.write "app/assets/stylesheets/twitter/bootstrap.scss", '@import "twitter/bootstrap/bootstrap";'
end
@@ -72,7 +72,7 @@ namespace :twitter do
FileUtils.mkpath 'app/assets/stylesheets/twitter/bootstrap'
end
- desc "Update Twitter's Bootstrap Assets"
+ desc "Update Bootstrap Assets"
task :assets => [:pull, :clean, :fonts, :scss, :js, :icons]
end
@@ -5,7 +5,7 @@
// Heads up!
//
// We don't use the `.opacity()` mixin here since it causes a bug with text
-// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
+// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
.fade {
opacity: 0;
View
@@ -4,7 +4,7 @@ require File.expand_path('../lib/bootstrap-rails/version', __FILE__)
Gem::Specification.new do |gem|
gem.authors = ["Yury Korolev"]
gem.email = ["yury.korolev@gmail.com"]
- gem.description = %q{Twitter Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
+ gem.description = %q{Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
gem.summary = %q{Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
gem.homepage = "https://github.com/anjlab/bootstrap-rails"

0 comments on commit 9fa7a3f

Please sign in to comment.