]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMerge pull request #8404 from cvrebert/alert-variant
Mark Otto [Mon, 8 Jul 2013 01:25:17 +0000 (18:25 -0700)] 
Merge pull request #8404 from cvrebert/alert-variant

extract .alert-variant mix-in

12 years agoextract .alert-variant mix-in 8404/head
Chris Rebert [Sun, 7 Jul 2013 05:01:34 +0000 (22:01 -0700)] 
extract .alert-variant mix-in

12 years agoRemove more Glyphicons
Mark Otto [Fri, 5 Jul 2013 19:27:54 +0000 (14:27 -0500)] 
Remove more Glyphicons

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 5 Jul 2013 19:24:40 +0000 (14:24 -0500)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8378 from liuyl/aftertosibling
Mark Otto [Fri, 5 Jul 2013 19:23:14 +0000 (12:23 -0700)] 
Merge pull request #8378 from liuyl/aftertosibling

optimize breadcrumb

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 5 Jul 2013 19:22:46 +0000 (14:22 -0500)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #8390 from liuyl/typeahead
Mark Otto [Fri, 5 Jul 2013 19:21:49 +0000 (12:21 -0700)] 
Merge pull request #8390 from liuyl/typeahead

delete typeahead style

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 5 Jul 2013 19:21:33 +0000 (14:21 -0500)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMove `hr` to scaffolding.less (out of type.less) and simplify styles
Mark Otto [Fri, 5 Jul 2013 19:21:05 +0000 (14:21 -0500)] 
Move `hr` to scaffolding.less (out of type.less) and simplify styles

12 years agoMerge pull request #8392 from liuyl/refactpagination
Mark Otto [Fri, 5 Jul 2013 19:19:31 +0000 (12:19 -0700)] 
Merge pull request #8392 from liuyl/refactpagination

refactor pagination.less

