0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-14 02:24:00 +01:00
Commit Graph

14108 Commits

Author SHA1 Message Date
Mark Otto
cb8606f2c8 adding wells and close icon to the docs under misc in components, with a new subnav style 2012-01-27 22:52:45 -08:00
Jacob Thornton
7cbb586825 move the matcher and sorter into the options - encourage people to override them... 2012-01-27 22:27:06 -08:00
Jacob Thornton
e726b231ba add toggle to docs for popover/tooltip 2012-01-27 21:59:06 -08:00
Jacob Thornton
1e07c066a5 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-27 21:37:59 -08:00
Jacob Thornton
0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -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
a624ac1edf Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons 2012-01-27 19:12:09 -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
Burak Tuyan
a2a10ae421 Adding new examples to the icons' docs.
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
2012-01-28 02:13:53 +02:00
Mark Otto
800d0b24e0 remove page-header from docs and add to type.less 2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd update examples and restore icons 2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553 add missing paren 2012-01-27 14:44:05 -08:00
Jacob Thornton
8a2124faff only build mustache files 2012-01-27 14:43:41 -08:00
Mark Otto
003da1e089 fix inputs in navbar 2012-01-27 14:21:17 -08:00
Mark Otto
6353e5070a remove unused images from docs assets 2012-01-27 14:03:36 -08:00
Mark Otto
3807a88ee9 update the docs for icons 2012-01-27 13:56:50 -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
Mark Otto
335a8686da Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6 Rebuild css and html 2012-01-27 16:39:38 -05:00
Pete Hopkins
1c9db106fa Moves buttonBackground to mixins (issue 1292) 2012-01-27 16:39:27 -05:00
Mark Otto
b1f38bbea8 update icon examples to show icons in differently sized buttons 2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0 rebuil update layout 2012-01-27 13:36:31 -08: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
Mark Otto
a0b40b361a i18n download page 2012-01-27 13:35:25 -08:00
Pete Hopkins
faa719d59c Fixes left/right border overlap for IE7 2012-01-27 16:35:21 -05:00
Mark Otto
ccd963e622 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
2012-01-27 13:21:01 -08: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
7b31f4a334 Brings back uneditable input 2012-01-27 16:09:58 -05:00
Pete Hopkins
70d95b1bd7 Moves IE7-specific button padding to only apply to form controls 2012-01-27 16:09:58 -05:00
Jacob Thornton
3b3dbd7229 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00