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

130 Commits

Author SHA1 Message Date
Mark Otto
ab20c921df Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 13:30:34 -08:00
Mark Otto
fe6d2f2e1d fix tabs-below typo 2012-01-28 13:30:15 -08:00
Jacob Thornton
b38a13ef98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 13:17:07 -08:00
Jacob Thornton
6935f693b3 typahead does case insensitive matching with simple sorter + accepts highlighter option 2012-01-28 13:16:05 -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
12d3c2fe74 fix z-index issue with modals for popovers,tooltips,and dropdowns 2012-01-28 12:08:41 -08:00
Mark Otto
d65ce1b64c updated upgrading page 2012-01-28 01:34:07 -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
edee985b96 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53 modal refinements in docs and general responsiveness 2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0 remove quick start section to simplify landing page + start rewriting application js to work ie7 2012-01-28 00:36:37 -08:00
Mark Otto
18d95a163b remove fixed width from labels table 2012-01-28 00:34:54 -08:00
Mark Otto
873be0e4f2 drop span2-4 on form examples to 1-3 2012-01-28 00:25:54 -08:00
Mark Otto
d448e6921e rewrite the code section of the type docs 2012-01-28 00:23:30 -08:00
Mark Otto
08fea7587c call attention to notices in js docs more 2012-01-27 23:27:33 -08:00
Mark Otto
1d44f37fc9 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-27 22:52:56 -08:00
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
0255f47eb3 add zindex option for tooltips/popovers and fix modal zindex doc example 2012-01-27 21:36:58 -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
7e72eb5063 new tab focus style and mixin 2012-01-27 18:33:25 -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
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
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
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
a0b40b361a i18n download page 2012-01-27 13:35:25 -08: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
7b31f4a334 Brings back uneditable input 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
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
Mark Otto
e44a7dd4ff buttons for toggle links in js docs, code example for offsetting in grid 2012-01-27 09:36:49 -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
aa594501bd change typeahead to data-source instead of data-data and add to docs 2012-01-26 23:16:02 -08:00
Jacob Thornton
ed64276e5b move doc building into base make method + build bootstrap to doc assets 2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b moving structure around + more work on builder... 2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 20:23:28 -08:00
Mark Otto
576ae2f561 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 19:10:32 -08:00
Mark Otto
a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Marco Wise
6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Jacob Thornton
12484a7471 more builder crap 2012-01-26 16:41:28 -08:00
Mark Otto
af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00