clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,575 Commits 116 Branches 89 Tags 628 MiB
dbea3e2784
Commit Graph

548 Commits

Author SHA1 Message Date
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
Mark Otto
a57dbada0f change classname from .btn-dark to .btn-inverse, change use text 2012-02-12 15:18:20 -08:00
Mark Otto
b8493ed8b7 Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip 2012-02-12 15:14:27 -08:00
Mark Otto
0ff88f2db3 enable the use of .nav-header in dropdowns per #1827 2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a add navbar background hover variable and fix uneditable-input with append/prepend controls 2012-02-12 14:01:58 -08:00
Mark Otto
24df7f1e1d update ff comment in buttons 2012-02-12 13:20:08 -08:00
Mark Otto
b9d5ceb14b edit comment on IE7-8 support of :focus in navbar-search 2012-02-12 11:17:46 -08:00
Mark Otto
a2bc22bad5 standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover 2012-02-12 11:14:13 -08:00
Mark Otto
b327420e52 update comment to reflect ie support 2012-02-11 20:58:10 -08:00
Mark Otto
158419c045 reset line-height for file input in ie9 2012-02-11 20:00:44 -08:00
Mark Otto
5bb55e4615 change fixed height on responsive textareas to min-height 2012-02-11 19:21:23 -08:00
Mark Otto
5b22cf5cc3 fix tabs content wrapping per #1620 2012-02-11 17:27:08 -08:00
Mark Otto
5a3dfb72bf support small for legend per #1544 2012-02-11 16:50:57 -08:00
Mark Otto
4ddc8fd0e4 remove color on :active of buttons 2012-02-11 16:43:53 -08:00
Mark Otto
8f1db4321a fix inline form checkbox/radios 2012-02-11 00:24:06 -08:00
Mark Otto
855dcd3f56 Merge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0.1-wip 2012-02-11 00:10:58 -08:00
Mark Otto
722c75d1b1 update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first 2012-02-11 00:07:05 -08:00
Mark Otto
89205d9db4 manually address #1895 2012-02-10 23:59:00 -08:00
Mark Otto
d7aefe67e3 scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag 2012-02-10 23:07:32 -08:00
Mark Otto
c10661cf5d Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip 2012-02-09 23:20:05 -08:00
Simon
d9eff8efc1 Added the carret of the button 2012-02-10 00:31:40 +01:00
Simon
451a642ae8 Added a black/dark button 2012-02-09 23:08:14 +01:00
Jeremy Martin
920d995843 webkit legend margin fix for non-horizontal forms 2012-02-09 15:27:42 -05:00
Henrik N
25bf0af249 Add ol.unstyled 2012-02-07 19:29:45 +01:00
Mark Otto
adff17ac03 fix for #1779, use line-height var 2012-02-07 00:16:05 -08:00
Mark Otto
2d9b3c45d3 move formfieldstate mixin to mixins.less for #1785 2012-02-07 00:13:52 -08:00
Mark Otto
b5f1d2f3a4 rearrange order of 3d and skew mixins: 2012-02-06 23:48:48 -08:00
Mark Otto
6840d8f776 Merge branch 'tobaco-master' into 2.0.1-wip 2012-02-06 23:48:16 -08:00
Mark Otto
63fd119c6e Merge branch 'et-fix_long_breadcrumbs' into 2.0.1-wip 2012-02-06 23:42:45 -08:00
Mark Otto
1a97cce19b manual patch of #1449 to make thumbnails use grid vars 2012-02-06 23:39:22 -08:00
Mark Otto
575b82473f rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query 2012-02-06 23:34:03 -08:00
Torsten Baldes
9ba9185afc Removed double declaration of Skew 
+ added translate3d to mixins.less
 2012-02-06 09:59:23 +01:00
