Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-rubygem.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAJ Acevedo <aj@ajalabs.com>2013-08-01 09:09:59 +0400
committerAJ Acevedo <aj@ajalabs.com>2013-08-01 09:09:59 +0400
commitf33e651ba70cbb24521f2e30b689a3bac875b24f (patch)
treea7ee156dad904711772deff8e1c6f6e8c37a9415 /README.md
parent1356701ad7e175681131dd91060c0548ff962e23 (diff)
Updated the documentation and corrected some typos
All upstream bootstrap links now point to the twbs/bootstrap repo.
Diffstat (limited to 'README.md')
-rw-r--r--README.md18
1 files changed, 9 insertions, 9 deletions
diff --git a/README.md b/README.md
index 0de7d29..e95526b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Bootstrap for Sass
-`bootstrap-sass` is an Sass-powered version of [Twitter's Bootstrap](http://github.com/twitter/bootstrap), ready to drop right into your Sass powered applications.
+`bootstrap-sass` is an Sass-powered version of [Bootstrap](https://github.com/twbs/bootstrap), ready to drop right into your Sass powered applications.
## Usage
@@ -17,24 +17,24 @@ gem 'bootstrap-sass', :git => 'git://github.com/thomas-mcdonald/bootstrap-sass.g
## Upstream Converter
-Keeping bootstrap-sass in sync with upsteam changes from Bootstrap is an error prone and time consuming manual process.
+Keeping bootstrap-sass in sync with upstream changes from Bootstrap is an error prone and time consuming manual process.
This branch is specifically concerned with automating that process as much as possible to allow a much faster release cycle.
-Upsteam changes to the Twitter Bootstrap project can now be pulled in using the `convert` rake task.
+Upstream changes to the Bootstrap project can now be pulled in using the `convert` rake task.
-Here's an example run that would pull down the `3.0.0-wip` branch from the main twitter/bootstrap repo:
+Here's an example run that would pull down the `3.0.0-wip` branch from the main twbs/bootstrap repo:
% bundle exec rake 'convert[3.0.0-wip]'
-The latest converter script is located [here](https://github.com/thomas-mcdonald/bootstrap-sass/blob/3.0.0-wip/tasks/converter.rb) and does the following:
+The latest converter script is located [here](https://github.com/thomas-mcdonald/bootstrap-sass/blob/3/tasks/converter.rb) and does the following:
-* Converts upsteam bootstrap Less files to its matching Scss file.
-* Copies all upstream javascripts into `vendor/assets/javascripts/bootstrap`
+* Converts upstream bootstrap LESS files to its matching SCSS file.
+* Copies all upstream JavaScript into `vendor/assets/javascripts/bootstrap`
* Generates a javascript manifest at `vendor/assets/javascripts/bootstrap.js`
* Copies all upstream font files into `vendor/assets/fonts`
-This less to scss conversion is pretty good, but not perfect. So manual fixes to the resulting Scss will necessary for now.
-Please submit Github issues tagged with `conversion` to help track current shortcomings of the conversion process.
+This LESS to SCSS conversion is pretty good, but not perfect. So manual fixes to the resulting SCSS will be necessary for now.
+Please submit GitHub issues tagged with `conversion` to help track current shortcomings of the conversion process.
## Who
bootstrap-sass is a project by [Thomas McDonald](https://twitter.com/#!/thomasmcdonald_), with support from [other awesome people](https://github.com/thomas-mcdonald/bootstrap-sass/graphs/contributors).