rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
3,006 Commits 108 Branches 89 Tags 547 MiB
d49dd766c8
Commit Graph

738 Commits

Author SHA1 Message Date
Ross Laird
626b45d691 Corrected spelling error 2012-06-15 13:07:44 -07:00
François Robichet
fb31cdba9c Remove useless ms prefixes 2012-06-15 15:23:40 +03:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
alienlebarge
7b726f974f fix responsive height of image 2012-06-14 14:53:04 +02:00
Marcus Schwab
97cbefa72f Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip 2012-06-11 02:04:14 -07:00
Marcus Schwab
bd19b42c15 Proper spacing between offsets 
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
 2012-06-11 01:51:19 -07:00
Mark Otto
f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Marcus Schwab
c3f5d7c62d ajgon's fluid offsets working with first-child 2012-06-07 17:23:22 -07:00
Igor Rzegocki
f8d68002dc Added offsets for .row-fluid 2012-06-07 17:23:22 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Mark Otto
ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Jacob Thornton
5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Mark Otto
7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto
6fc5674466 Merge branch 'raymccoy-no-filters' into 2.0.4-wip 2012-05-28 17:17:36 -07:00
Mark Otto
9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -07:00
Corey Innis
8a06339501 fixes .placeholder to work as a "grouped selector" 
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
 2012-05-27 18:12:08 -07:00
Mark Otto
a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto
fe30bd6055 make bootstrap like google maps a bit more 2012-05-24 20:18:52 -07:00
Mark Otto
72e3b3beb3 Merge branch 'ademaro-patch-1' into 2.0.4-wip 2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d ie support placeholder color (http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx) 2012-05-24 13:57:02 +04:00
Mark Otto
5d27fbb32d Merge branch 'pvorb-patch-1' into 2.0.4-wip 2012-05-23 00:05:13 -07:00
Mark Otto
3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Tomás Arribas
642f75141d Do not use filters in fade animations 2012-05-21 02:56:57 +02:00
Paul Vorbach
faf2866f96 Remove re-declaration of font-fam, font-size, and line-height in p 2012-05-20 11:54:21 +03:00
Mark Otto
78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Jacob Thornton
9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Mark Otto
e009ed23fc move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto
6be09df1bf Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms 2012-05-15 09:07:31 -07:00
Mark Otto
a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto
532569fe59 updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits 2012-05-15 09:04:44 -07:00
Mark Otto
ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto
87f6e426b3 three columns 2012-05-14 23:50:34 -07:00
Mark Otto
c8cafa5d5a move forms test to less/tests 2012-05-14 23:45:25 -07:00
Mark Otto
e28efd7da0 consolidate and relabel new form selectors 2012-05-14 23:42:32 -07:00
Mark Otto
a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto
826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto
a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
Mark Otto
c02c3c60c9 Merge branch 'aziz-patch-7' into 2.0.4-wip 2012-05-13 14:42:12 -07:00
Mark Otto
8f44245850 document .hyphens() mixin 2012-05-13 14:31:31 -07:00
Mark Otto
23401e811f Merge branch 'Synchro-hyphenation' into 2.0.4-wip 2012-05-13 14:29:08 -07:00
Mark Otto
1a8561d084 Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation 2012-05-13 14:28:32 -07:00
Mark Otto
6f61c96f02 Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip 2012-05-13 13:59:26 -07:00
Mark Otto
3a21891824 #3469: add variables for dropdown menu dividers 2012-05-13 13:58:42 -07:00
Milos Gavrilovic
20eae67147 Update .placeholder() mixin call 
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:

.placeholder(@grayLight);
 2012-05-10 12:25:22 +03:00