Mark Otto
85e401a656 add label hover style for ability to make it a link 2012-02-05 02:36:21 -08:00
Mark Otto
f9847b300b Merge branch 'jarijokinen-master' into 2.0.1-wip 2012-02-05 02:33:35 -08:00
Mark Otto
f8db6a3b53 Merge branch 'master' of https://github.com/jarijokinen/bootstrap into jarijokinen-master 2012-02-05 02:33:30 -08:00
Mark Otto
546332d85d resolve #1602 and add table hover style 2012-02-05 02:28:42 -08:00
Mark Otto
59b32586af close #1628 to add padding to all inline checkboxes/radios 2012-02-05 02:16:46 -08:00
Mark Otto
91475c865d fix #1631 by adding focus to radio buttons 2012-02-05 02:14:25 -08:00
Mark Otto
4a09cf04d8 clean up labels per #1656 2012-02-05 02:01:28 -08:00
Mark Otto
53da88e561 add mixin for text-overflow 2012-02-05 01:49:36 -08:00
Mark Otto
35fdddbc4f correct css selector for .control-label, required in the docs but not in the CSS files 2012-02-04 22:55:47 -08:00
Mark Otto
87a8c9b677 #1707: remove rgba() background override on navbar active items for customization 2012-02-04 22:40:50 -08:00
Mark Otto
468688638d #1715: strip code of styles when in a pre 2012-02-04 22:23:20 -08:00
Mark Otto
7e81f84b29 buttons and icons updated for improved placement and variable support for icon paths 2012-02-04 22:22:19 -08:00
Mark Otto
81d1f3b96e remove max-width on dropdown menus 2012-02-04 18:52:25 -08:00
Mark Otto
ac98cee609 allow alternate form layouts to hide inputs with .hide on them 2012-02-04 18:26:04 -08:00
Eric Thomas
ced08f6935 Wrap long breadcrumb trails 2012-02-02 11:02:14 -08:00
Mark Otto
4c237e688b Merge branch 'zhongwei99-master' into 2.0.1-wip 2012-02-02 09:34:37 -08:00
zhongwei99
4158701894 Minor typo fix. 2012-02-02 18:01:16 +08:00
Mark Otto
8dd2b3d3f8 follow up to #1501 to update notes in sprites.less 2012-02-01 23:10:37 -08:00
Mark Otto
4211f21e39 #1571: remove fixed width on file inputs 2012-02-01 22:27:11 -08:00
Mark Otto
8a1769c9e2 fix missing ; in buttons.less 2012-02-01 18:18:39 -08:00
Mark Otto
3a2f0765bf fix hover state on .nav-list for active links 2012-02-01 17:54:21 -08:00
Mark Otto
5c1527abc5 remove unused css files and add scaffolding and hero-unit to the builder 2012-02-01 17:06:40 -08:00
Mark Otto
9b9e1d309b fix that jank hack 2012-02-01 16:44:07 -08:00
Jari Jokinen
a486a6f20b Allow labels to be links 2012-02-01 12:59:38 +02:00
Mark Otto
cfc1c8a8cd clean up responsive media queries and docs css 2012-01-31 13:16:11 -08:00
Mark Otto
b7713b83fa chance icon class 2012-01-31 00:11:19 -08:00
Mark Otto
4d93b63916 disable cursor on disabled and active pagination links 2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2 once more, overhaul the icons and use the css regex selector on our icons 2012-01-30 23:24:35 -08:00
Mark Otto
5c9a687665 fix button styles on active and disabled 2012-01-30 23:16:27 -08:00
Mark Otto
1cff29c33f restore a few commented out responsive items 2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa update icons everywhere to be scoped per other components, fix broken elements on js docs page 2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2 refactor the navs to use prefixed classes, because you know, consistency is beast mode 2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d *really* refactor the buttons and update them all over the docs 2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe refactor buttons.less 2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6 speed up topbar animation for responsive 2012-01-30 13:59:05 -08:00
Mark Otto
e94e0f1cf9 implement @textColor for body text 2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac large carousel images and margin bottom added 2012-01-30 09:19:25 -08:00
Mark Otto
3722c34b50 account for floated inputs in the .navbar-form 2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc adding warning (orange) button, fix responsive navbar problem 2012-01-30 08:15:28 -08:00
Mark Otto
2c8ca4f5e2 add skew mixin 2012-01-30 07:54:47 -08:00
Mark Otto
9ba70796e2 remove top 5px padding from first inline radio/checkbox 2012-01-30 07:40:24 -08:00
Mark Otto
f4e5bc1c53 namespace popover values 2012-01-30 01:20:51 -08:00
Mark Otto
8f448610a9 rename vertical-divider to divider-vertical, add more space around the divider 2012-01-30 01:09:34 -08:00
Mark Otto
0f088af855 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
	less/responsive.less
 2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts 2012-01-30 00:39:44 -08:00
Jacob Thornton
0de951f4f4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1 add license for responsive and rebuild 2012-01-29 19:04:26 -08:00
Mark Otto
fda77e69eb move vars and mixins for default grid back to appropriate files 2012-01-29 16:58:51 -08:00
Mark Otto
702d3b6dfe fix broken navbar collapse 2012-01-29 16:35:55 -08:00
Burak Tuyan
97b3057824 Extending the dropup support to tabs and pills 
This was needed to match the color of the carets that are used for tabs and pills
 2012-01-30 01:13:21 +02:00
