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
Dominik Tobschall
7609fd4dc6
fixed syntax error
2012-02-18 09:40:28 +01:00
Dominik Tobschall
f5bd4b3c8f
fixed typo (whitespace)
2012-02-18 09:40:18 +01:00
Mark Otto
1455bc9f8f
removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024
2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0
fix duplicate input prepend/append css selectors per #2026
2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1
swap last .btn-dark reference
2012-02-17 20:25:49 -08:00
Andreas Cederström
1e6d386b8d
Keep origin in track
2012-02-17 13:31:36 +01:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Mark Otto
091622644a
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE
2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f
change clearfix mixin to drop parens that prevent it from being a class, too
2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab
add mini buttons per #1971
2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64
fix buttons focus state and swap a buttons for button buttons
2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be
fix responsive media queries to use 979 and 980 where appropro
2012-02-16 21:08:52 -08:00
BigBlueHat - Web Manufacturer
18760393d7
Adding .clearfix() to .form-actions to allow for .pull-right button containers
2012-02-14 15:16:55 -05:00
Mark Otto
64ea59234f
change up fonts on form elements to remove unnecessary font-family on label element, per #1950
2012-02-13 08:18:19 -08:00
Andreas Cederström
60826077e7
Clean up inverse button using variables, adding button group examples. Also adding inverse inline label
2012-02-13 09:41:28 +01:00
Mark Otto
ce5976fb29
ensure help-block is block per #1937
2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591
clean up nav-header in responsive
2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3
adding makeRow and makeColumn mixins for generating more semantic layouts
2012-02-12 20:46:39 -08:00
Mark Otto
3e00c1261f
allow .input-prepend/.input-append to work in .navbar per #1681
2012-02-12 20:28:22 -08:00
Mark Otto
5fc62c5fcc
clear up scaffolding page to separate fixed from fluid grid systems
2012-02-12 16:59:29 -08:00
Mark Otto
163c98ea7e
clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin
2012-02-12 15:43:04 -08:00