github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,243 Commits 13 Branches 16 Tags
176ab8f77832dd2cad7dd577d7e7ebcb6b30b667
Commit Graph

852 Commits

Author SHA1 Message Date
Arnold Daniels
176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip 
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	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/index.mustache
	js/bootstrap-typeahead.js
	package.json
 2012-11-29 23:58:46 +01:00
Arnold Daniels
d7979d33d2 Don't put jasny less file in subdir 2012-11-16 10:34:55 +01:00
fat
3b3dd3ac3c 2.2.1 - hotfix for carousel 2012-10-30 21:59:56 -07:00
Mark Otto
b5af762ef5 Merge branch '2.1.2-wip' 
Conflicts:
	js/bootstrap-dropdown.js
 2012-10-29 22:01:58 -07:00
Mark Otto
bf10a43ed9 derp, add that in the right spot 2012-10-29 21:34:10 -07:00
Mark Otto
5bb6c42405 fixes #4511: remove focus on opened modal window 2012-10-29 21:33:20 -07:00
Mark Otto
41ad16fe40 v2.2.0 instead of v2.1.2 2012-10-29 21:00:53 -07:00
Arnold Daniels
34648bb0bd Added typeahead functionality 
* AJAX search
 * Convert select to typeahead
 * Use value objects as search
 * Customizable dropdown
 * Min-width menu typeahead
 * Fixed click typeahead menu (see twitter/bootstrap#2715) as suggested by @mckramer

Padding 2px for select
 2012-10-28 02:46:52 +02:00
Mark Otto
709870aa3e fixes #5496: use correct var for dropdown active link text 2012-10-16 20:34:42 -07:00
Mark Otto
78f7ad95f4 fixes #5542: move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component. 2012-10-16 19:56:34 -07:00
Arnold Daniels
998051173a Color border for error/warning/success for fileupload. Fixed #10 
Cancel button clears fileupload widget. Fixed #11
 2012-10-12 05:00:38 +02:00
Arnold Daniels
ebe22a913a Split up jasny's responsive classes per screen size 2012-10-11 19:41:49 +02:00
Arnold Daniels
a30f7c9493 Moved css for editor texteare to form styles 2012-10-11 04:05:31 +02:00
Arnold Daniels
6cb9e62662 Bump to version 2.1.1-j2 2012-10-11 02:57:18 +02:00
Mark Otto
31007c01d8 fixes #5478: remove double background color on dropdown links 2012-10-10 10:29:22 -07:00
Mark Otto
b18c009051 fixes #5473: use baselineheight var for input bottom margin 2012-10-10 09:47:08 -07:00
Arnold Daniels
ee0c1b4c62 Merge remote-tracking branch 'twitter/master' into 2.1.0-j2-wip 2012-10-09 13:37:41 +02:00
Mark Otto
7e534ce98a fixes #5443: reset background gradient on disabled dropdown links 2012-10-07 21:45:16 -07:00
Mark Otto
e4f522990e fixes #5416: use correct variable for inverse navbar responsive links 2012-10-07 21:43:37 -07:00
Mark Otto
7d649c9d4a fixes #5430: scope link styles in .dropdown-menu to .dropdown-menu li > a 2012-10-05 11:13:21 -07:00
Mark Otto
3726ce24bb finish off scoping of grid sizing to table elements 2012-10-03 09:43:14 -07:00
Mark Otto
11ee1633b4 fixes #5257: add data-original-title attribute selector to abbr element 2012-10-03 09:36:45 -07:00
Mark Otto
dd8b745b88 use border-radius vars where possible 2012-10-03 09:26:52 -07:00
Mark Otto
630a88d3ce Merge pull request #5281 from GotenXiao/pagination-active-background 
Use paginationActiveBackground var to finish fixing #4295
 2012-10-02 15:23:59 -07:00
Mark Otto
1bd4723038 fixes #5392: hover on submenu should maintain white icons for active parent a tag 2012-10-02 13:19:11 -07:00
Mark Otto
7c9597f4e7 remove double border effect: instead of inset shadow and border on fixed navbars, only border 2012-10-01 23:34:03 -07:00
Mark Otto
1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto
7763cab608 Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip 2012-10-01 16:15:26 -07:00
Mark Otto
5cf7c803e2 Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix 2012-10-01 15:29:21 -07:00
Mark Otto
d36e37214b fixes #5319: add backface-visibility for webkit skewing 2012-10-01 15:26:17 -07:00
Mark Otto
f8ac403d8b fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 2012-10-01 13:08:21 -07:00
Mark Otto
bc4f5d565e fixes #5275: inline-block badges and labels, then fix padding accordingly 2012-10-01 12:04:10 -07:00
Mark Otto
5035592988 fixes #5193 manually: checkbox and radio padding in .controls-row 2012-10-01 11:53:52 -07:00
Mark Otto
239ce24f92 fixes #5188: add .google-maps class to reset responsive images on case-by-case basis 2012-10-01 10:49:19 -07:00
Mark Otto
c77d4266c0 Merge pull request #5369 from amid2887/2.1.2-wip 
Add missing icon class definition for navs.less
 2012-10-01 10:27:13 -07:00
amid2887
46764a7165 Add missing icon class definition for navs.less 
add missing icon class definition for navs:
'[class*=" icon-"]'

P.S. Sorry for 2 pull requests with the same problem..
 2012-10-01 14:32:51 +07:00
Mark Otto
40a8a93b22 Merge branch 'amid2887-master' into 2.1.2-wip 2012-09-30 22:41:11 -07:00
amid2887
d49dd766c8 Add missing icon class definition for buttons.less 
add missing icon class definition for buttons:
'[class*=" icon-"]'
 2012-10-01 12:27:37 +07:00
Artem Kustikov
0944e036ae Fix for #4550 
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
 2012-09-27 21:45:37 +03:00
Andreas Cederström
ecbb0ed4df Making modal work with max width 767px - fixes #4860 2012-09-27 11:46:54 +02:00
Robin Lewis
b29d947477 Use paginationActiveBackground var to finish fixing #4295 2012-09-25 21:12:01 +01:00
Jacob Thornton
88b1e44dd6 change tooltip/popover insert strategy 
remove modal-open class
hopefully resolve z-index headaches
 2012-09-24 23:28:38 -07:00
Jacob Thornton
4a2443901f reverting d797a5fbd7 2012-09-24 23:19:33 -07:00
Mark Otto
f4d3d7da2e ensure 100% width for .uneditable-inputs in <767px viewports 2012-09-23 16:06:28 -07:00
Mark Otto
a4bf6ef0a0 match decimal placements in type.less 2012-09-23 15:16:13 -07:00
Mark Otto
af871d57c9 fixes #5216: calculate heading sizes via math rather than fixed pixel amounts 2012-09-22 22:16:12 -07:00
Mark Otto
c92a75999f fixes #5127: add @inputHeight to replace static instances of '30px' throughout forms 2012-09-20 11:45:59 -07:00
Mark Otto
532ee08213 fixes #5150: add btn-group support to input groups 2012-09-20 11:37:34 -07:00
Mark Otto
443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto
67585bd34e fixes #5211 manually: spacing in mixins to match others 2012-09-20 09:07:48 -07:00