diff --git a/Makefile b/Makefile index 908f4d15..673dbd83 100644 --- a/Makefile +++ b/Makefile @@ -31,15 +31,15 @@ build: @echo "Compiling documentation... ${CHECK} Done" @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js js/bootstrap-rowlink.js js/bootstrap-fileupload.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v2.1.1 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js + @echo "/**\n* Bootstrap.js v2.1.1-j2 by @fat & @mdo extended by @ArnoldDaniels\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @echo "Compiling and minifying javascript... ${CHECK} Done" @echo "\n${HR}" @echo "Bootstrap successfully built at ${DATE}." @echo "${HR}\n" - @echo "Thanks for using Bootstrap," - @echo "<3 @mdo and @fat\n" + @echo "Thanks for using Jasny Bootstrap," + @echo "<3 @mdo, @fat & @ArnoldDaniels\n" # # RUN JSHINT & QUNIT TESTS IN PHANTOMJS @@ -78,7 +78,7 @@ bootstrap: recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-inputmask.js js/bootstrap-rowlink.js js/bootstrap-fileupload.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js - echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js + echo "/*!\n* Bootstrap.js v2.1.1-j2 by @fat & @mdo extended by @ArnoldDaniels\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js @@ -99,7 +99,7 @@ jasny-bootstrap: recess --compress ${JASNY_BOOTSTRAP_RESPONSIVE_LESS} > jasny-bootstrap/css/jasny-bootstrap-responsive.min.css cat js/bootstrap-inputmask.js js/bootstrap-rowlink.js js/bootstrap-fileupload.js > jasny-bootstrap/js/jasny-bootstrap.js uglifyjs -nc jasny-bootstrap/js/jasny-bootstrap.js > jasny-bootstrap/js/jasny-bootstrap.min.tmp.js - echo "/*!\n* Jasny-Bootstrap.js by @ArnoldDaniels\n* Copyright 2012 Jasny BV.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > jasny-bootstrap/js/copyright.js + echo "/*!\n* Jasny-Bootstrap.js j2 by @ArnoldDaniels\n* Copyright 2012 Jasny BV.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > jasny-bootstrap/js/copyright.js cat jasny-bootstrap/js/copyright.js jasny-bootstrap/js/jasny-bootstrap.min.tmp.js > jasny-bootstrap/js/jasny-bootstrap.min.js rm jasny-bootstrap/js/copyright.js jasny-bootstrap/js/jasny-bootstrap.min.tmp.js @@ -132,7 +132,7 @@ watch: # haunt: - @haunt .issue-guidelines.js https://github.com/twitter/bootstrap + @haunt .issue-guidelines.js https://github.com/jasny/bootstrap .PHONY: docs watch gh-pages \ No newline at end of file diff --git a/README.md b/README.md index d9850fda..0b554dea 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,18 @@ -[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) +[Jasny Bootstrap](http://jasny.github.com/bootstrap) ================= Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter. -To get started, checkout http://getbootstrap.com! +This version is extended by [Arnold Daniels](http://twitter.com/ArnoldDaniels) of [Jasny](http://www.jasny.net) and contains a number of extra features. + +To get started, checkout http://jasny.github.com/bootstrap! Quick start ----------- -Clone the repo, `git clone git://github.com/twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master). +Clone the repo, `git clone git://github.com/jasny/bootstrap.git`, or [download the latest release](https://github.com/jasny/bootstrap/zipball/master). @@ -31,6 +33,7 @@ And constructed with the following guidelines: For more information on SemVer, please visit http://semver.org/. +Additionally the version for the Jasny extensions will simply be incremented with each release and is prefixed with a 'j'. Bug tracker @@ -38,14 +41,15 @@ Bug tracker Have a bug? Please create an issue here on GitHub that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines). -https://github.com/twitter/bootstrap/issues +https://github.com/jasny/bootstrap/issues Twitter account --------------- -Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap). +Keep up to date on announcements and more by following Arnold Daniels on Twitter, [@ArnoldDaniels](http://twitter.com/ArnoldDaniels). +Also follow Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap). @@ -56,26 +60,6 @@ Read more detailed announcements, discussions, and more on [The Official Twitter -Mailing list ------------- - -Have a question? Ask on our mailing list! - -twitter-bootstrap@googlegroups.com - -http://groups.google.com/group/twitter-bootstrap - - - -IRC ---- - -Server: irc.freenode.net - -Channel: ##twitter-bootstrap (the double ## is not a typo) - - - Developers ---------- @@ -89,7 +73,7 @@ $ npm install recess connect uglify-js jshint -g ``` + **build** - `make` -Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. Read more in our docs » +Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. Read more in our docs » + **test** - `make test` Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed. @@ -119,7 +103,10 @@ Authors + http://twitter.com/fat + http://github.com/fat +**Arnold Daniels** ++ http://twitter.com/ArnoldDaniels ++ http://github.com/jasny Copyright and license --------------------- diff --git a/docs/assets/ico/apple-touch-icon-114-precomposed.png b/docs/assets/ico/apple-touch-icon-114-precomposed.png index 790a64f7..ec69d42b 100644 Binary files a/docs/assets/ico/apple-touch-icon-114-precomposed.png and b/docs/assets/ico/apple-touch-icon-114-precomposed.png differ diff --git a/docs/assets/ico/apple-touch-icon-144-precomposed.png b/docs/assets/ico/apple-touch-icon-144-precomposed.png index 6d0e463f..151942d2 100644 Binary files a/docs/assets/ico/apple-touch-icon-144-precomposed.png and b/docs/assets/ico/apple-touch-icon-144-precomposed.png differ diff --git a/docs/assets/ico/apple-touch-icon-57-precomposed.png b/docs/assets/ico/apple-touch-icon-57-precomposed.png index 4936cca8..77c6464b 100644 Binary files a/docs/assets/ico/apple-touch-icon-57-precomposed.png and b/docs/assets/ico/apple-touch-icon-57-precomposed.png differ diff --git a/docs/assets/ico/apple-touch-icon-72-precomposed.png b/docs/assets/ico/apple-touch-icon-72-precomposed.png index b1165bdb..15e29f2a 100644 Binary files a/docs/assets/ico/apple-touch-icon-72-precomposed.png and b/docs/assets/ico/apple-touch-icon-72-precomposed.png differ diff --git a/docs/assets/ico/favicon.ico b/docs/assets/ico/favicon.ico index cb8dbdfc..3f1a5b90 100644 Binary files a/docs/assets/ico/favicon.ico and b/docs/assets/ico/favicon.ico differ diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index 241ee108..b58d1746 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -1,5 +1,5 @@ /** -* Bootstrap.js v2.1.1 by @fat & @mdo +* Bootstrap.js v2.1.1-j2 by @fat & @mdo extended by @ArnoldDaniels * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ diff --git a/docs/base-css.html b/docs/base-css.html index e33d0e90..eaa2e7b3 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2,7 +2,7 @@ - Base · Twitter Bootstrap + Base · Jasny Bootstrap @@ -25,6 +25,16 @@ + diff --git a/docs/build/index.js b/docs/build/index.js index 41347e9f..8e21ae78 100644 --- a/docs/build/index.js +++ b/docs/build/index.js @@ -2,7 +2,8 @@ var hogan = require('hogan.js') , fs = require('fs') , prod = process.argv[2] == 'production' - , title = 'Twitter Bootstrap' + , title = 'Jasny Bootstrap' + , version = '2.1.1-j2' var layout, pages @@ -28,6 +29,8 @@ pages.forEach(function (name) { .replace(/\.mustache/, '') .replace(/\-.*/, '') .replace(/(.)/, function ($1) { return $1.toUpperCase() }) + context.version = version + context.jasny_version = version.replace(/^.+-/, '') if (context.title == 'Index') { context.title = title diff --git a/docs/components.html b/docs/components.html index cedb66ea..081f5f4b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2,7 +2,7 @@ - Components · Twitter Bootstrap + Components · Jasny Bootstrap @@ -25,6 +25,16 @@ + diff --git a/docs/customize.html b/docs/customize.html index 25a613a4..db7c42f2 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -2,7 +2,7 @@ - Customize · Twitter Bootstrap + Customize · Jasny Bootstrap @@ -25,6 +25,16 @@ + @@ -448,7 +458,7 @@
- Customize and Download + Customize and Download

What's included?

Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.

diff --git a/docs/extend.html b/docs/extend.html index 8217cf50..572b70a2 100644 --- a/docs/extend.html +++ b/docs/extend.html @@ -2,7 +2,7 @@ - Extend · Twitter Bootstrap + Extend · Jasny Bootstrap @@ -25,6 +25,16 @@ + diff --git a/docs/getting-started.html b/docs/getting-started.html index d058303c..c42401db 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -2,7 +2,7 @@ - Getting · Twitter Bootstrap + Getting · Jasny Bootstrap @@ -25,6 +25,16 @@ + @@ -111,12 +121,12 @@

Download compiled

Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.

-

Download Bootstrap

+

Download Bootstrap

Download source

Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.

-

Download Bootstrap source

+

Download Bootstrap source

@@ -277,8 +287,8 @@

What next?

Head to the docs for information, examples, and code snippets, or take the next leap and customize Bootstrap for any upcoming project.

- Visit the Bootstrap docs - Customize Bootstrap + Visit the Bootstrap docs + Customize Bootstrap diff --git a/docs/index.html b/docs/index.html index 7de4bdf1..44a0da5e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ - Twitter Bootstrap + Jasny Bootstrap @@ -25,6 +25,16 @@ + @@ -74,13 +84,13 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

- Download Bootstrap
Includes all Jasny extensions - Extend Bootstrap
Download extensions only + Download Bootstrap
Includes all Jasny extensions + Extend Bootstrap
Download extensions only

diff --git a/docs/javascript.html b/docs/javascript.html index 60e2b55e..2e9e61fd 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -2,7 +2,7 @@ - Javascript · Twitter Bootstrap + Javascript · Jasny Bootstrap @@ -25,6 +25,16 @@ + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 94448295..b6bd3fbb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -2,7 +2,7 @@ - Scaffolding · Twitter Bootstrap + Scaffolding · Jasny Bootstrap @@ -25,6 +25,16 @@ + diff --git a/docs/templates/pages/customize.mustache b/docs/templates/pages/customize.mustache index e891fba5..9178c8ff 100644 --- a/docs/templates/pages/customize.mustache +++ b/docs/templates/pages/customize.mustache @@ -377,7 +377,7 @@
- Customize and Download + Customize and Download

{{_i}}What's included?{{/i}}

{{_i}}Downloads include compiled CSS, compiled and minified CSS, and compiled jQuery plugins, all nicely packed up into a zipball for your convenience.{{/i}}

diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache index a760d1f7..1d116e99 100644 --- a/docs/templates/pages/getting-started.mustache +++ b/docs/templates/pages/getting-started.mustache @@ -40,12 +40,12 @@

{{_i}}Download compiled{{/i}}

{{_i}}Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.{{/i}}

-

{{_i}}Download Bootstrap{{/i}}

+

{{_i}}Download Bootstrap{{/i}}

Download source

Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.

-

{{_i}}Download Bootstrap source{{/i}}

+

{{_i}}Download Bootstrap source{{/i}}

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 18b29c80..58e3a545 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -3,14 +3,14 @@

Bootstrap

Sleek, intuitive, and powerful front-end framework for faster and easier web development.

- {{_i}}Download Bootstrap{{/i}}
{{_i}}Includes all Jasny extensions{{/i}} - {{_i}}Extend Bootstrap{{/i}}
{{_i}}Download extensions only{{/i}} + {{_i}}Download Bootstrap{{/i}}
{{_i}}Includes all Jasny extensions{{/i}} + {{_i}}Extend Bootstrap{{/i}}
{{_i}}Download extensions only{{/i}}

diff --git a/package.json b/package.json index f0be5d5f..1df2f183 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { - "name": "bootstrap" + "name": "jasny-bootstrap" , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development." - , "version": "2.1.1" + , "version": "2.1.1-j2" , "keywords": ["bootstrap", "css"] - , "homepage": "http://twitter.github.com/bootstrap/" - , "author": "Twitter Inc." + , "homepage": "http://jasny.github.com/bootstrap/" + , "author": "Arnold Daniels " , "scripts": { "test": "make test" } , "repository": { "type": "git" - , "url": "https://github.com/twitter/bootstrap.git" + , "url": "https://github.com/jasny/bootstrap.git" } , "licenses": [ {