]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agofixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios 9578/head
Chris Rebert [Thu, 15 Aug 2013 01:20:28 +0000 (18:20 -0700)] 
fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios

11 years agoMerge branch '3.0.0-wip' into reset-FF-Android-default-background-image
Mark Otto [Wed, 14 Aug 2013 23:24:39 +0000 (16:24 -0700)] 
Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image

Conflicts:
dist/css/bootstrap.min.css

11 years agofixes #8702 until Normalize.css starts handling this 9567/head
Chris Rebert [Wed, 14 Aug 2013 23:06:51 +0000 (16:06 -0700)] 
fixes #8702 until Normalize.css starts handling this

11 years agofixes #9509: add margin around buttons so they don't shit the bed when wrapping
Mark Otto [Wed, 14 Aug 2013 22:39:21 +0000 (15:39 -0700)] 
fixes #9509: add margin around buttons so they don't shit the bed when wrapping

11 years agoremove unused docs css
Mark Otto [Wed, 14 Aug 2013 22:37:21 +0000 (15:37 -0700)] 
remove unused docs css

11 years agoMerge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 22:33:38 +0000 (15:33 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 22:33:06 +0000 (15:33 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoMerge pull request #9498 from ggam/panel-variant-fix
Mark Otto [Wed, 14 Aug 2013 22:32:21 +0000 (15:32 -0700)] 
Merge pull request #9498 from ggam/panel-variant-fix

Made panel-variant apply styles only to first child

11 years agoMerge pull request #9521 from Luis-TP/fix-javascript-docs
Mark Otto [Wed, 14 Aug 2013 22:27:41 +0000 (15:27 -0700)] 
Merge pull request #9521 from Luis-TP/fix-javascript-docs

Javascript Docs: Add .navbar-header, and correct .nav-collapse

11 years agoreally fix the pres in scrollable tables
Mark Otto [Wed, 14 Aug 2013 22:26:01 +0000 (15:26 -0700)] 
really fix the pres in scrollable tables

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 22:20:21 +0000 (15:20 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoMerge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3...
Mark Otto [Wed, 14 Aug 2013 22:19:57 +0000 (15:19 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/jharbert/bootstrap into jharbert-3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #9544 from gabrielecirulli/3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 22:17:34 +0000 (15:17 -0700)] 
Merge pull request #9544 from gabrielecirulli/3.0.0-wip

Add information on how to disable zoom on mobile devices to the docs

11 years agofuck aside and main elements, use divs so IE8 doesn't shit the bed
Mark Otto [Wed, 14 Aug 2013 21:59:08 +0000 (14:59 -0700)] 
fuck aside and main elements, use divs so IE8 doesn't shit the bed

11 years agotweak note about zoom disabled on mobile 9544/head
Gabriele Cirulli [Wed, 14 Aug 2013 21:51:26 +0000 (23:51 +0200)] 
tweak note about zoom disabled on mobile

11 years agofixes overflowing table due to pre
Mark Otto [Wed, 14 Aug 2013 21:30:00 +0000 (14:30 -0700)] 
fixes overflowing table due to pre

11 years agofixes #9557: set tooltip demo to use body as container
Mark Otto [Wed, 14 Aug 2013 21:29:53 +0000 (14:29 -0700)] 
fixes #9557: set tooltip demo to use body as container

11 years agoimprove the "zoom disabled" documentation
Gabriele Cirulli [Wed, 14 Aug 2013 21:26:34 +0000 (23:26 +0200)] 
improve the "zoom disabled" documentation

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 21:24:06 +0000 (14:24 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9556
Mark Otto [Wed, 14 Aug 2013 21:24:00 +0000 (14:24 -0700)] 
fixes #9556

11 years agoMerge pull request #9540 from ggam/table-variant
Mark Otto [Wed, 14 Aug 2013 21:21:51 +0000 (14:21 -0700)] 
Merge pull request #9540 from ggam/table-variant

Added table-row-variant mixin

11 years agoRemoved commented lines 9540/head
Guillermo González de Agüero [Wed, 14 Aug 2013 21:12:47 +0000 (23:12 +0200)] 
Removed commented lines

11 years agoAdd missing close-parens in docs sentence; fixes #9512
Chris Rebert [Wed, 14 Aug 2013 20:45:20 +0000 (13:45 -0700)] 
Add missing close-parens in docs sentence; fixes #9512

11 years agoadd information on how to disable mobile zoom to the docs
Gabriele Cirulli [Wed, 14 Aug 2013 20:08:17 +0000 (22:08 +0200)] 
add information on how to disable mobile zoom to the docs

11 years agoAdded table-row-variant mixin
ggam [Wed, 14 Aug 2013 19:16:45 +0000 (21:16 +0200)] 
Added table-row-variant mixin

11 years agoRemoved containers, and moved brand to after the navbar-toggle 9521/head
Luis Aleman [Wed, 14 Aug 2013 18:30:35 +0000 (14:30 -0400)] 
Removed containers, and moved brand to after the navbar-toggle

11 years agoMerge pull request #9531 from ggam/docs-indentation
Chris Rebert [Wed, 14 Aug 2013 18:10:24 +0000 (11:10 -0700)] 
Merge pull request #9531 from ggam/docs-indentation

Fixed inconsistencies in JavaScript examples

11 years agoRemoved trailing semicolons from examples 9531/head
ggam [Wed, 14 Aug 2013 17:57:54 +0000 (19:57 +0200)] 
Removed trailing semicolons from examples

11 years agoFixed indentation in JavaScript example
ggam [Wed, 14 Aug 2013 17:53:37 +0000 (19:53 +0200)] 
Fixed indentation in JavaScript example

11 years agoAdd .navbar-header, and correct .nav-collapse
Luis Aleman [Wed, 14 Aug 2013 17:31:29 +0000 (13:31 -0400)] 
Add .navbar-header, and correct .nav-collapse

11 years agoMerge pull request #9489 from BBosman/ol-breadcrumb
Mark Otto [Wed, 14 Aug 2013 16:44:18 +0000 (09:44 -0700)] 
Merge pull request #9489 from BBosman/ol-breadcrumb

OL breadcrumbs

11 years agoMerge pull request #9493 from brenoc/3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 16:40:29 +0000 (09:40 -0700)] 
Merge pull request #9493 from brenoc/3.0.0-wip

Reference only not minified files in Bower

11 years agoMerge pull request #9496 from BBosman/accordion-border-color
Mark Otto [Wed, 14 Aug 2013 16:39:55 +0000 (09:39 -0700)] 
Merge pull request #9496 from BBosman/accordion-border-color

Remove old accordion remnant

11 years agoMerge pull request #9499 from ggam/docs-print
Mark Otto [Wed, 14 Aug 2013 16:38:23 +0000 (09:38 -0700)] 
Merge pull request #9499 from ggam/docs-print

Added hidden-print class to docs sidebar

11 years agoMerge pull request #9502 from Luis-TP/navbar-padding
Mark Otto [Wed, 14 Aug 2013 16:37:50 +0000 (09:37 -0700)] 
Merge pull request #9502 from Luis-TP/navbar-padding

Remove .navbar-collapse padding when not in mobile context

11 years agoRemove .navbar-collapse padding when not in mobile context 9502/head
Luis Aleman [Wed, 14 Aug 2013 15:39:38 +0000 (11:39 -0400)] 
Remove .navbar-collapse padding when not in mobile context

11 years agoAdded hidden-print class to docs sidebar 9499/head
ggam [Wed, 14 Aug 2013 15:09:13 +0000 (17:09 +0200)] 
Added hidden-print class to docs sidebar

11 years agoMade panel-variant apply styles only to first child 9498/head
ggam [Wed, 14 Aug 2013 14:40:26 +0000 (16:40 +0200)] 
Made panel-variant apply styles only to first child

11 years agoRemove old accordion remnant 9496/head
Bas Bosman [Wed, 14 Aug 2013 14:33:35 +0000 (16:33 +0200)] 
Remove old accordion remnant

11 years agoReference only not minified files in Bower 9493/head
Breno Calazans [Wed, 14 Aug 2013 14:10:48 +0000 (11:10 -0300)] 
Reference only not minified files in Bower

Fixes #8985

11 years agoOrdered breadcrumbs 9489/head
Bas Bosman [Wed, 14 Aug 2013 13:16:30 +0000 (15:16 +0200)] 
Ordered breadcrumbs

11 years agofixes #9406: proper border for justified btn-groups inside tables 9476/head
Luca Wehrstedt [Tue, 13 Aug 2013 18:28:18 +0000 (20:28 +0200)] 
fixes #9406: proper border for justified btn-groups inside tables

11 years agoMerge pull request #9463 from PMPP/css-ex-fix
Chris Rebert [Wed, 14 Aug 2013 09:14:59 +0000 (02:14 -0700)] 
Merge pull request #9463 from PMPP/css-ex-fix

CSS Grid old classes in use

11 years agoCSS Grid old classes in use 9463/head
Pedro Pereira [Wed, 14 Aug 2013 09:02:57 +0000 (17:02 +0800)] 
CSS Grid old classes in use

11 years agorm `action` attr from highlighted example code too
Chris Rebert [Wed, 14 Aug 2013 07:09:42 +0000 (00:09 -0700)] 
rm `action` attr from highlighted example code too

fixup to e61c71e0775f676c3e404e7a8853949c78bc4511

11 years agotweak punctuation in sentence of docs
Chris Rebert [Wed, 14 Aug 2013 04:32:49 +0000 (21:32 -0700)] 
tweak punctuation in sentence of docs

11 years agoMerge pull request #9451 from Luis-TP/3.0.0-wip
Mark Otto [Wed, 14 Aug 2013 03:47:58 +0000 (20:47 -0700)] 
Merge pull request #9451 from Luis-TP/3.0.0-wip

Fix .navbar-right > .dropdown-menu alignment

11 years agoApply mixin to correct class 9451/head
Luis Aleman [Wed, 14 Aug 2013 02:53:23 +0000 (22:53 -0400)] 
Apply mixin to correct class

11 years agofixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no... 9453/head
Jason Harbert [Wed, 14 Aug 2013 02:40:12 +0000 (19:40 -0700)] 
fixes issue after navbar is collapsed, dropdown-menus on uncollapsed menu are no longer visible

11 years agoFix .navbar-right > .dropdown-menu alignment
Luis Aleman [Wed, 14 Aug 2013 02:30:02 +0000 (22:30 -0400)] 
Fix .navbar-right > .dropdown-menu alignment

11 years agoMerge pull request #9443 from mattleff/patch-1
Chris Rebert [Wed, 14 Aug 2013 00:04:34 +0000 (17:04 -0700)] 
Merge pull request #9443 from mattleff/patch-1

Tiny typo in class prefix

11 years agoTypo 9443/head
Matthew Leffler [Tue, 13 Aug 2013 23:56:12 +0000 (17:56 -0600)] 
Typo

11 years agoremove accordion from customizer; shorten min height for affix v3.0.0-rc.2
Mark Otto [Tue, 13 Aug 2013 23:00:05 +0000 (16:00 -0700)] 
remove accordion from customizer; shorten min height for affix

11 years agofixes #9439: use overflow: auto on navbar collapse
Mark Otto [Tue, 13 Aug 2013 22:22:05 +0000 (15:22 -0700)] 
fixes #9439: use overflow: auto on navbar collapse

11 years agoOverhaul navbar alignment (.pull-) utilities (fixes #9440)
Mark Otto [Tue, 13 Aug 2013 22:19:59 +0000 (15:19 -0700)] 
Overhaul navbar alignment (.pull-) utilities (fixes #9440)

Now navbars have their own float utility classes, mixin-ed versions of
`.pull-left` and `.pull-right`.

* Removed chained `.navbar-nav.pull-right`
* Added `.navbar-left` and `.navbar-right` as mixins of the default
float utilities, but only above the `@grid-float-breakpoint` to match
the new navbar behavior
* Updated components docs to match the new changeas
* Added callout about component alignment here to explain the new
classes

11 years agogrunt dist on prev forms change
Mark Otto [Tue, 13 Aug 2013 21:56:58 +0000 (14:56 -0700)] 
grunt dist on prev forms change

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 13 Aug 2013 21:56:33 +0000 (14:56 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoonly affix the sidenav in the docs if the viewport is >800px tall (fixes #8704 and...
Mark Otto [Tue, 13 Aug 2013 21:56:22 +0000 (14:56 -0700)] 
only affix the sidenav in the docs if the viewport is >800px tall (fixes #8704 and avoids #8721)

11 years agonuke the box-shadow on uncollapsed navbar-collapse
Mark Otto [Tue, 13 Aug 2013 21:46:34 +0000 (14:46 -0700)] 
nuke the box-shadow on uncollapsed navbar-collapse

11 years agoMerge pull request #9437 from ggam/patch-1
Mark Otto [Tue, 13 Aug 2013 21:32:36 +0000 (14:32 -0700)] 
Merge pull request #9437 from ggam/patch-1

Swapped input-lg and input-sm

11 years agoSwapped input-lg and input-sm 9437/head
Guillermo González de Agüero [Tue, 13 Aug 2013 21:31:33 +0000 (23:31 +0200)] 
Swapped input-lg and input-sm

Fixing my own error. Thanks to @kyleledbetter for reporting.

11 years agobetter rc2 download action
Mark Otto [Tue, 13 Aug 2013 21:23:17 +0000 (14:23 -0700)] 
better rc2 download action

11 years agofix up broken tests by removing empty attr
Mark Otto [Tue, 13 Aug 2013 21:23:10 +0000 (14:23 -0700)] 
fix up broken tests by removing empty attr

11 years agofix navbar border in docs
Mark Otto [Tue, 13 Aug 2013 21:12:11 +0000 (14:12 -0700)] 
fix navbar border in docs

11 years agoMerge pull request #9403 from twbs/bs3_navbar_overhaul
Mark Otto [Tue, 13 Aug 2013 20:53:27 +0000 (13:53 -0700)] 
Merge pull request #9403 from twbs/bs3_navbar_overhaul

BS3: Navbar overhaul

11 years agoMerge branch '3.0.0-wip' into bs3_navbar_overhaul 9403/head
Mark Otto [Tue, 13 Aug 2013 20:48:33 +0000 (13:48 -0700)] 
Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Conflicts:
dist/css/bootstrap.min.css

11 years agolighter default navbar, add borders to navbars, tweak padding and alignments
Mark Otto [Tue, 13 Aug 2013 20:39:21 +0000 (13:39 -0700)] 
lighter default navbar, add borders to navbars, tweak padding and alignments

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 13 Aug 2013 20:17:01 +0000 (13:17 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9431: specify font-size in dropdown menus to avoid inheritance issues
Mark Otto [Tue, 13 Aug 2013 20:16:56 +0000 (13:16 -0700)] 
fixes #9431: specify font-size in dropdown menus to avoid inheritance issues

11 years agoMerge pull request #9427 from saiwang/fix-example-snippet
Mark Otto [Tue, 13 Aug 2013 20:13:57 +0000 (13:13 -0700)] 
Merge pull request #9427 from saiwang/fix-example-snippet

fix mixin code example

11 years agofix mixin code example 9427/head
saiwang [Tue, 13 Aug 2013 18:23:44 +0000 (02:23 +0800)] 
fix mixin code example

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 13 Aug 2013 18:15:46 +0000 (11:15 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9425: focused input in docs gets actual focus styles
Mark Otto [Tue, 13 Aug 2013 18:15:36 +0000 (11:15 -0700)] 
fixes #9425: focused input in docs gets actual focus styles

11 years agoMerge pull request #9404 from twbs/bs3_drop_accordion_for_panel
Mark Otto [Tue, 13 Aug 2013 17:44:43 +0000 (10:44 -0700)] 
Merge pull request #9404 from twbs/bs3_drop_accordion_for_panel

BS3: Drop the accordion for the panel (fixes #8648)

11 years agoMerge branch '3.0.0-wip' into bs3_drop_accordion_for_panel 9404/head
Mark Otto [Tue, 13 Aug 2013 17:36:38 +0000 (10:36 -0700)] 
Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel

Conflicts:
dist/css/bootstrap.min.css

11 years agoMerge pull request #9410 from ggam/pagination-size
Mark Otto [Tue, 13 Aug 2013 17:35:24 +0000 (10:35 -0700)] 
Merge pull request #9410 from ggam/pagination-size

Added pagination-size mixin

11 years agoMerge pull request #9421 from ggam/input-size
Mark Otto [Tue, 13 Aug 2013 17:35:04 +0000 (10:35 -0700)] 
Merge pull request #9421 from ggam/input-size

Added input-size mixin

11 years agoMerge pull request #9424 from twbs/bs3_btn_groups
Mark Otto [Tue, 13 Aug 2013 17:31:29 +0000 (10:31 -0700)] 
Merge pull request #9424 from twbs/bs3_btn_groups

BS3: `.btn-group`s for your `.btn-group`s

11 years agoenable button groups in vertical button groups 9424/head
Mark Otto [Tue, 13 Aug 2013 17:24:18 +0000 (10:24 -0700)] 
enable button groups in vertical button groups

11 years agoAdded input-size mixin 9421/head
ggam [Tue, 13 Aug 2013 17:06:02 +0000 (19:06 +0200)] 
Added input-size mixin

11 years agoderp
Mark Otto [Tue, 13 Aug 2013 16:59:38 +0000 (09:59 -0700)] 
derp

11 years agoMerge pull request #9418 from BBosman/fix-9415
Mark Otto [Tue, 13 Aug 2013 16:57:18 +0000 (09:57 -0700)] 
Merge pull request #9418 from BBosman/fix-9415

Fixes #9415

11 years agoMerge pull request #9420 from saiwang/patch-highlight-hint
Chris Rebert [Tue, 13 Aug 2013 16:42:35 +0000 (09:42 -0700)] 
Merge pull request #9420 from saiwang/patch-highlight-hint

patch highlighting hint

11 years agopatch highlighting hint 9420/head
saiwang [Tue, 13 Aug 2013 16:21:07 +0000 (00:21 +0800)] 
patch highlighting hint

11 years agoFixes #9415 9418/head
Bas Bosman [Tue, 13 Aug 2013 16:09:38 +0000 (18:09 +0200)] 
Fixes #9415

11 years agoFixed errors 9410/head
Guillermo González de Agüero [Tue, 13 Aug 2013 12:25:05 +0000 (14:25 +0200)] 
Fixed errors

11 years agoAdded pagination-size mixin
ggam [Tue, 13 Aug 2013 11:27:45 +0000 (13:27 +0200)] 
Added pagination-size mixin

11 years agofixes #8985: only specify minified dist files for bower
Mark Otto [Tue, 13 Aug 2013 07:04:58 +0000 (00:04 -0700)] 
fixes #8985: only specify minified dist files for bower

11 years agofix negative indenting in button group for nested button groups
Mark Otto [Tue, 13 Aug 2013 06:44:50 +0000 (23:44 -0700)] 
fix negative indenting in button group for nested button groups

11 years agocopy
Mark Otto [Tue, 13 Aug 2013 06:38:52 +0000 (23:38 -0700)] 
copy

11 years agoDrop the accordion for the panel
Mark Otto [Tue, 13 Aug 2013 06:36:25 +0000 (23:36 -0700)] 
Drop the accordion for the panel

* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations

11 years agomention fubared state of overflow hidden on body in android and iOS to fix #8975...
Mark Otto [Tue, 13 Aug 2013 05:47:19 +0000 (22:47 -0700)] 
mention fubared state of overflow hidden on body in android and iOS to fix #8975 and #9315

11 years agoMerge pull request #9389 from twbs/emphasize-git-HEAD
Mark Otto [Tue, 13 Aug 2013 05:29:25 +0000 (22:29 -0700)] 
Merge pull request #9389 from twbs/emphasize-git-HEAD

Emphasize git HEAD downloads

11 years agoinvert dropdown styles in navbar for inverse variation
Mark Otto [Tue, 13 Aug 2013 04:43:59 +0000 (21:43 -0700)] 
invert dropdown styles in navbar for inverse variation

11 years agoMerge branch '3.0.0-wip' into bs3_navbar_overhaul
Mark Otto [Tue, 13 Aug 2013 04:34:55 +0000 (21:34 -0700)] 
Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Conflicts:
components.html
dist/css/bootstrap.min.css

11 years agoMerge pull request #9396 from twbs/docs-html-validation
Mark Otto [Tue, 13 Aug 2013 04:30:57 +0000 (21:30 -0700)] 
Merge pull request #9396 from twbs/docs-html-validation

add HTML5 validation of docs pages to the build

11 years agofinish fixing #9295: add button group buttons to new input group sizing
Mark Otto [Tue, 13 Aug 2013 04:27:15 +0000 (21:27 -0700)] 
finish fixing #9295: add button group buttons to new input group sizing

11 years agofixes #9400: add box-sizing to pseudo elements as well
Mark Otto [Tue, 13 Aug 2013 04:26:43 +0000 (21:26 -0700)] 
fixes #9400: add box-sizing to pseudo elements as well

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Tue, 13 Aug 2013 04:23:53 +0000 (21:23 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoNavbar refactor
Mark Otto [Tue, 13 Aug 2013 04:23:28 +0000 (21:23 -0700)] 
Navbar refactor

* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs