github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-22 04:38:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,433 Commits 13 Branches 16 Tags
v2.2.2-p3
Commit Graph

3433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnold Daniels
3ab1bb7e4a Using 'p' instead of 'j' in version 
Fixed broken composer.json
v2.2.2-p3 		2013-07-12 14:02:23 +02:00
Arnold Daniels
65f8a89ebe Build 2.2.2-j4 2013-01-27 23:05:40 -08:00
Arnold Daniels
fb77462b91 Small fixes inputmask 
Set default option 'mask'. Fix #54
Allow setting the definitions as option.
 2013-01-27 22:59:50 -08:00
Arnold Daniels
1560ef2410 Composer: package replaces twitter/bootstrap + author. Fixes #57 2013-01-27 22:53:38 -08:00
Arnold Daniels
58894f985f Merge branch '2.2.2-j4-wip' of github.com:jasny/bootstrap into 2.2.2-j4-wip 2013-01-27 22:38:07 -08:00
Arnold Daniels
db7f905653 Fix jQuery 1.9 removed $.browser for inputmask. Fixes #63 2013-01-27 22:35:56 -08:00
Arnold Daniels
677bf21344 Merge branch 'patch-1' of github.com:ameyab/bootstrap into 2.2.2-j4-wip 2013-01-27 22:32:06 -08:00
Ameya Bhatawdekar
75f545982c Update js/bootstrap-fileupload.js 
Support for jquery.browser was removed in 1.9. This caused the "Remove" button to not work. 

Changed line 103 from 
   if($.browser.msie){
to 
   if (navigator.userAgent.match(/msie/i)){
 2013-01-27 17:22:01 -08:00
Arnold Daniels
0d5eb9a62e Merge pull request #56 from arild-haugstad/patch-1 
iconicFontPath prefix on font URLs
 2013-01-21 09:29:36 -08:00
Arild Martin Møller Haugstad
92f9fc0c88 iconicFontPath prefix on font URLs 
less/iconic.less: Font path prefix was missing on URLs for iconic_stroke.eot, iconic_stroke.svg and iconic_fill.svg.
 2013-01-20 16:32:23 +01:00
Arnold Daniels
ce0b235c86 Bind to document instead of 'body' 
As per twitter#5308
 2013-01-15 03:12:14 +01:00
Arnold Daniels
15c80617a5 Merge branch 'patch-1' of github.com:ghiculescu/bootstrap into 2.2.2-j4-wip 2013-01-15 03:08:34 +01:00
Arnold Daniels
d0bdeff444 Merge branch 'patch-2' of github.com:camillo/bootstrap into 2.2.2-j4-wip 2013-01-15 03:06:11 +01:00
Arnold Daniels
f28b38852d Fileupload fix: Don't need to get file on clear 2013-01-15 03:01:03 +01:00
Arnold Daniels
30b0a2c6c4 Merge branch 'patch-1' of https://github.com/gboer/bootstrap into 2.2.2-j4-wip 2013-01-15 02:17:17 +01:00
gboer
a78887117c Update js/bootstrap-fileupload.js 
A bit better fix for when the element itself is the dismiss button
 2013-01-12 12:03:53 +01:00
Daniel Marohn
a415bb1f59 fix js rowlink docu (nohref -> nolink) 
rowlink example read: <td class="nohref">
changed to <td class="nolink">
 2013-01-12 10:32:18 +01:00
Alex Ghiculescu
695b1ccafe Bind to document instead of 'body' 
As per https://github.com/twitter/bootstrap/pull/5308
 2012-12-31 15:10:41 +10:00
Arnold Daniels
9565f1703a Improved docs for v2.2.2-j3 2012-12-28 22:56:15 +01:00
Arnold Daniels
db6a8e2d20 Fixed travis ci img 2012-12-27 22:41:43 +01:00
Arnold Daniels
239c76c746 Merge branch '2.2.2-j3-wip' of https://github.com/mmoussa/bootstrap into 2.2.2-j4-wip 
Conflicts:
	less/iconic.less
 2012-12-27 17:56:48 +01:00
Michael Moussa
37a27ef5db Added variable Iconic font path. 2012-12-26 13:40:35 -05:00
Arnold Daniels
830a7f8f56 Fix customize match:js 2012-12-26 10:58:12 +01:00
Arnold Daniels
ef7599fd94 Fixed comments in bootstrap-fileupload.js 2012-12-26 10:44:48 +01:00
Arnold Daniels
05321c5c81 Fixed iconic font path 2012-12-26 09:50:55 +01:00
Arnold Daniels
f0d95a4573 Added download button in javascript docs 2012-12-26 09:35:27 +01:00
Arnold Daniels
88865a0f82 No border for hidden input in btn-file. Fixes #22 2012-12-26 08:52:46 +01:00
Arnold Daniels
76c8338f48 Fixed customize 
Rebuild docs
 2012-12-26 06:31:11 +01:00
Arnold Daniels
c63e570f7f Using in fileupload. Fixed #19 2012-12-25 06:48:51 +01:00
Arnold Daniels
8fa7b7ee99 Reset fileupload on form reset. Fixed #31 
Allow resetting and clearing fileupload using js
 2012-12-25 06:41:17 +01:00
Arnold Daniels
0657ace43c Fix problem with tr comparison in jasny rowlink. Fixed #34 2012-12-25 05:43:40 +01:00
Arnold Daniels
8727176325 Fix Submit issues link in site footer. Fixes #36 2012-12-25 05:40:15 +01:00
Arnold Daniels
50636c2345 Fix GET data for js test server 2012-12-25 05:22:28 +01:00
Arnold Daniels
c607fec9b9 Merge branch 'master' of git://github.com/SkynetInc/jasny-bootstrap into 2.2.2-j3-wip 2012-12-25 05:10:10 +01:00
Arnold Daniels
a78e874844 Fixed typeahead issues 
Added typeahead tests
Added new features of typeahead to docs
 2012-12-25 04:46:34 +01:00
Arnold Daniels
90bb013e1b Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3-wip 2012-12-25 04:02:32 +01:00
Mark Otto
558bc52432 Add docs readme icon 2012-12-21 18:54:36 -08:00
Arnold Daniels
32a25811ff Add semicolon after (window.jQuery). fixes #39 2012-12-22 00:37:52 +01:00
Trindaz
393e5ae2de support ie8+ for changing target file 2012-12-20 18:03:37 +11:00
Arnold Daniels
b883581511 Added links to jasny.net 2012-12-14 16:35:19 +01:00
Arnold Daniels
eaad32b34f Added responsive tables 2012-12-14 16:27:33 +01:00
Mark Otto
9f29785783 Merge pull request #6195 from nathanb/example-carousel-nav-fix 
lowered carousel beneath the nav (in carousel example)
 2012-12-10 00:21:35 -08:00
Nathan Bridgewater
18adc44171 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Arnold Daniels
f997a9ada7 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3 
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/docs.css
	docs/assets/img/bs-docs-bootstrap-features.png
	docs/assets/img/bs-docs-responsive-illustrations.png
	docs/assets/img/bs-docs-twitter-github.png
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
 2012-12-10 00:22:22 +01:00
Mark Otto
070c125cec Restore print styles 2012-12-08 21:05:05 -08:00
Mark Otto
68d1d7fc83 Test removal of print styles for customized builds 2012-12-08 21:02:37 -08:00
Mark Otto
b5ceca14db Fix docs typos 2012-12-08 18:46:34 -08:00
Mark Otto
9376a7c221 Fixes #5729: Nested striped tables 
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
 2012-12-08 12:57:21 -08:00
Mark Otto
cacc213762 Nesting tables 
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
 2012-12-08 12:52:19 -08:00
Mark Otto
b9292ff90c Merge pull request #6165 from Quy/2.2.2-wip 
Apply code tag to data attribute on javascript page
 2012-12-08 12:17:46 -08:00