]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
13 years agono debugger 1339/head
Jon Stevens [Sat, 28 Jan 2012 10:25:13 +0000 (02:25 -0800)] 
no debugger

13 years agoremove js for table sorts
Jacob Thornton [Sat, 28 Jan 2012 09:48:45 +0000 (01:48 -0800)] 
remove js for table sorts

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 09:35:36 +0000 (01:35 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoall unit tests passing in ie7
Jacob Thornton [Sat, 28 Jan 2012 09:35:13 +0000 (01:35 -0800)] 
all unit tests passing in ie7

13 years agoupdated upgrading page
Mark Otto [Sat, 28 Jan 2012 09:34:07 +0000 (01:34 -0800)] 
updated upgrading page

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:46:21 +0000 (00:46 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoclean up application js a bit
Jacob Thornton [Sat, 28 Jan 2012 08:46:04 +0000 (00:46 -0800)] 
clean up application js a bit

13 years agochange text on js docs page to improve rendering on iphone, update responsive for...
Mark Otto [Sat, 28 Jan 2012 08:43:25 +0000 (00:43 -0800)] 
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 08:39:34 +0000 (00:39 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agomodal refinements in docs and general responsiveness
Mark Otto [Sat, 28 Jan 2012 08:39:22 +0000 (00:39 -0800)] 
modal refinements in docs and general responsiveness

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:37:12 +0000 (00:37 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoremove quick start section to simplify landing page + start rewriting application...
Jacob Thornton [Sat, 28 Jan 2012 08:36:37 +0000 (00:36 -0800)] 
remove quick start section to simplify landing page + start rewriting application js to work ie7

13 years agoremove fixed width from labels table
Mark Otto [Sat, 28 Jan 2012 08:34:54 +0000 (00:34 -0800)] 
remove fixed width from labels table

13 years agoextend block level smalls to h2s in docs
Mark Otto [Sat, 28 Jan 2012 08:31:55 +0000 (00:31 -0800)] 
extend block level smalls to h2s in docs

13 years agoblock level page-header h1 small for readability on 480px and under
Mark Otto [Sat, 28 Jan 2012 08:29:38 +0000 (00:29 -0800)] 
block level page-header h1 small for readability on 480px and under

13 years agoscope subnav link styles to first child, and no dropdowns
Mark Otto [Sat, 28 Jan 2012 08:27:49 +0000 (00:27 -0800)] 
scope subnav link styles to first child, and no dropdowns

13 years agodrop span2-4 on form examples to 1-3
Mark Otto [Sat, 28 Jan 2012 08:25:54 +0000 (00:25 -0800)] 
drop span2-4 on form examples to 1-3

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 08:23:44 +0000 (00:23 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agorewrite the code section of the type docs
Mark Otto [Sat, 28 Jan 2012 08:23:30 +0000 (00:23 -0800)] 
rewrite the code section of the type docs

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 08:04:06 +0000 (00:04 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agofix failing typeahead tests
Jacob Thornton [Sat, 28 Jan 2012 08:03:26 +0000 (00:03 -0800)] 
fix failing typeahead tests

13 years agogive append/prepend inputs higher z-index on focus
Mark Otto [Sat, 28 Jan 2012 07:53:56 +0000 (23:53 -0800)] 
give append/prepend inputs higher z-index on focus

13 years agocall attention to notices in js docs more
Mark Otto [Sat, 28 Jan 2012 07:27:33 +0000 (23:27 -0800)] 
call attention to notices in js docs more

13 years agofix regression in textarea shadows
Mark Otto [Sat, 28 Jan 2012 06:56:48 +0000 (22:56 -0800)] 
fix regression in textarea shadows

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 06:52:56 +0000 (22:52 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoadding wells and close icon to the docs under misc in components, with a new subnav...
Mark Otto [Sat, 28 Jan 2012 06:52:45 +0000 (22:52 -0800)] 
adding wells and close icon to the docs under misc in components, with a new subnav style

13 years agomove the matcher and sorter into the options - encourage people to override them...
Jacob Thornton [Sat, 28 Jan 2012 06:27:06 +0000 (22:27 -0800)] 
move the matcher and sorter into the options - encourage people to override them...

13 years agoadd toggle to docs for popover/tooltip
Jacob Thornton [Sat, 28 Jan 2012 05:59:06 +0000 (21:59 -0800)] 
add toggle to docs for popover/tooltip

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Sat, 28 Jan 2012 05:37:59 +0000 (21:37 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agoadd zindex option for tooltips/popovers and fix modal zindex doc example
Jacob Thornton [Sat, 28 Jan 2012 05:36:58 +0000 (21:36 -0800)] 
add zindex option for tooltips/popovers and fix modal zindex doc example

13 years agofix right aligned dropdowns in navbar by adding left: auto; to nix default alignment
Mark Otto [Sat, 28 Jan 2012 05:25:35 +0000 (21:25 -0800)] 
fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment

13 years agoadd clearfix to control-group for longer labels and any other unforeseen circumstances
Mark Otto [Sat, 28 Jan 2012 05:20:58 +0000 (21:20 -0800)] 
add clearfix to control-group for longer labels and any other unforeseen circumstances

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Sat, 28 Jan 2012 05:09:24 +0000 (21:09 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agorgba text color on active buttons for a bit more contrast from their non-active siblings
Mark Otto [Sat, 28 Jan 2012 05:08:04 +0000 (21:08 -0800)] 
rgba text color on active buttons for a bit more contrast from their non-active siblings

13 years agosimplify build process more - remove really annoying date.
Jacob Thornton [Sat, 28 Jan 2012 05:06:09 +0000 (21:06 -0800)] 
simplify build process more - remove really annoying date.

13 years agoupdate progress bars to have a solid edge until 100% filled
Mark Otto [Sat, 28 Jan 2012 04:17:03 +0000 (20:17 -0800)] 
update progress bars to have a solid edge until 100% filled

13 years agouse quotes on attr selectors more consistently
Mark Otto [Sat, 28 Jan 2012 04:05:03 +0000 (20:05 -0800)] 
use quotes on attr selectors more consistently

13 years agoicon spacing in small buttons and nav lists
Mark Otto [Sat, 28 Jan 2012 03:57:53 +0000 (19:57 -0800)] 
icon spacing in small buttons and nav lists

13 years agofixing up buttons and examples of implementing icons
Mark Otto [Sat, 28 Jan 2012 03:49:56 +0000 (19:49 -0800)] 
fixing up buttons and examples of implementing icons

13 years agoMerge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into...
Mark Otto [Sat, 28 Jan 2012 03:12:09 +0000 (19:12 -0800)] 
Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons

13 years agocomment icons that are 1px off
Mark Otto [Sat, 28 Jan 2012 02:49:00 +0000 (18:49 -0800)] 
comment icons that are 1px off

13 years agocombined .disabled and [disabled] and confirmed in ie7/8
Mark Otto [Sat, 28 Jan 2012 02:44:17 +0000 (18:44 -0800)] 
combined .disabled and [disabled] and confirmed in ie7/8

13 years agonew tab focus style and mixin
Mark Otto [Sat, 28 Jan 2012 02:33:25 +0000 (18:33 -0800)] 
new tab focus style and mixin

13 years agoclean up use of mixins to highlight them appropriately in your fav editor
Mark Otto [Sat, 28 Jan 2012 00:40:14 +0000 (16:40 -0800)] 
clean up use of mixins to highlight them appropriately in your fav editor

13 years agoMerge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins...
Mark Otto [Sat, 28 Jan 2012 00:35:32 +0000 (16:35 -0800)] 
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components

Conflicts:
docs/assets/css/bootstrap.css

13 years agooverhaul navbar behavior in responsive css
Mark Otto [Sat, 28 Jan 2012 00:26:55 +0000 (16:26 -0800)] 
overhaul navbar behavior in responsive css

13 years agoAdding new examples to the icons' docs. 1320/head
Burak Tuyan [Sat, 28 Jan 2012 00:13:53 +0000 (02:13 +0200)] 
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

13 years agoremove page-header from docs and add to type.less
Mark Otto [Fri, 27 Jan 2012 23:28:09 +0000 (15:28 -0800)] 
remove page-header from docs and add to type.less

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 27 Jan 2012 22:49:02 +0000 (14:49 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agoupdate examples and restore icons
Mark Otto [Fri, 27 Jan 2012 22:48:35 +0000 (14:48 -0800)] 
update examples and restore icons

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Fri, 27 Jan 2012 22:44:58 +0000 (14:44 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agoadd missing paren
Jacob Thornton [Fri, 27 Jan 2012 22:44:05 +0000 (14:44 -0800)] 
add missing paren

13 years agoonly build mustache files
Jacob Thornton [Fri, 27 Jan 2012 22:43:41 +0000 (14:43 -0800)] 
only build mustache files

13 years agofix inputs in navbar
Mark Otto [Fri, 27 Jan 2012 22:21:17 +0000 (14:21 -0800)] 
fix inputs in navbar

13 years agoremove unused images from docs assets
Mark Otto [Fri, 27 Jan 2012 22:03:36 +0000 (14:03 -0800)] 
remove unused images from docs assets

13 years agoupdate the docs for icons
Mark Otto [Fri, 27 Jan 2012 21:56:50 +0000 (13:56 -0800)] 
update the docs for icons

13 years agoMerge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan...
Mark Otto [Fri, 27 Jan 2012 21:43:51 +0000 (13:43 -0800)] 
Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 27 Jan 2012 21:43:28 +0000 (13:43 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agoRebuild css and html 1312/head
Pete Hopkins [Fri, 27 Jan 2012 21:39:38 +0000 (16:39 -0500)] 
Rebuild css and html

13 years agoMoves buttonBackground to mixins (issue 1292)
Pete Hopkins [Fri, 27 Jan 2012 21:39:27 +0000 (16:39 -0500)] 
Moves buttonBackground to mixins (issue 1292)

13 years agoupdate icon examples to show icons in differently sized buttons
Mark Otto [Fri, 27 Jan 2012 21:39:19 +0000 (13:39 -0800)] 
update icon examples to show icons in differently sized buttons

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Fri, 27 Jan 2012 21:37:14 +0000 (13:37 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agorebuil update layout
Jacob Thornton [Fri, 27 Jan 2012 21:36:31 +0000 (13:36 -0800)] 
rebuil update layout

13 years agoalign text in buttons so folks can easily make them different widths
Mark Otto [Fri, 27 Jan 2012 21:36:08 +0000 (13:36 -0800)] 
align text in buttons so folks can easily make them different widths

13 years agoChanges non-transparent navbar search box color to match transparent one better
Pete Hopkins [Thu, 26 Jan 2012 22:03:15 +0000 (17:03 -0500)] 
Changes non-transparent navbar search box color to match transparent one better

13 years agoi18n download page
Mark Otto [Fri, 27 Jan 2012 21:35:25 +0000 (13:35 -0800)] 
i18n download page

13 years agoFixes left/right border overlap for IE7
Pete Hopkins [Fri, 27 Jan 2012 21:35:21 +0000 (16:35 -0500)] 
Fixes left/right border overlap for IE7

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 27 Jan 2012 21:21:01 +0000 (13:21 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/download.html

13 years agohuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and...
Mark Otto [Fri, 27 Jan 2012 21:20:02 +0000 (13:20 -0800)] 
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff

13 years agoIE7 fixes for split buttons and dropdowns
Pete Hopkins [Fri, 27 Jan 2012 21:06:58 +0000 (16:06 -0500)] 
IE7 fixes for split buttons and dropdowns

13 years agoCleans up IE7 inline margins for buttons and adds them for sprites, also fixes button...
Pete Hopkins [Fri, 27 Jan 2012 19:17:06 +0000 (14:17 -0500)] 
Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes

13 years agoAdds necessary ie7-inline-block macros
Pete Hopkins [Fri, 27 Jan 2012 18:57:51 +0000 (13:57 -0500)] 
Adds necessary ie7-inline-block macros

13 years agoBrings back uneditable input
Pete Hopkins [Fri, 27 Jan 2012 18:56:41 +0000 (13:56 -0500)] 
Brings back uneditable input

13 years agoMoves IE7-specific button padding to only apply to form controls
Pete Hopkins [Fri, 27 Jan 2012 18:27:55 +0000 (13:27 -0500)] 
Moves IE7-specific button padding to only apply to form controls

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Fri, 27 Jan 2012 19:07:17 +0000 (11:07 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/css/bootstrap.css

13 years agoMerge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip 1296/head
Burak Tuyan [Fri, 27 Jan 2012 18:48:37 +0000 (20:48 +0200)] 
Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip

13 years agoMerge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base
Mark Otto [Fri, 27 Jan 2012 17:40:04 +0000 (09:40 -0800)] 
Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base

13 years agobuttons for toggle links in js docs, code example for offsetting in grid
Mark Otto [Fri, 27 Jan 2012 17:36:49 +0000 (09:36 -0800)] 
buttons for toggle links in js docs, code example for offsetting in grid

13 years agoRebuild bootstrap.css 1304/head
Pete Hopkins [Fri, 27 Jan 2012 17:16:36 +0000 (12:16 -0500)] 
Rebuild bootstrap.css

13 years agoCompensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for...
Pete Hopkins [Thu, 26 Jan 2012 23:03:53 +0000 (18:03 -0500)] 
Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element

13 years agoFixes up internal and external spacing for IE7 buttons
Pete Hopkins [Thu, 26 Jan 2012 22:32:44 +0000 (17:32 -0500)] 
Fixes up internal and external spacing for IE7 buttons

13 years agoCollapses borders for IE7, which doesn't respect border-spacing
Pete Hopkins [Thu, 26 Jan 2012 22:32:11 +0000 (17:32 -0500)] 
Collapses borders for IE7, which doesn't respect border-spacing

13 years agoadding outline callout as a fallback for IE--needs testing though, thought I already...
Mark Otto [Fri, 27 Jan 2012 16:21:39 +0000 (08:21 -0800)] 
adding outline callout as a fallback for IE--needs testing though, thought I already added this

13 years agoChanging the color of the default icons from black (#000) to grayDark (#333)
Burak Tuyan [Fri, 27 Jan 2012 16:02:57 +0000 (18:02 +0200)] 
Changing the color of the default icons from black (#000) to grayDark (#333)

13 years agoUpdating to latest version of Glyphicons Halflings set (v.1.5) along with some icon...
Burak Tuyan [Fri, 27 Jan 2012 14:33:18 +0000 (16:33 +0200)] 
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)

13 years agochange typeahead to data-source instead of data-data and add to docs
Jacob Thornton [Fri, 27 Jan 2012 07:16:02 +0000 (23:16 -0800)] 
change typeahead to data-source instead of data-data and add to docs

13 years agoMerge pull request #1272 from napoleond/2.0-wip
Jacob Thornton [Fri, 27 Jan 2012 07:04:42 +0000 (23:04 -0800)] 
Merge pull request #1272 from napoleond/2.0-wip

Support tab and enter in typeahead

13 years agochange endpoint to point to actual server...
Jacob Thornton [Fri, 27 Jan 2012 06:52:44 +0000 (22:52 -0800)] 
change endpoint to point to actual server...

13 years agorebuild + copy images to docs when making
Jacob Thornton [Fri, 27 Jan 2012 06:39:17 +0000 (22:39 -0800)] 
rebuild + copy images to docs when making

13 years agosimplify readme
Jacob Thornton [Fri, 27 Jan 2012 06:11:32 +0000 (22:11 -0800)] 
simplify readme

13 years agomove doc building into base make method + build bootstrap to doc assets
Jacob Thornton [Fri, 27 Jan 2012 06:05:45 +0000 (22:05 -0800)] 
move doc building into base make method + build bootstrap to doc assets

13 years agomoving structure around + more work on builder...
Jacob Thornton [Fri, 27 Jan 2012 05:48:46 +0000 (21:48 -0800)] 
moving structure around + more work on builder...

13 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Fri, 27 Jan 2012 04:23:28 +0000 (20:23 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

13 years agogetting closer....
Jacob Thornton [Fri, 27 Jan 2012 04:23:15 +0000 (20:23 -0800)] 
getting closer....

13 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Fri, 27 Jan 2012 03:10:32 +0000 (19:10 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

13 years agoscope icons to .icon
Mark Otto [Fri, 27 Jan 2012 03:10:09 +0000 (19:10 -0800)] 
scope icons to .icon

13 years agoflip order of content on home page
Mark Otto [Fri, 27 Jan 2012 03:09:59 +0000 (19:09 -0800)] 
flip order of content on home page

13 years agoMerge pull request #1280 from mistermarco/2.0-wip
Mark Otto [Fri, 27 Jan 2012 03:04:22 +0000 (19:04 -0800)] 
Merge pull request #1280 from mistermarco/2.0-wip

Fix typo in docs/scaffolding.html and mustache template in 2.0 wip

13 years agofix typo in docs/scaffolding.html 1280/head
Marco Wise [Fri, 27 Jan 2012 02:10:36 +0000 (18:10 -0800)] 
fix typo in docs/scaffolding.html

13 years agoMerge pull request #1269 from phopkins/ie_typeahead
Mark Otto [Fri, 27 Jan 2012 01:04:35 +0000 (17:04 -0800)] 
Merge pull request #1269 from phopkins/ie_typeahead

[2.0-wip] Fix typehead plugin for IE7/8