12 years agoAdd tfoot back (addresses more than #8387)
Mark Otto [Fri, 5 Jul 2013 19:15:00 +0000 (14:15 -0500)] 
Add tfoot back (addresses more than #8387)

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 5 Jul 2013 19:13:24 +0000 (14:13 -0500)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoRemove further mentions of Glyphicons
Mark Otto [Fri, 5 Jul 2013 19:11:12 +0000 (14:11 -0500)] 
Remove further mentions of Glyphicons

12 years agorefactor pagination 8392/head
liuyl [Fri, 5 Jul 2013 12:18:57 +0000 (20:18 +0800)] 
refactor pagination

12 years agorefactor pagination
liuyl [Fri, 5 Jul 2013 12:17:20 +0000 (20:17 +0800)] 
refactor pagination

12 years agodelete typeahead style 8390/head
liuyl [Fri, 5 Jul 2013 07:09:16 +0000 (15:09 +0800)] 
delete typeahead style

12 years agoMerge pull request #8370 from cvrebert/tables-nesting
Mark Otto [Thu, 4 Jul 2013 02:39:29 +0000 (19:39 -0700)] 
Merge pull request #8370 from cvrebert/tables-nesting

refactor tables.less to use nesting more

12 years agouse sibling selector instead of pseudo selector 8378/head
liuyl [Wed, 3 Jul 2013 12:37:36 +0000 (20:37 +0800)] 
use sibling selector instead of pseudo selector

12 years agorefactor tables.less to use nesting more 8370/head
Chris Rebert [Tue, 2 Jul 2013 18:25:57 +0000 (11:25 -0700)] 
refactor tables.less to use nesting more

12 years agocomma for the guardian angel /cc @cvrebert
Mark Otto [Tue, 2 Jul 2013 03:18:44 +0000 (20:18 -0700)] 
comma for the guardian angel /cc @cvrebert

12 years agoMerge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip...
Mark Otto [Tue, 2 Jul 2013 03:06:16 +0000 (20:06 -0700)] 
Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables

Conflicts:
less/mixins.less

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 2 Jul 2013 02:49:49 +0000 (19:49 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick
Mark Otto [Tue, 2 Jul 2013 02:49:29 +0000 (19:49 -0700)] 
Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick

12 years agoMerge pull request #8348 from Rowno/compiled-font-shorthand
Mark Otto [Tue, 2 Jul 2013 02:43:15 +0000 (19:43 -0700)] 
Merge pull request #8348 from Rowno/compiled-font-shorthand

Prevent the font shorthand from getting compiled as division

12 years agofixes #8345: use inline-block on .img-responsive
Mark Otto [Tue, 2 Jul 2013 02:42:26 +0000 (19:42 -0700)] 
fixes #8345: use inline-block on .img-responsive

12 years agoMerge pull request #8352 from liuyl/simplifytable
Mark Otto [Tue, 2 Jul 2013 01:23:17 +0000 (18:23 -0700)] 
Merge pull request #8352 from liuyl/simplifytable

simplify tables.less

12 years agofixes #8068: add .help-block to form field state mixin
Mark Otto [Tue, 2 Jul 2013 01:21:19 +0000 (18:21 -0700)] 
fixes #8068: add .help-block to form field state mixin

12 years agofixes #7367: slightly larger carousel indicators
Mark Otto [Tue, 2 Jul 2013 01:16:59 +0000 (18:16 -0700)] 
fixes #7367: slightly larger carousel indicators

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 2 Jul 2013 00:32:14 +0000 (17:32 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMake more components mixin-friendly
Mark Otto [Tue, 2 Jul 2013 00:32:07 +0000 (17:32 -0700)] 
Make more components mixin-friendly

12 years agoFix responsive utilities for table elements 8358/head
Julian Thilo [Mon, 1 Jul 2013 19:13:57 +0000 (21:13 +0200)] 
Fix responsive utilities for table elements

This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin

12 years agosimplify tables.less 8352/head
liuyl [Mon, 1 Jul 2013 12:29:41 +0000 (20:29 +0800)] 
simplify tables.less

12 years agoPrevent the font shorthand from getting compiled as division 8348/head
Roland Warmerdam [Sun, 30 Jun 2013 22:51:08 +0000 (10:51 +1200)] 
Prevent the font shorthand from getting compiled as division

12 years agoMerge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
Mark Otto [Sun, 30 Jun 2013 00:29:19 +0000 (17:29 -0700)] 
Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links

Docs: Fix broken links to navbar component in examples pages

12 years agoMerge pull request #8341 from Quy/3.0.0-wip
Mark Otto [Sun, 30 Jun 2013 00:29:01 +0000 (17:29 -0700)] 
Merge pull request #8341 from Quy/3.0.0-wip

Remove references to fonts

12 years agoMerge pull request #8343 from frabrunelle/reset-left-padding
Mark Otto [Sun, 30 Jun 2013 00:28:06 +0000 (17:28 -0700)] 
Merge pull request #8343 from frabrunelle/reset-left-padding

reset left padding for .media-list, .pagination and .pager

12 years agoreset left padding for .media-list, .pagination and .pager 8343/head
Francis Brunelle [Sat, 29 Jun 2013 20:06:14 +0000 (16:06 -0400)] 
reset left padding for .media-list, .pagination and .pager

12 years agoRemove references to fonts 8341/head
Quy Ton [Sat, 29 Jun 2013 14:37:53 +0000 (07:37 -0700)] 
Remove references to fonts

12 years agoFixes broken links to navbar component in docs. 8339/head 8340/head
John O'Nolan [Sat, 29 Jun 2013 11:21:16 +0000 (13:21 +0200)] 
Fixes broken links to navbar component in docs.

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 28 Jun 2013 16:25:02 +0000 (09:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoNuke hella things
Mark Otto [Fri, 28 Jun 2013 16:24:46 +0000 (09:24 -0700)] 
Nuke hella things

* Any mentions of .btn-mini
* Old docs page that somehow found it's way back

12 years agoMerge pull request #8336 from guilbep/3.0.0-wip
Mark Otto [Fri, 28 Jun 2013 16:20:02 +0000 (09:20 -0700)] 
Merge pull request #8336 from guilbep/3.0.0-wip

removing bootstrap-fonts rule in Makefile for bootstrap rule

12 years agoremoving useless space 8336/head
Pierre Guilbert [Fri, 28 Jun 2013 12:19:46 +0000 (14:19 +0200)] 
removing useless space

12 years agoremoving bootstrap-fonts rule in Makefile for bootstrap rule
Pierre Guilbert [Fri, 28 Jun 2013 12:09:46 +0000 (14:09 +0200)] 
removing bootstrap-fonts rule in Makefile for bootstrap rule

12 years agoOverall responsive `img` styles
Mark Otto [Fri, 28 Jun 2013 07:09:10 +0000 (00:09 -0700)] 
Overall responsive `img` styles

`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.

12 years agoRun make on JS
Mark Otto [Fri, 28 Jun 2013 07:08:19 +0000 (00:08 -0700)] 
Run make on JS

12 years agoupdate close button example display
Mark Otto [Fri, 28 Jun 2013 06:26:04 +0000 (23:26 -0700)] 
update close button example display

12 years agoMerge pull request #7424 from sody/3.0.0-wip
Jacob [Fri, 28 Jun 2013 05:36:33 +0000 (22:36 -0700)] 
Merge pull request #7424 from sody/3.0.0-wip

Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.

12 years agofixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just...
Mark Otto [Fri, 28 Jun 2013 03:50:00 +0000 (20:50 -0700)] 
fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly

12 years agoremove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature...
Mark Otto [Fri, 28 Jun 2013 03:49:29 +0000 (20:49 -0700)] 
remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s

12 years agorun make on last commit
Mark Otto [Fri, 28 Jun 2013 03:18:16 +0000 (20:18 -0700)] 
run make on last commit

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 28 Jun 2013 03:17:59 +0000 (20:17 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #7995 from hrach/patch-3
Mark Otto [Fri, 28 Jun 2013 03:17:48 +0000 (20:17 -0700)] 
Merge pull request #7995 from hrach/patch-3

Fixed mixin btn-pseudo-state background for [disabled] buttons

12 years agofixes #7977: prevent some table bullshit on input groups
Mark Otto [Fri, 28 Jun 2013 03:15:44 +0000 (20:15 -0700)] 
fixes #7977: prevent some table bullshit on input groups

12 years agoupdate grid col mixin to use latest css from grid cols
Mark Otto [Fri, 28 Jun 2013 02:54:30 +0000 (19:54 -0700)] 
update grid col mixin to use latest css from grid cols

12 years agofixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout...
Mark Otto [Fri, 28 Jun 2013 02:36:56 +0000 (19:36 -0700)] 
fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR

12 years agomake on js i guess? /cc @fat
Mark Otto [Fri, 28 Jun 2013 02:36:35 +0000 (19:36 -0700)] 
make on js i guess? /cc @fat

12 years agoremove glyphicons from compiled css
Mark Otto [Fri, 28 Jun 2013 02:36:09 +0000 (19:36 -0700)] 
remove glyphicons from compiled css

12 years agofix broke js markup
Mark Otto [Fri, 28 Jun 2013 02:33:26 +0000 (19:33 -0700)] 
fix broke js markup

12 years agofix makefile
Mark Otto [Fri, 28 Jun 2013 02:27:44 +0000 (19:27 -0700)] 
fix makefile

12 years agoMerge pull request #8332 from twitter/bs3_remove_icons
Mark Otto [Fri, 28 Jun 2013 02:23:55 +0000 (19:23 -0700)] 
Merge pull request #8332 from twitter/bs3_remove_icons

BS3: Remove Glyphicons

12 years agoadd docs callout for glyphicons on homepage and CSS page 8332/head
Mark Otto [Fri, 28 Jun 2013 02:22:11 +0000 (19:22 -0700)] 
add docs callout for glyphicons on homepage and CSS page

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Fri, 28 Jun 2013 02:19:57 +0000 (19:19 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #6982
fat [Fri, 28 Jun 2013 02:19:22 +0000 (19:19 -0700)] 
fixes #6982

12 years agoremove glyphicons from demo component
Mark Otto [Fri, 28 Jun 2013 01:51:06 +0000 (18:51 -0700)] 
remove glyphicons from demo component

12 years agodelete icons in assets
Mark Otto [Fri, 28 Jun 2013 01:49:59 +0000 (18:49 -0700)] 
delete icons in assets

12 years agoremove icons from sidenav
Mark Otto [Fri, 28 Jun 2013 01:49:37 +0000 (18:49 -0700)] 
remove icons from sidenav

12 years agoMerge branch '3.0.0-wip' into bs3_remove_icons
Mark Otto [Fri, 28 Jun 2013 01:49:05 +0000 (18:49 -0700)] 
Merge branch '3.0.0-wip' into bs3_remove_icons

Conflicts:
docs/components.html

12 years agouse collapse in dropdown js example
fat [Fri, 28 Jun 2013 01:47:35 +0000 (18:47 -0700)] 
use collapse in dropdown js example

12 years agoAdd parens so sublime picks up on syntax highlighting
Mark Otto [Fri, 28 Jun 2013 01:45:08 +0000 (18:45 -0700)] 
Add parens so sublime picks up on syntax highlighting

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 28 Jun 2013 01:43:54 +0000 (18:43 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8329: add `!important` to `.hidden`
Mark Otto [Fri, 28 Jun 2013 01:43:29 +0000 (18:43 -0700)] 
Fixes #8329: add `!important` to `.hidden`

12 years agoMerge pull request #8307 from cvrebert/8287-docs-patch
Mark Otto [Fri, 28 Jun 2013 01:38:34 +0000 (18:38 -0700)] 
Merge pull request #8307 from cvrebert/8287-docs-patch

Fix #8287

12 years agoremove custom url in jekyll
Mark Otto [Fri, 28 Jun 2013 01:38:00 +0000 (18:38 -0700)] 
remove custom url in jekyll

12 years agoMerge pull request #8313 from jholl/patch-1
Mark Otto [Wed, 26 Jun 2013 18:42:04 +0000 (11:42 -0700)] 
Merge pull request #8313 from jholl/patch-1

typo: match doc text and example

12 years agoMerge pull request #8306 from cvrebert/styling-n-typo
Mark Otto [Wed, 26 Jun 2013 18:20:14 +0000 (11:20 -0700)] 
Merge pull request #8306 from cvrebert/styling-n-typo

Docs: fix 1 typo; use <code> in 1 place

12 years agoMerge pull request #8305 from cvrebert/copyedit
Mark Otto [Wed, 26 Jun 2013 18:19:43 +0000 (11:19 -0700)] 
Merge pull request #8305 from cvrebert/copyedit

copyedit JS docs

12 years agotypo: match doc text and example 8313/head
James Holland [Wed, 26 Jun 2013 12:27:12 +0000 (08:27 -0400)] 
typo: match doc text and example

12 years agoFix #8287 8307/head
Chris Rebert [Wed, 26 Jun 2013 03:18:30 +0000 (20:18 -0700)] 
Fix #8287

12 years agoDocs: fix 1 typo; use <code> in 1 place 8306/head
Chris Rebert [Wed, 26 Jun 2013 02:50:37 +0000 (19:50 -0700)] 
Docs: fix 1 typo; use <code> in 1 place

12 years agocopyedit JS docs 8305/head
Chris Rebert [Wed, 26 Jun 2013 02:32:17 +0000 (19:32 -0700)] 
copyedit JS docs

12 years agoMerge pull request #8301 from cvrebert/patch-3
Mark Otto [Wed, 26 Jun 2013 00:11:31 +0000 (17:11 -0700)] 
Merge pull request #8301 from cvrebert/patch-3

Fix spelling in comment

12 years agoMerge pull request #8300 from cvrebert/patch-2
Mark Otto [Wed, 26 Jun 2013 00:11:20 +0000 (17:11 -0700)] 
Merge pull request #8300 from cvrebert/patch-2

Fix typo in comment

12 years agoMerge pull request #8299 from cvrebert/patch-1
Mark Otto [Wed, 26 Jun 2013 00:10:59 +0000 (17:10 -0700)] 
Merge pull request #8299 from cvrebert/patch-1

Spelling in comment

12 years agoMerge pull request #8303 from cvrebert/patch-4
Mark Otto [Wed, 26 Jun 2013 00:10:34 +0000 (17:10 -0700)] 
Merge pull request #8303 from cvrebert/patch-4

Fix 2 typos

12 years agoMerge pull request #8304 from cvrebert/patch-5
Mark Otto [Wed, 26 Jun 2013 00:09:52 +0000 (17:09 -0700)] 
Merge pull request #8304 from cvrebert/patch-5

rm :invalid styling from docs

12 years agorm :invalid styling from docs 8304/head
Chris Rebert [Tue, 25 Jun 2013 23:31:12 +0000 (16:31 -0700)] 
rm :invalid styling from docs

It was removed from the code in 90d4343f66d1cdafe24b6de0dbb6ae64312df323  :-/

12 years agoFix 2 typos 8303/head
Chris Rebert [Tue, 25 Jun 2013 23:07:51 +0000 (17:07 -0600)] 
Fix 2 typos

12 years agoFix spelling in comment 8301/head
Chris Rebert [Tue, 25 Jun 2013 23:05:26 +0000 (17:05 -0600)] 
Fix spelling in comment

12 years agoFix typo in comment 8300/head
Chris Rebert [Tue, 25 Jun 2013 23:03:57 +0000 (17:03 -0600)] 
Fix typo in comment

12 years agoSpelling in comment 8299/head
Chris Rebert [Tue, 25 Jun 2013 23:01:46 +0000 (17:01 -0600)] 
Spelling in comment

12 years agoMerge pull request #8297 from cvrebert/patch-1
Mark Otto [Tue, 25 Jun 2013 21:57:41 +0000 (14:57 -0700)] 
Merge pull request #8297 from cvrebert/patch-1

rm pre{white-space:pre-wrap;} since redundant to Normalize

12 years agoMerge pull request #8298 from cvrebert/patch-2
Mark Otto [Tue, 25 Jun 2013 21:57:17 +0000 (14:57 -0700)] 
Merge pull request #8298 from cvrebert/patch-2

rm fallback white-space for <code>

12 years agorm fallback white-space for <code> 8298/head
Chris Rebert [Tue, 25 Jun 2013 21:53:48 +0000 (15:53 -0600)] 
rm fallback white-space for <code>

If my analysis is right, this should be unnecessary.

12 years agorm pre{white-space:pre-wrap;} since redundant to Normalize.css 8297/head
Chris Rebert [Tue, 25 Jun 2013 21:48:57 +0000 (14:48 -0700)] 
rm pre{white-space:pre-wrap;} since redundant to Normalize.css

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