Burak Tuyan
918a17a30b Adding dropup support to split buttons and navbar 
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
 2012-01-30 00:50:47 +02:00
Mark Otto
9e7f5025b4 update collapsible nav in navbar 2012-01-29 14:07:58 -08:00
Mark Otto
278858e706 fix form styles on prepend/append for consistency, update code docs with examples of the code snippets 2012-01-29 13:25:13 -08:00
Mark Otto
9fa8bde44d fix animated/striped gradients in progress bars 2012-01-29 13:15:38 -08:00
Mark Otto
4e5b0e185e refined pager styles to give a border on the links and improved hover state 2012-01-29 13:12:13 -08:00
Mark Otto
48529ad01f last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now 2012-01-29 13:06:57 -08:00
Mark Otto
7bf2767452 remove form docs from the styles and markup, it's no longer needed 2012-01-29 00:07:01 -08:00
Mark Otto
bca269299b removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section 2012-01-28 23:40:52 -08:00
Mark Otto
62f4a1571a revamped the thumbnails examples to make them work and look better at higher resolution 2012-01-28 22:48:25 -08:00
Mark Otto
487dbfdda4 namespace progress bars and labels classes 2012-01-28 22:14:51 -08:00
Mark Otto
59d9983ebc updates to responsive and docs for responsive navbar 2012-01-28 22:03:14 -08:00
Mark Otto
f1e520badd clarify and tweak media queries 2012-01-28 20:34:07 -08:00
Mark Otto
cf1b46bda4 fix alert close position 2012-01-28 18:46:41 -08:00
Mark Otto
e532228721 more responsive tweaks for tablet 2012-01-28 18:25:05 -08:00
Mark Otto
4fa931e403 fix the navbar click and a few jank responsive problems 2012-01-28 18:11:31 -08:00
Mark Otto
06df91ac55 remove background from accordion, and use border instead 2012-01-28 16:48:03 -08:00
Mark Otto
475b985a0e remove padding from first-child of inline radios/checkboxes 2012-01-28 16:37:43 -08:00
Jacob Thornton
b8a683d7f2 turn off brand hover for now + get nav toggling in mobile 2012-01-28 15:42:07 -08:00
Jacob Thornton
ea1c21d62d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 15:15:38 -08:00
Jacob Thornton
6493cd22c0 blah 2012-01-28 15:14:57 -08:00
Mark Otto
23e076c1bb add in a navbar button for toggling the nav items 2012-01-28 15:09:23 -08:00
Mark Otto
7843a665fd vertical align inline checkboxes/radios to improve rendering in topbar 2012-01-28 14:50:56 -08:00
Mark Otto
9db4f2a344 change .span* inputs to use content-sizing: border-box; to make them behave as block level elements 2012-01-28 14:30:45 -08:00
Mark Otto
d96c0c781d comment for progress bars firefox keyframes 2012-01-28 14:20:27 -08:00
Mark Otto
1a22c3b30a restore IE filters, but reset them on buttons 2012-01-28 13:13:01 -08:00
Mark Otto
296d06a285 add checkbox/radio border for ios in responsive 2012-01-28 13:07:01 -08:00
Mark Otto
70c6a6cd85 fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices 2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864 reset border-radius only for ie9? 2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce darken buttons, uncomment out firefox keyframes from progress bars 2012-01-28 12:43:19 -08:00
Jacob Thornton
f768242759 add trailing ; 2012-01-28 12:14:41 -08:00
Jacob Thornton
e1a1fdd35d Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Mark Otto
39f70afed9 update mixins to fix radial gradient 2012-01-28 12:03:26 -08:00
Mark Otto
f1dc214977 increase padding on modal-header after decreasing h3 line-height 2012-01-28 11:24:34 -08:00
Mark Otto
28ba9d69c8 nav, buttons, and docs updates to account for outline: 0; on :active 2012-01-28 11:21:39 -08:00
Mark Otto
f1851ab133 change text on js docs page to improve rendering on iphone, update responsive for carousel considerations 2012-01-28 00:43:25 -08:00
Mark Otto
967030cb53 modal refinements in docs and general responsiveness 2012-01-28 00:39:22 -08:00
Mark Otto
342a99f1d0 block level page-header h1 small for readability on 480px and under 2012-01-28 00:29:38 -08:00
Mark Otto
ce69b70719 give append/prepend inputs higher z-index on focus 2012-01-27 23:53:56 -08:00
Mark Otto
7a756168b5 fix regression in textarea shadows 2012-01-27 22:56:48 -08:00
Mark Otto
ad78caa726 fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment 2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72 add clearfix to control-group for longer labels and any other unforeseen circumstances 2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4 rgba text color on active buttons for a bit more contrast from their non-active siblings 2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f simplify build process more - remove really annoying date. 2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d update progress bars to have a solid edge until 100% filled 2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7 use quotes on attr selectors more consistently 2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918 icon spacing in small buttons and nav lists 2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4 fixing up buttons and examples of implementing icons 2012-01-27 19:49:56 -08:00
Mark Otto
7fc6e12b79 comment icons that are 1px off 2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e combined .disabled and [disabled] and confirmed in ie7/8 2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9 clean up use of mixins to highlight them appropriately in your fav editor 2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components 
Conflicts:
	docs/assets/css/bootstrap.css
 2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963 overhaul navbar behavior in responsive css 2012-01-27 16:26:55 -08:00