David Hirtle
452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Synchro
ca369c4b2a Add Opera prefix 2012-05-01 17:54:53 +02:00
Synchro
dcc89e7400 Coding style 2012-05-01 17:06:19 +02:00
Synchro
5ffb6d6706 Add .hyphens mixin 2012-05-01 17:01:26 +02:00
Mark Otto
59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto
ad46b0980c expand input css tests to fixed width grid 2012-04-30 15:06:26 -07:00
Allen Bargi
ab178060be let's reuse color variables, instead of hardcoding colors. 2012-04-26 17:38:47 +03:00
Allen Bargi
99c3b7810b No need to specify units when a value is 0, thanks to RECESS 2012-04-25 18:16:59 +03:00
Mark Otto
66ac6e14db heading 2012-04-24 06:53:48 -07:00
Mark Otto
7b282798a3 officially drop support for offset on thumbnails since it breaks BC 2012-04-24 06:52:57 -07:00
Mark Otto
5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00
Mark Otto
f9744ff522 make component animations work cross browsers with opacity mixin, restore float on thumbnails > li 2012-04-24 06:39:14 -07:00
Mark Otto
d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Mark Otto
1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto
805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto
7f6f3ff462 fix #3202: add cursor to .accordion-toggle 2012-04-24 01:23:24 -07:00
Mark Otto
419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Mark Otto
99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Mark Otto
47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -07:00
Han Lin Yap
c09602d172 add -ms-user-select 2012-04-18 11:38:14 +03:00
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Jacob Thornton
a3ec868ac2 few more property orders 2012-04-16 15:37:17 -07:00
Jacob Thornton
457859feba Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a a few property reordering things 2012-04-16 15:09:05 -07:00
Mark Otto
a184806538 nuke line 2012-04-15 17:25:32 -07:00
Mark Otto
5c5310dc87 remove @gridRowWidth var since we don't use it anywhere 2012-04-15 16:57:11 -07:00
Mark Otto
d374fe92e5 simplify the left margin for offset grid columns 2012-04-15 16:48:17 -07:00
Mark Otto
13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Mark Otto
9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Mark Otto
a6f27ebed4 ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous 2012-04-14 23:06:00 -07:00
Mark Otto
8dc1a0eade Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 22:43:26 -07:00
Mark Otto
3bc7553f66 Merge branch 'au-phiware-patch-1' into 2.0.3-wip 2012-04-14 20:56:13 -07:00
au-phiware
16855b920e Silence comment (just like the others) 2012-04-15 12:31:07 +10:00
Mark Otto
fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto
d8acc062c1 Merge branch 'gruvii-patch-2' into 2.0.3-wip 2012-04-14 18:11:40 -07:00
Mark Otto
dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Mark Otto
8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Bryan Petty
5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto
0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto
28c4ed824e Merge branch 'alecrust-patch-3' into 2.0.3-wip 2012-04-07 23:38:16 -07:00
Mark Otto
1d30225e2c Merge branch 'jasny-patch-2' into 2.0.3-wip 
Conflicts:
	less/forms.less
 2012-04-07 16:43:48 -07:00
Mark Otto
0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Mark Otto
798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto
10ff5f16a6 fix #2968 manually: add consolas to monospace font stack 2012-04-07 14:25:58 -07:00
Bryan Petty
4b81c0dff3 Changed .nav-collapse to clear both instead of left, and added compiled files. 2012-04-05 14:13:16 -06:00
Arnold Daniels
fedce0cec7 Allow multiple buttons in .input-prepend and .input-append. 
This has a look similar to button groups.
 2012-04-05 23:08:32 +03:00
Alec Rust
ff57f59562 Corrected spacing 2012-04-03 12:15:36 +02:00
Mark Otto
2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto
2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07:00
Bryan Petty
030265eaec Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. 2012-04-02 02:52:06 -06:00
Mark Otto
7bf4c8e76e Merge branch 'alecrust-patch-1' into 2.0.3-wip 2012-04-01 11:10:20 -07:00
Alec Rust
574592cba5 Corrected "resises" to "resides" 2012-04-01 17:25:43 +02:00
Mark Otto
647f1c98ed fix #2296: allow fluid thumbnails 2012-04-01 01:05:00 -07:00
Mark Otto
fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto
33fa705c7f fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width 2012-04-01 00:15:04 -07:00
Mark Otto
d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto
f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto
2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto
56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Mark Otto
37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Mark Otto
2f4810e72f Merge branch 'grantzau-patch-1' into 2.0.3-wip 2012-03-30 23:38:16 -07:00
Julius Graakjær Grantzau
6564afbe73 Renaming @gridColumnGutter to @gridGutterWidth 2012-03-29 14:56:53 +03:00
Mark Otto
2bbc9a1cb2 fix js links in css tests 2012-03-28 20:03:57 -07:00
Mark Otto
04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto
feccc6e705 Merge branch 'backface-visibility' of https://github.com/dannykeane/bootstrap into dannykeane-backface-visibility 2012-03-28 18:21:04 -07:00
Mark Otto
3308d1968f fix #2846: Firefox required two clicks on selects to get to options dropdown 2012-03-28 18:18:41 -07:00
Mark Otto
369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto
66743676ce moving css tests to less directory 2012-03-28 17:41:40 -07:00
Mark Otto
e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Danny Keane
2165ab2620 Added the back-face visibility css property to mixins.less, this property prevents the browser flickered experienced especially in Chrome when using 3D transformations. 2012-03-28 15:05:49 +01:00
Mark Otto
cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto
473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto
95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto
4c3e7690ba jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728 2012-03-25 14:46:47 -07:00
Mark Otto
cbd77d0aeb give IE7 inline-block behavior for input-prepend/append 2012-03-25 14:37:19 -07:00
Mark Otto
d0526e31fa remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius 2012-03-25 14:31:04 -07:00
Mark Otto
c0f28d81b0 Remove black border on buttons in IE7: 
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
 2012-03-25 14:28:24 -07:00
Jacob Thornton
a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1 add navbarheight support to .brand and .nav links in navbar 2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto
a7b8e52f8e Overhaul the responsive utility classes: 
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
 2012-03-25 01:12:51 -07:00
Mark Otto
1837b8ef2c remove height: auto on images since it interferes with inline dimensions 2012-03-25 00:20:30 -07:00
Mark Otto
223c8358ce Merge branch 'andreasbovens-master' into 2.0.3-wip 2012-03-25 00:07:09 -07:00
Andreas Bovens
de0aaff433 Added -o- and -ms- prefixes to animations CSS 
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
 2012-03-24 18:53:27 +01:00
Mark Otto
f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
 2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Bart Teeuwisse
035b85eeba The native box-shadow, background-clip and background-size instructions all take 1 or more arguments. In 1.3.0 LESS became arity aware, see https://gist.github.com/1933613. As a result the signatures of these mixins had to change a little. 2012-03-23 12:37:40 -07:00
Mark Otto
0b41984920 Fix #2758: Uneditable inputs in input-prepend/append 
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
 2012-03-23 09:47:57 -07:00
Mark Otto
de7aee2465 fix broken tables with double borders and such, add css tests page to start with table edge cases 2012-03-23 01:28:04 -07:00
Mark Otto
f330de0b5c add comment for append/prepend z-indexing 2012-03-23 00:51:31 -07:00
Mark Otto
281e058ef2 fix #2613: labels hang too low 2012-03-23 00:40:10 -07:00
Mark Otto
ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto
2729d15742 fix #2625 manually: account for dropup caret on large button 2012-03-23 00:37:15 -07:00
Mark Otto
81f31d95c8 Merge branch 'patch-1' of https://github.com/sirlantis/bootstrap into sirlantis-patch-1 2012-03-23 00:28:25 -07:00
Mark Otto
c4fb703269 fix left and right tab-content alignment with width: auto; 2012-03-22 23:38:50 -07:00
Mark Otto
ac64d9405b Dropdowns overhaul: 
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
 2012-03-22 23:09:31 -07:00
