Gleb Mazovetskiy
9fdd6cf529
converter: fix multiparameter @include
2013-07-30 18:06:31 +02:00
Gleb Mazovetskiy
f6d7156101
rake convert[3.0.0-wip]; sans bootstrap.js order convert bug
2013-07-30 16:09:53 +02:00
Peter Gumeson
b40433fb25
More upstream updates and glyphicons moved
2013-07-16 16:14:12 -07:00
Peter Gumeson
b3cbda80a8
Sync with upstream bootstrap
2013-06-27 13:14:16 -07:00
Peter Gumeson
5ed433c31b
Merge branch '3' of github.com:intridea/bootstrap-sass into 3.0.0-wip
...
Conflicts:
update-bootstrap.sh
vendor/assets/javascripts/bootstrap.js
vendor/assets/javascripts/bootstrap/carousel.js
vendor/assets/javascripts/bootstrap/modal.js
vendor/assets/javascripts/bootstrap/tooltip.js
vendor/assets/stylesheets/bootstrap/_button-groups.scss
vendor/assets/stylesheets/bootstrap/_carousel.scss
vendor/assets/stylesheets/bootstrap/_close.scss
vendor/assets/stylesheets/bootstrap/_component-animations.scss
vendor/assets/stylesheets/bootstrap/_forms.scss
vendor/assets/stylesheets/bootstrap/_glyphicons.scss
vendor/assets/stylesheets/bootstrap/_grid.scss
vendor/assets/stylesheets/bootstrap/_mixins.scss
vendor/assets/stylesheets/bootstrap/_modals.scss
vendor/assets/stylesheets/bootstrap/_navbar.scss
vendor/assets/stylesheets/bootstrap/_pagination.scss
vendor/assets/stylesheets/bootstrap/_variables.scss
2013-06-13 13:48:18 -07:00
Peter Gumeson
7c93bfffb2
Sync with upstream bootstrap 3.0.0-wip changes
2013-06-13 12:17:58 -07:00
Peter Gumeson
e9da9de5b5
Pulled down latest changes from bootstrap upstream
2013-05-28 21:01:04 -07:00
gleb
5a8e509624
fix js load order
2013-05-28 20:04:23 +02:00
gleb
9ef003c3b5
sort out javascripts
2013-05-28 18:42:48 +02:00
gleb
5525d66b51
update to the latest sass-twitter-bootstrap 3.0.0beta
2013-05-28 17:49:54 +02:00
Peter Gumeson
ad8cc1ecd4
Refactored converter to handle javascript assets
2013-05-24 16:59:48 -07:00
Thomas McDonald
0f144a11d0
Update to a working copy of 3-wip
2013-04-13 15:59:28 +01:00
Tristan Harward
4884e9a217
Upgrade to 2.3.1 from official upstream.
...
Overrides thomas-mcdonald/bootstrap-sass#307 , thomas-mcdonald/bootstrap-sass#306
2013-03-12 13:22:07 -04:00
Tristan Harward
07e7ec2eac
Update to match bootstrap 2.3 from jlong/sass-twitter-bootstrap #54
...
Fixes thomas-mcdonald/bootstrap-sass#288
2013-02-09 12:32:17 -05:00
Tristan Harward
e12d9cc3f2
Update to 2.2.2 from jlong/sass-twitter-bootstrap#44
2012-12-11 11:19:13 -05:00
Tristan Harward
d5c5626714
Remove javascript and stylesheet tests.
...
These are provided by and will be easily accessible upstream, so we shouldn't distribute them with the gem.
2012-11-04 09:52:12 -05:00
Tristan Harward
776583f08e
Merged in twitter-bootstrap-sass 2.2.1 and removed old files.
2012-11-01 08:49:43 -04:00
Lori M Olson
444409bd59
Straight-up copy of the Bootstrap 2.1.1 javascript files
2012-09-13 21:18:48 -06:00
Linus Pettersson
0e777de283
Fix to make data-methods work in dropdown menu
2012-09-03 10:52:28 +02:00
Thomas McDonald
fb14b57702
Update assets to Bootstrap 2.1
2012-09-01 17:42:07 +01:00
Niklas H
d04c446e88
enable arrow key navigation in typeahead for Firefox
...
see https://github.com/twitter/bootstrap/issues/3741
2012-07-27 09:51:31 +01:00
Alex Zaytsev
7b06626ac6
Bugfix for modal popup in Opera12
2012-07-27 09:50:24 +01:00
Thomas McDonald
f6993413bb
update Javascripts to 2.0.4
2012-06-04 11:47:03 +01:00
Thomas McDonald
b09bf38b71
javascripts fix
2012-05-13 21:14:56 +01:00
Thomas McDonald
a72773a9e8
fix collapse regression
2012-04-25 22:35:34 +01:00
Thomas McDonald
375b76c684
update javascripts to 2.0.3
...
version number commit, huzzah!
2012-04-25 22:34:37 +01:00
Thomas McDonald
961ee5c701
updated javascripts to f848821
2012-04-21 11:23:28 +01:00
Thomas McDonald
1a28059172
updated Javascripts to 2.0.2
2012-03-13 22:05:21 +00:00
Thomas McDonald
6c960a739a
fix button regression
2012-03-09 21:25:23 +00:00
Thomas McDonald
472f4ca3b9
Update Javascripts to 2.0.1
2012-02-17 08:46:55 +00:00
Thomas McDonald
4ae4653ff6
Update bootstrap-sass to 2.0.0
...
Now with support for Compass!
2012-02-06 13:38:26 +00:00
Thomas McDonald
f9129ee848
Update javascripts to Bootstrap master
2011-12-02 22:20:23 +00:00
Thomas McDonald
1bf44db64a
Updated Javascripts to 1.4.0
2011-11-04 14:44:03 +00:00
Stephen Pike
088d32e272
Update javascripts
2011-10-12 17:51:51 -04:00
Thomas McDonald
1740834a40
Add Bootstrap 1.3.0 javascripts
...
Added Bootstrap 1.3 javascripts to /vendor/assets
Added bootstrap.js helper manifest which loads all Bootstrap javascripts
Included javascripts in list of files to include in gem
2011-09-19 22:54:05 +01:00