Mark Otto
800d0b24e0 remove page-header from docs and add to type.less 2012-01-27 15:28:09 -08:00
Mark Otto
003da1e089 fix inputs in navbar 2012-01-27 14:21:17 -08:00
Mark Otto
8da1c176ec Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip 2012-01-27 13:43:51 -08:00
Pete Hopkins
1c9db106fa Moves buttonBackground to mixins (issue 1292) 2012-01-27 16:39:27 -05:00
Mark Otto
d7b8a9c930 align text in buttons so folks can easily make them different widths 2012-01-27 13:36:08 -08:00
Pete Hopkins
a1fc352cc2 Changes non-transparent navbar search box color to match transparent one better 2012-01-27 16:35:40 -05:00
Pete Hopkins
faa719d59c Fixes left/right border overlap for IE7 2012-01-27 16:35:21 -05:00
Mark Otto
e8647c1b11 huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff 2012-01-27 13:20:02 -08:00
Pete Hopkins
8328987b15 IE7 fixes for split buttons and dropdowns 2012-01-27 16:10:40 -05:00
Pete Hopkins
347a15b69a Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes 2012-01-27 16:10:40 -05:00
Pete Hopkins
43f1a42f7f Adds necessary ie7-inline-block macros 2012-01-27 16:10:34 -05:00
Pete Hopkins
70d95b1bd7 Moves IE7-specific button padding to only apply to form controls 2012-01-27 16:09:58 -05:00
Burak Tuyan
16a28d881c Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 20:48:37 +02:00
Pete Hopkins
526d388393 Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element 2012-01-27 12:16:17 -05:00
Pete Hopkins
841e386daf Fixes up internal and external spacing for IE7 buttons 2012-01-27 12:08:56 -05:00
Pete Hopkins
6075b5dee6 Collapses borders for IE7, which doesn't respect border-spacing 2012-01-27 12:08:56 -05:00
Mark Otto
9d0328ff00 adding outline callout as a fallback for IE--needs testing though, thought I already added this 2012-01-27 08:21:39 -08:00
Burak Tuyan
942d1b4595 Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like: 
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
 2012-01-27 16:33:18 +02:00
Jacob Thornton
815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -08:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Jacob Thornton
96c3e70996 cleanup old stuff 2011-05-03 18:12:43 -07:00
Mark Otto
a6d5f6743f Changing up boostrap for better grid variable management and grid structuring 2011-05-03 17:35:08 -07:00
Mark Otto
bb8ebe2312 More subtle grid pattern, adding dropdown arrow, adding dropdown arrow styles to the topbar 2011-04-29 11:40:24 -07:00
Mark Otto
d61317d7b5 Added main topbar and shit. 2011-04-28 17:24:59 -07:00
Mark Otto
eb3389303d Added in mini layout docs; cleaned up layout markup and added the css for it; 2011-04-28 11:46:32 -07:00
Mark Otto
0824ed4e33 Updated docs styles for footer; updated readme; 2011-04-27 23:05:19 -07:00
Mark Otto
b95e99a173 Updated documentation; added stacked forms; cleaned up spacing; moved all ids to the section element instead of the page header to fix spacing with bookmarked links; 2011-04-27 23:00:33 -07:00
Mark Otto
b9d6acf766 More documentation and content changes 2011-04-27 15:40:12 -07:00
Mark Otto
677b5554f3 Remove the unnecessary global.js file, remove the old baseline grid image, add in hashgrid, update readme to remove finished todos; 2011-04-27 14:49:56 -07:00
Mark Otto
eb81782cdb Porting over all Blueprint styles to new Baseline repo 2011-04-27 13:53:51 -07:00