Mark Otto
50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto
20da2c8ea0 add the broken out responsive files 2012-03-22 21:54:54 -07:00
Mark Otto
ab068f6fda bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization 2012-03-22 21:33:06 -07:00
Mark Otto
1852d077bf add shell of tests page, lighten form actions background and give it a variable 2012-03-22 21:08:41 -07:00
Mark Otto
edca6f28f0 fix #2718, misaligned uneditable inputs in prepends/appends 2012-03-22 17:41:20 -07:00
Mark Otto
b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto
ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Otto
e0c85fb69c use new font-stack mixins in base and alt font family mixins 2012-03-22 17:18:07 -07:00
Mark Otto
78e37e7d21 Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables 2012-03-22 17:13:58 -07:00
Mark Otto
b59cb505f8 Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-22 17:12:22 -07:00
Mark Otto
d7af2714c6 remove separate badges and labels, add single file instead, remove hover from non-link badges/labels 2012-03-22 16:02:00 -07:00
Mark Figueredo
d115d169b7 Added offset parameter to .makeColumn. 2012-03-19 14:58:55 -03:00
ctalkington
bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
ctalkington
51f37cbb81 make font family mixins customizable with variables. 2012-03-15 13:34:50 -05:00
Marcel Jackwerth
1a1cab2d06 Invert progress-bar-stripes direction 2012-03-15 18:11:17 +01:00
Jacob Thornton
8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Jacob Thornton
59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton
664a838cd6 remove test file 2012-03-12 13:56:50 -07:00
Jacob Thornton
6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Jacob Thornton
cd89c34d99 can't have overflo: visible for "in" which is present during entirity of transition. 2012-03-12 13:31:38 -07:00
Mark Otto
7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -07:00
Mark Otto
e12c66aabe adding border variable for dropdowns, making dropdown carets use dropdown vars 2012-03-12 09:57:10 -07:00
Mark Otto
685039d608 add a super jank fix for horizontal-forms and .input-prepend/append in IE7 2012-03-12 00:16:01 -07:00
Mark Otto
c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -07:00
Mark Otto
7c2ed0c095 resolve #1972, allowing add-ons at beginning and end of input-prepend/append 2012-03-11 23:21:38 -07:00
Mark Otto
5eed370856 fix more spacing issues with input append/prepend 2012-03-11 23:14:36 -07:00
Mark Otto
58cb7c631d simplify code for input-prepend/append in inline and search forms 2012-03-11 23:12:45 -07:00
Mark Otto
91eef351e4 remove need for floats and IE hacks for input-prepend and input-append--boom 2012-03-11 22:58:14 -07:00
Mark Otto
0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto
0090fa1a6e fix overflow on .collapse.in to enable dropdowns within an open collapse 2012-03-11 22:43:35 -07:00
Mark Otto
ac7f571e53 enable button groups in modal-footer by removing 5px added margin between .btn 2012-03-11 22:28:37 -07:00
Mark Otto
1a11c526b9 Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip 2012-03-11 22:25:34 -07:00
Mark Otto
5a28bd1e78 fix vertical align issue with labels in IE9 2012-03-11 21:44:00 -07:00
Mark Otto
ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto
67714d8347 remove the unused text-indent on dropdown carets 2012-03-11 20:38:17 -07:00
Mark Otto
0f23883283 fix broken dropdowns in ie7 per #2333 2012-03-11 20:16:39 -07:00
Mark Otto
2e52946fd3 fix lingering tables bug 2012-03-11 20:03:55 -07:00
Mark Otto
4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07:00
Mark Otto
7154e378b2 use variable for navbar text line-height 2012-03-11 17:53:17 -07:00
Mark Otto
8fd126ba1b updated apple touch icons and moved input responsive fix from <480 to <767 2012-03-11 17:28:28 -07:00
Mark Otto
ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Mark Otto
ffbed0980c Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip 2012-03-11 13:48:30 -07:00
Mark Otto
635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto
5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto
1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto
67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto
f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton
1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
 2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
 2012-03-10 12:41:41 -08:00
Mark Otto
5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00
Mark Otto
305374ab1a clear up nav variables 2012-03-10 11:23:05 -08:00
Milos Gavrilovic
3ff78d138a Add vertical-align: middle; to img elements 
More info: h5bp.com/i/440
 2012-03-09 14:52:50 +01:00
Luke Thomas
1cc1852a9a added ability to set custom colors for popover arrow mixin 2012-03-08 19:02:29 -06:00
Mark Otto
a613a8ebd0 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 2012-03-06 21:16:57 -08:00
Mark Otto
69e4522a4e set font-family for inputs and such via basefontfamily 2012-03-06 21:13:29 -08:00
Mark Otto
6b9f70797d adding well sizes 2012-03-06 21:12:43 -08:00
Mark Figueredo
03bdf82ca2 Added use of new headings variables. 2012-03-06 16:45:43 -05:00
Mark Otto
738fac18de move padding from container to body for max-width: 767; responsive layout 2012-03-05 23:50:03 -08:00
Mark Otto
492ccedcab Merge branch 'davewasmer-master' into 2.0.2-wip 2012-03-05 23:07:54 -08:00
Mark Otto
79090ac121 fix input grid sizing, fix background color on form actions and append add-ons 2012-03-05 23:06:27 -08:00
Mark Otto
bcd9294cc4 clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green) 2012-03-05 23:00:37 -08:00
Mark Otto
d98a2e9234 adding table variables 2012-03-05 22:47:39 -08:00
Mark Otto
ac6eff280d Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip 
Conflicts:
	less/dropdowns.less
 2012-03-05 20:49:39 -08:00
