]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 25 Jun 2013 20:35:49 +0000 (13:35 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8290 from juthilo/3.0.0-docs-nothird
Mark Otto [Tue, 25 Jun 2013 20:34:03 +0000 (13:34 -0700)] 
Merge pull request #8290 from juthilo/3.0.0-docs-nothird

Add new callouts to docs

12 years agoMerge pull request #8292 from cvrebert/patch-1
Mark Otto [Tue, 25 Jun 2013 20:32:41 +0000 (13:32 -0700)] 
Merge pull request #8292 from cvrebert/patch-1

fix "Data attributes" link in JS docs sidenav

12 years agoMove mixin to mixins.less
Mark Otto [Tue, 25 Jun 2013 20:32:21 +0000 (13:32 -0700)] 
Move mixin to mixins.less

12 years agoMerge pull request #8291 from cvrebert/refactor
Mark Otto [Tue, 25 Jun 2013 20:28:34 +0000 (13:28 -0700)] 
Merge pull request #8291 from cvrebert/refactor

refactor responsive-utilities slightly

12 years agoMerge pull request #8294 from cvrebert/patch-2
Mark Otto [Tue, 25 Jun 2013 20:26:14 +0000 (13:26 -0700)] 
Merge pull request #8294 from cvrebert/patch-2

fix ID of Normalize heading in docs so that the sidenav can find it

12 years agoRecess welcome 8290/head
Julian Thilo [Tue, 25 Jun 2013 20:22:23 +0000 (22:22 +0200)] 
Recess welcome

12 years agofix ID of Normalize heading in docs so that the sidenav can find it 8294/head
Chris Rebert [Tue, 25 Jun 2013 20:16:39 +0000 (14:16 -0600)] 
fix ID of Normalize heading in docs so that the sidenav can find it

12 years agofix "Data attributes" link in JS docs sidenav 8292/head
Chris Rebert [Tue, 25 Jun 2013 20:09:24 +0000 (14:09 -0600)] 
fix "Data attributes" link in JS docs sidenav

`#js-data-attributes` => `#js-data-attrs`

12 years agoAdd IDs, adjust text
Julian Thilo [Tue, 25 Jun 2013 19:59:34 +0000 (21:59 +0200)] 
Add IDs, adjust text

12 years agorefactor responsive-utilities slightly 8291/head
Chris Rebert [Tue, 25 Jun 2013 19:23:56 +0000 (12:23 -0700)] 
refactor responsive-utilities slightly

12 years agoAdd a link to the mailing list for JS help
Julian Thilo [Tue, 25 Jun 2013 19:19:19 +0000 (21:19 +0200)] 
Add a link to the mailing list for JS help

12 years agoAdd callout to docs: LESS compiler support
Julian Thilo [Tue, 25 Jun 2013 19:01:13 +0000 (21:01 +0200)] 
Add callout to docs: LESS compiler support

12 years agoAdd callout to docs: 3rd-party libs not supported
Julian Thilo [Tue, 25 Jun 2013 18:52:49 +0000 (20:52 +0200)] 
Add callout to docs: 3rd-party libs not supported

12 years agoMerge pull request #8283 from luishdez/hotfix/add-on-breaks
Mark Otto [Tue, 25 Jun 2013 16:37:56 +0000 (09:37 -0700)] 
Merge pull request #8283 from luishdez/hotfix/add-on-breaks

Fix line breaks on add-ons with spaces

12 years agoFix line breaks on add-ons with spaces 8283/head
Luis Hdez [Tue, 25 Jun 2013 12:34:57 +0000 (14:34 +0200)] 
Fix line breaks on add-ons with spaces

12 years agoMerge pull request #8270 from kylase/3.0.0-wip
Mark Otto [Mon, 24 Jun 2013 04:26:56 +0000 (21:26 -0700)] 
Merge pull request #8270 from kylase/3.0.0-wip

Replaced <i> with <span> for glyphicon

12 years agoReplaced <i> with <span> for glyphicon 8270/head
Kyle [Mon, 24 Jun 2013 03:27:05 +0000 (11:27 +0800)] 
Replaced <i> with <span> for glyphicon

12 years agoMerge pull request #8268 from luishdez/hotfix/sidebar-overlap
Mark Otto [Sun, 23 Jun 2013 22:16:25 +0000 (15:16 -0700)] 
Merge pull request #8268 from luishdez/hotfix/sidebar-overlap

Fix overlap sidebar for Tablets and up in docs

12 years agoMove grid offsets to desktop only (fixes #8229)
Mark Otto [Sun, 23 Jun 2013 22:15:42 +0000 (15:15 -0700)] 
Move grid offsets to desktop only (fixes #8229)

12 years agoMake on previous commits
Mark Otto [Sun, 23 Jun 2013 22:05:58 +0000 (15:05 -0700)] 
Make on previous commits

12 years agoFixes #8211: restore proper table grid class behavior
Mark Otto [Sun, 23 Jun 2013 22:05:50 +0000 (15:05 -0700)] 
Fixes #8211: restore proper table grid class behavior

Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.

12 years agoFix overlap sidebar for Tablets and up in docs 8268/head
Luis Hdez [Sun, 23 Jun 2013 21:15:32 +0000 (23:15 +0200)] 
Fix overlap sidebar for Tablets and up in docs

12 years agoFixes #8266: remove unnecessary `strong` and `em` styles
Mark Otto [Sun, 23 Jun 2013 17:24:50 +0000 (10:24 -0700)] 
Fixes #8266: remove unnecessary `strong` and `em` styles

12 years agorun make on previous merge
Mark Otto [Sun, 23 Jun 2013 01:56:55 +0000 (18:56 -0700)] 
run make on previous merge

12 years agoMerge pull request #8261 from frabrunelle/patch-1
Mark Otto [Sun, 23 Jun 2013 01:56:20 +0000 (18:56 -0700)] 
Merge pull request #8261 from frabrunelle/patch-1

Reset left padding for .carousel-indicators

12 years agoReset left padding for .carousel-indicators 8261/head
Francis Brunelle [Sun, 23 Jun 2013 00:38:02 +0000 (21:38 -0300)] 
Reset left padding for .carousel-indicators

12 years agoMerge pull request #8258 from aristath/navbar-fixes
Mark Otto [Sat, 22 Jun 2013 22:07:49 +0000 (15:07 -0700)] 
Merge pull request #8258 from aristath/navbar-fixes

Navbar fixes

12 years agoUpdate variables.less 8258/head
Aristeides Stathopoulos [Sat, 22 Jun 2013 15:45:25 +0000 (18:45 +0300)] 
Update variables.less

12 years agoUpdate navbar.less
Aristeides Stathopoulos [Sat, 22 Jun 2013 15:44:04 +0000 (18:44 +0300)] 
Update navbar.less

12 years agoUpdate navbar.less
Aristeides Stathopoulos [Sat, 22 Jun 2013 11:41:31 +0000 (14:41 +0300)] 
Update navbar.less

12 years agoUpdate navbar.less
Aristeides Stathopoulos [Sat, 22 Jun 2013 11:34:17 +0000 (14:34 +0300)] 
Update navbar.less

navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.

12 years agoMerge pull request #10 from twitter/3.0.0-wip
Aristeides Stathopoulos [Sat, 22 Jun 2013 11:26:09 +0000 (04:26 -0700)] 
Merge pull request #10 from twitter/3.0.0-wip

3.0.0 wip

12 years agoImprove alignment of navbar brand and fix up left padding on list groups
Mark Otto [Sat, 22 Jun 2013 00:21:44 +0000 (17:21 -0700)] 
Improve alignment of navbar brand and fix up left padding on list groups

12 years agoReset padding on homepage links
Mark Otto [Fri, 21 Jun 2013 18:56:47 +0000 (11:56 -0700)] 
Reset padding on homepage links

12 years agoMerge pull request #8251 from acmetech/3.0.0-wip
Mark Otto [Fri, 21 Jun 2013 16:11:54 +0000 (09:11 -0700)] 
Merge pull request #8251 from acmetech/3.0.0-wip

Remove offcanvas from footer and change placeholder in css.html

12 years agoRemove the offcanvas js from the footer 8251/head
Tom Pietschker [Fri, 21 Jun 2013 14:03:28 +0000 (10:03 -0400)] 
Remove the offcanvas js from the footer

This was moved inline in 65ad52060e1f9b5928ac0d5a0bfead0cdf1b26f4

12 years agoRename class name in placeholder
Tom Pietschker [Fri, 21 Jun 2013 13:59:34 +0000 (09:59 -0400)] 
Rename class name in placeholder

applies 2535e060a48393143e7a6c2eb93a0a5d06663801 to css.html. Wasn't
docs.html removed a while ago?

12 years agoMerge pull request #8244 from Quy/3.0.0-wip
Mark Otto [Fri, 21 Jun 2013 05:55:11 +0000 (22:55 -0700)] 
Merge pull request #8244 from Quy/3.0.0-wip

Rename class name in placeholder

12 years agoRename class name in placeholder 8244/head
Quy Ton [Fri, 21 Jun 2013 01:44:19 +0000 (18:44 -0700)] 
Rename class name in placeholder

12 years agoFixes #8154: enforce full width `.navbar-nav.pull-right` in mobile
Mark Otto [Fri, 21 Jun 2013 00:15:09 +0000 (17:15 -0700)] 
Fixes #8154: enforce full width `.navbar-nav.pull-right` in mobile

Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.

12 years agoFixes #8159: Be more specific about disabled inputs to avoid iOS bug
Mark Otto [Fri, 21 Jun 2013 00:02:10 +0000 (17:02 -0700)] 
Fixes #8159: Be more specific about disabled inputs to avoid iOS bug

Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.

12 years agoFixes #8093: Removes invalid focus styles on inputs
Mark Otto [Thu, 20 Jun 2013 23:42:05 +0000 (16:42 -0700)] 
Fixes #8093: Removes invalid focus styles on inputs

12 years agorun make on previous commit
Mark Otto [Thu, 20 Jun 2013 23:27:39 +0000 (16:27 -0700)] 
run make on previous commit

12 years agoFixes #7730: Better hiding of empty titles in popovers
Mark Otto [Thu, 20 Jun 2013 23:01:59 +0000 (16:01 -0700)] 
Fixes #7730: Better hiding of empty titles in popovers

If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3

12 years agoRun make on last commit
Mark Otto [Thu, 20 Jun 2013 23:00:38 +0000 (16:00 -0700)] 
Run make on last commit

12 years agoMerge pull request #8193 from mediafreakch/3.0.0-wip
Mark Otto [Thu, 20 Jun 2013 22:44:08 +0000 (15:44 -0700)] 
Merge pull request #8193 from mediafreakch/3.0.0-wip

Fixes broken layout for .input-group-addons within .input-large. Follows...

12 years agoUse `@font-family-base` for headings font-family variable
Mark Otto [Thu, 20 Jun 2013 22:38:18 +0000 (15:38 -0700)] 
Use `@font-family-base` for headings font-family variable

12 years agoMerge pull request #8237 from luishdez/feature/var-heading-family
Mark Otto [Thu, 20 Jun 2013 22:36:49 +0000 (15:36 -0700)] 
Merge pull request #8237 from luishdez/feature/var-heading-family

Add heading font family variable

12 years agorun make on @nextgenthemes last commit
Mark Otto [Thu, 20 Jun 2013 16:58:21 +0000 (09:58 -0700)] 
run make on @nextgenthemes last commit

12 years agoMerge pull request #8241 from nextgenthemes/3.0.0-wip
Mark Otto [Thu, 20 Jun 2013 16:57:18 +0000 (09:57 -0700)] 
Merge pull request #8241 from nextgenthemes/3.0.0-wip

rename '.navbar .nav' to '.navbar-nav'

12 years agorename '.navbar .nav' to '.navbar-nav' 8241/head
nextgenthemes [Thu, 20 Jun 2013 16:40:30 +0000 (19:40 +0300)] 
rename '.navbar .nav' to '.navbar-nav'

12 years agoAdd heading font family variable 8237/head
Luis Hdez [Thu, 20 Jun 2013 10:50:30 +0000 (12:50 +0200)] 
Add heading font family variable

12 years agoOffcanvas example update
Mark Otto [Thu, 20 Jun 2013 03:31:03 +0000 (20:31 -0700)] 
Offcanvas example update

* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup

12 years agoMerge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumb...
Mark Otto [Thu, 20 Jun 2013 02:13:38 +0000 (19:13 -0700)] 
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example

12 years agoFixes #8001: add IDs for example inputs
Mark Otto [Thu, 20 Jun 2013 02:02:24 +0000 (19:02 -0700)] 
Fixes #8001: add IDs for example inputs

12 years agoMerge pull request #8233 from zurt/patch-1
Mark Otto [Thu, 20 Jun 2013 01:02:47 +0000 (18:02 -0700)] 
Merge pull request #8233 from zurt/patch-1

Add missing property to form-horizontal docs

12 years agoAdd missing property to form-horizontal docs 8233/head
Kurt MacDonald [Wed, 19 Jun 2013 23:08:14 +0000 (17:08 -0600)] 
Add missing property to form-horizontal docs

12 years agoAdd support for `tr`, `th`, and `td` to responsive utilities
Mark Otto [Wed, 19 Jun 2013 02:16:42 +0000 (19:16 -0700)] 
Add support for `tr`, `th`, and `td` to responsive utilities

12 years agorun make on last commit
Mark Otto [Tue, 18 Jun 2013 23:36:02 +0000 (16:36 -0700)] 
run make on last commit

12 years agoMerge pull request #8210 from cvrebert/backticks
Mark Otto [Tue, 18 Jun 2013 21:40:13 +0000 (14:40 -0700)] 
Merge pull request #8210 from cvrebert/backticks

docs/javascript.html: backticks -> <code>

12 years agodocs/javascript.html: backticks -> <code> 8210/head
Chris Rebert [Tue, 18 Jun 2013 21:35:37 +0000 (14:35 -0700)] 
docs/javascript.html: backticks -> <code>

12 years agoUse correct font-size to calculate input-heights 8193/head
Edgar Schnueriger [Tue, 18 Jun 2013 19:43:34 +0000 (21:43 +0200)] 
Use correct font-size to calculate input-heights

12 years agoAddresses #8199: darker default button
Mark Otto [Tue, 18 Jun 2013 18:16:43 +0000 (11:16 -0700)] 
Addresses #8199: darker default button

12 years agoAdd note about Jekyll version per #8195
Mark Otto [Tue, 18 Jun 2013 04:35:58 +0000 (21:35 -0700)] 
Add note about Jekyll version per #8195

12 years agoMerge pull request #8182 from karelvuong/3.0.0-wip
Mark Otto [Tue, 18 Jun 2013 04:34:31 +0000 (21:34 -0700)] 
Merge pull request #8182 from karelvuong/3.0.0-wip

3.0.0-wip - Fixed 'Running Doc. Locally" Link

12 years agoFixes #7599: Improved print styles for a few key components
Mark Otto [Tue, 18 Jun 2013 03:56:02 +0000 (20:56 -0700)] 
Fixes #7599: Improved print styles for a few key components

* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)

12 years agoBetter clearing on `.dl-horizontal` for empty `dd` elements
Mark Otto [Mon, 17 Jun 2013 21:19:44 +0000 (14:19 -0700)] 
Better clearing on `.dl-horizontal` for empty `dd` elements

Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.

12 years agoProperly unstyle the `.list-unstyled` class by switching from `margin` to `padding`
Mark Otto [Mon, 17 Jun 2013 20:49:22 +0000 (13:49 -0700)] 
Properly unstyle the `.list-unstyled` class by switching from `margin` to `padding`

Also add better comments

12 years agoRemove explicit, unncessary `line-height` on `li` elements
Mark Otto [Mon, 17 Jun 2013 20:47:03 +0000 (13:47 -0700)] 
Remove explicit, unncessary `line-height` on `li` elements

12 years agoBetter base `ul` and `ol` styles
Mark Otto [Mon, 17 Jun 2013 20:35:50 +0000 (13:35 -0700)] 
Better base `ul` and `ol` styles

Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.

12 years agoFixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64...
Edgar Schnueriger [Mon, 17 Jun 2013 16:56:17 +0000 (18:56 +0200)] 
Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49

12 years agoMerge pull request #8184 from FLOKER/3.0.0-wip
Mark Otto [Mon, 17 Jun 2013 03:48:27 +0000 (20:48 -0700)] 
Merge pull request #8184 from FLOKER/3.0.0-wip

redundant lines removed

12 years agoMerge pull request #8189 from cvrebert/patch-2
Mark Otto [Mon, 17 Jun 2013 03:45:20 +0000 (20:45 -0700)] 
Merge pull request #8189 from cvrebert/patch-2

components docs: backticks ==> <code>

12 years agocomponents docs: backticks ==> <code> 8189/head
Chris Rebert [Mon, 17 Jun 2013 03:40:50 +0000 (21:40 -0600)] 
components docs: backticks ==> <code>

12 years agoMerge pull request #8187 from imsky/3.0.0-wip
Mark Otto [Mon, 17 Jun 2013 03:39:11 +0000 (20:39 -0700)] 
Merge pull request #8187 from imsky/3.0.0-wip

upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers

12 years agoMerge pull request #8188 from cvrebert/patch-1
Mark Otto [Mon, 17 Jun 2013 03:38:31 +0000 (20:38 -0700)] 
Merge pull request #8188 from cvrebert/patch-1

CSS docs page: backticks ==> <code>

12 years agoCSS docs page: backticks ==> <code> 8188/head
Chris Rebert [Mon, 17 Jun 2013 03:36:56 +0000 (21:36 -0600)] 
CSS docs page: backticks ==> <code>

12 years agoupgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 8187/head
Ivan Malopinsky [Mon, 17 Jun 2013 03:16:56 +0000 (23:16 -0400)] 
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers

12 years agoredundant lines removed 8184/head
FLOKER [Sun, 16 Jun 2013 20:18:46 +0000 (22:18 +0200)] 
redundant lines removed

12 years agoRemove WebKit overflow scrolling for now
Mark Otto [Sun, 16 Jun 2013 17:56:30 +0000 (10:56 -0700)] 
Remove WebKit overflow scrolling for now

12 years agoFixed link. 8182/head
Karel Vuong [Sun, 16 Jun 2013 02:23:09 +0000 (22:23 -0400)] 
Fixed link.

12 years agoFixes #8175: Update input min-height vars to fix FF21 input rendering
Mark Otto [Sat, 15 Jun 2013 18:46:13 +0000 (11:46 -0700)] 
Fixes #8175: Update input min-height vars to fix FF21 input rendering

12 years agoFix up broken input group example layouts
Mark Otto [Sat, 15 Jun 2013 18:37:59 +0000 (11:37 -0700)] 
Fix up broken input group example layouts

12 years agoMerge pull request #8168 from marsuboss/patch-2
Mark Otto [Thu, 13 Jun 2013 20:41:23 +0000 (13:41 -0700)] 
Merge pull request #8168 from marsuboss/patch-2

Duplicate ID navbar-example

12 years agoMerge pull request #8166 from liuyl/package
Mark Otto [Thu, 13 Jun 2013 20:41:04 +0000 (13:41 -0700)] 
Merge pull request #8166 from liuyl/package

change version of recess to 1.1.7

12 years agoMerge pull request #8167 from marsuboss/patch-1
Mark Otto [Thu, 13 Jun 2013 20:40:40 +0000 (13:40 -0700)] 
Merge pull request #8167 from marsuboss/patch-1

Duplicate ID drop5

12 years agoMerge pull request #8169 from marsuboss/patch-4
Mark Otto [Thu, 13 Jun 2013 20:39:11 +0000 (13:39 -0700)] 
Merge pull request #8169 from marsuboss/patch-4

Fix

12 years agoFix 8169/head
marsuboss [Thu, 13 Jun 2013 12:50:06 +0000 (15:50 +0300)] 
Fix

12 years agoDuplicate ID navbar-example 8168/head
marsuboss [Thu, 13 Jun 2013 12:36:52 +0000 (15:36 +0300)] 
Duplicate ID navbar-example

12 years agoDuplicate ID drop5 8167/head
marsuboss [Thu, 13 Jun 2013 12:29:34 +0000 (14:29 +0200)] 
Duplicate ID drop5

12 years agochange version of recess to 1.1.7 8166/head
liuyl [Thu, 13 Jun 2013 11:27:26 +0000 (19:27 +0800)] 
change version of recess to 1.1.7

12 years agoMerge pull request #8156 from baer/toggle-button-fix
Mark Otto [Wed, 12 Jun 2013 23:59:40 +0000 (16:59 -0700)] 
Merge pull request #8156 from baer/toggle-button-fix

Docs Customize toggle button used incorrect selectors

12 years agoMerge pull request #8158 from baer/download-button-fix-proper
Mark Otto [Wed, 12 Jun 2013 23:59:22 +0000 (16:59 -0700)] 
Merge pull request #8158 from baer/download-button-fix-proper

Docs "Customize and Download" button didn't send the correct parameters

12 years agoDocs Customize "Customize and Download" button not working properly 8158/head
Eric Baer [Wed, 12 Jun 2013 19:40:37 +0000 (13:40 -0600)] 
Docs Customize "Customize and Download" button not working properly

12 years agoDocs Customize toggle button used incorrect selectors 8156/head
Eric Baer [Wed, 12 Jun 2013 18:51:10 +0000 (12:51 -0600)] 
Docs Customize toggle button used incorrect selectors

12 years agoMerge pull request #8124 from eins78/3.0.0-wip-fix-json
Mark Otto [Mon, 10 Jun 2013 23:37:29 +0000 (16:37 -0700)] 
Merge pull request #8124 from eins78/3.0.0-wip-fix-json

fix JSON syntax error in composer.json

12 years agofix JSON syntax error in composer.json 8124/head
Max F. Albrecht [Mon, 10 Jun 2013 12:59:42 +0000 (14:59 +0200)] 
fix JSON syntax error in composer.json

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Mon, 10 Jun 2013 06:45:23 +0000 (23:45 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoUpdate docs JS to prevent clicks on links with hash hrefs
Mark Otto [Mon, 10 Jun 2013 06:45:14 +0000 (23:45 -0700)] 
Update docs JS to prevent clicks on links with hash hrefs