Mark Otto
9c2b2c589d fix comment on bottom-up, should be dropup 2012-03-05 20:20:42 -08:00
Mark Otto
20b10b5d66 change dropdown hover/active color back to link color 2012-03-05 20:15:35 -08:00
Mark Otto
eaf464a2c5 increase specifity of .pills li.active for dropdowns 2012-03-05 20:14:54 -08:00
Mark Otto
cb9234ba46 fix warning button issue per #2392 and add warning buttons to components 2012-03-05 00:47:13 -08:00
Mark Otto
7a8d6b1976 clean up horizontal dl option and docs 2012-03-05 00:42:37 -08:00
Mark Otto
fb1d4a0f04 Merge pull request #2267 from dominicbarnes/dl_horizontal 
Horizontal mode for description lists
 2012-03-05 00:38:26 -08:00
Mark Otto
1fa42e2f71 fix ie7 breadcrumbs per #2224 2012-03-05 00:36:57 -08:00
Mark Otto
a95c15a530 utilize new dropdown variables 2012-03-05 00:32:02 -08:00
Mark Otto
d3e922f0c8 add a ton new variables for type, buttons, inputs 2012-03-05 00:29:16 -08:00
Jacob Thornton
29c63fdb6a true > child + varargs 2012-03-04 14:27:13 -08:00
Jacob Thornton
3524aa909c make sure to pass child var through 2012-03-04 14:21:54 -08:00
Jacob Thornton
2f598e35a0 when > 0 rather than when not 0 2012-03-04 14:11:51 -08:00
Jacob Thornton
1aeca545c8 new approach to grid with recursive mixins :D 2012-03-04 14:06:30 -08:00
Simon Charette
efd5e29ff4 Fixed small button caret and moved less code to dropdowns 2012-03-04 15:49:55 -05:00
Dave Wasmer
ff8b997a1f Added disabled styles to pager 2012-02-28 18:39:35 -05:00
Jonathan Camile
a397130669 Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar 2012-02-28 11:06:05 +01:00
Mark Otto
fbebb046f7 fix navbar container for default 940px grid per #2194 2012-02-27 22:34:25 -08:00
Mark Otto
9ee77f2c11 set line-height for labels to prevent change in height when floated per #2222 2012-02-27 21:50:54 -08:00
Mark Otto
a7b96b3e59 set list-style to none for breadcrumbs to resolve cross browser issues per #2224 2012-02-27 21:32:48 -08:00
Dominic Barnes
0b78033f0b removing a few of the size classes, changing up the documentation 2012-02-27 23:21:25 -06:00
Mark Otto
7525aac830 make .input-prepend/append .add-on text color the same as labels, #333, to close out #2276 2012-02-27 19:44:16 -08:00
Mark Otto
af8261af93 simplify selector for .modal-form per #2218 2012-02-27 19:09:44 -08:00
Jacob Thornton
8615987243 add guard for child spans 2012-02-27 18:21:21 -08:00
Jacob Thornton
ae3382d797 working through new grid implementation... 2012-02-27 18:15:59 -08:00
Dominic Barnes
0a8efd5320 Adding a 'horizontal' option to description lists, similar to .form-horizontal 2012-02-25 21:21:05 -06:00
Jonathan Camile
1562a8a010 Progress bars: Added warning (orange) bar 2012-02-24 11:37:26 +01:00
Mark Otto
0e8427e7b1 update modal footers to use text-align instead of float on buttons for alignment 2012-02-22 22:38:54 -08:00
Mark Otto
0ed6d3b28e Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip 2012-02-22 11:15:53 -08:00
Mark Otto
6f3b4b857f Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions 2012-02-22 11:15:44 -08:00
Mark Otto
a0ec422444 fix #1954: icons in tabs add jank border 2012-02-22 08:36:07 -08:00
Mark Otto
b86969f762 restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080 2012-02-22 08:21:29 -08:00
Mark Otto
4410ede8ed Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-22 08:12:51 -08:00
Mark Otto
92a54a7b72 tighten padding on labels and badges given default line-height 2012-02-22 08:12:25 -08:00
Jacob Thornton
f3b6cf1d6d Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/mixins.less
 2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2 rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it. 2012-02-21 23:16:06 -08:00
Mark Otto
a139167489 set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins) 2012-02-21 23:15:43 -08:00
Mark Otto
9b524a16e9 clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918 2012-02-21 23:00:02 -08:00
Mark Otto
8bd67bb124 clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups 2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2 Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/navbar.less
 2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5 add support and docs for .navbar-fixed-bottom 2012-02-21 21:12:16 -08:00
Mark Otto
e3ae517555 move container up in default grid mixin 2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50 move table columns mixin to mixins.less 2012-02-21 15:18:05 -08:00
Mark Otto
575072b74b Merge pull request #2143 from inmarelibero/2.0.2-wip 
Add columns 13-24 for grid systems to enable customization up to 24 cols
 2012-02-21 15:15:56 -08:00
Mark Otto
664a5c4438 update forms help-block 2012-02-21 13:43:13 -08:00
Emanuele Gaspari
1cfb3fd03a substituted hard-coded number of columns (12) with @gridColumns 2012-02-21 19:19:15 +01:00
Emanuele Gaspari
45cec4a6fa added .span[13-24] and .offset[12-23] to support up to 24-columns layout 2012-02-21 19:07:55 +01:00
Mark Otto
d908731566 Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-21 09:05:04 -08:00
Mark Otto
187b3bd4bd Merge pull request #2129 from andriijas/2.0.2-wip-navtabs 
Width fix on .tab-content
 2012-02-21 09:00:10 -08:00
Mark Otto
a78faee589 Merge pull request #2138 from laczoka/2.0.2-wip 
Fix for #2137, adding select to input append/prepend
 2012-02-21 08:29:08 -08:00
Mark Otto
f3ad4c7183 adding responsive utility classes and matching docs section with super neato table and test 2012-02-21 08:24:18 -08:00
Laszlo Toeroek
e423fc2629 .input-append should work for select element, fixes #2137 2012-02-21 16:32:57 +01:00
Andreas Cederström
f50b2c9b92 100% width on .tab-content 2012-02-21 09:20:46 +01:00
Andreas Cederström
dfd0326186 Bring back nowrap to labels and badges 2012-02-21 08:17:16 +01:00
Mark Otto
06d4756114 adding basic badges support 2012-02-20 21:20:06 -08:00
Mark Otto
d2630ff84e introduce new mixin to do navbar vertical centering 2012-02-20 19:14:26 -08:00
Mark Otto
143b3db2c9 update inline forms to resolve checkbox label with space in it and overlapping content, per #1969 2012-02-20 18:56:05 -08:00
Mark Otto
331c85724a remove max-width on img from reset and put in docs only, per #1552 2012-02-20 16:18:13 -08:00
Mark Otto
9c74f21966 fix overflow issue on tabbed content per #2079 2012-02-20 16:06:42 -08:00
Mark Otto
2b8fc018ba Merge branch 'billyvg-main' into 2.0.2-wip 2012-02-20 13:36:56 -08:00
Billy Vong
e18a35784a Update old button selectors 'small' and 'large' to be 'btn-small' and 'btn-large' 2012-02-20 13:16:49 -08:00
Mark Otto
7ef7547a14 add horizontal divider support to nav list, including documentation for it, per #2106 2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75 enable use of span in place of a for .disabled in pagination, per #1406 2012-02-19 23:51:59 -08:00
Mark Otto
9b09d1de86 move overflow and max-height on modal to modal-body instead 2012-02-19 21:55:09 -08:00
Mark Otto
8247cb3362 add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles 2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16 Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49 Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1 Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2 Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:59:42 -08:00
Mark Otto
adbbf17ee4 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0 simplify text color in navbar by placing the color on global .navbar component 2012-02-19 14:53:07 -08:00
Jacob Rask
e145619f6d Remove underscore hack for IE6 
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
 2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6 Separate span12 and container classes 
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.

Also remove duplicate container width property.
 2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631 Add Opera-prefixed radial gradient 
Tested and works in Opera 11.61
 2012-02-19 21:42:12 +01:00
Jacob Rask
51ec513b5c Use inherit on alert-heading color 
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
 2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187 Add class for upper case abbreviations, aka initialisms 
Read more:
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667 Only show help cursor/border for abbr with title 2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040 All abbreviations are not upper case initialisms 
Read more:
 * http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
 * http://en.wikipedia.org/wiki/Abbreviation
 * http://en.wikipedia.org/wiki/Initialism
 2012-02-19 21:21:44 +01:00
Mark Otto
ba97f56912 Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip 2012-02-18 20:08:11 -08:00
Mark Otto
bbb2fb3395 fix right aligned dropdowns 2012-02-18 20:06:38 -08:00
Geremia Taglialatela
2068b74ea8 Fixed a wrong behaviour when using collapse and dropdown in responsive layout 2012-02-18 13:08:49 +01:00