]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoupgrade to html5shiv v 3.7.0
Chris Rebert [Wed, 16 Oct 2013 22:36:14 +0000 (15:36 -0700)] 
upgrade to html5shiv v 3.7.0

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Wed, 16 Oct 2013 17:44:03 +0000 (10:44 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoredo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik
Mark Otto [Wed, 16 Oct 2013 17:43:56 +0000 (10:43 -0700)] 
redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik

11 years agoMerge pull request #11128 from lipis/patch-3
Julian Thilo [Wed, 16 Oct 2013 16:34:27 +0000 (09:34 -0700)] 
Merge pull request #11128 from lipis/patch-3

Fixed broken link in README.md

11 years agoFixed broken link 11128/head
Lipis [Wed, 16 Oct 2013 14:42:32 +0000 (16:42 +0200)] 
Fixed broken link

11 years agoadd dots to class name references for consistency
Chris Rebert [Wed, 16 Oct 2013 00:25:34 +0000 (17:25 -0700)] 
add dots to class name references for consistency

11 years agoMerge pull request #11110 from nikolawannabe/patch-1
Mark Otto [Wed, 16 Oct 2013 00:07:22 +0000 (17:07 -0700)] 
Merge pull request #11110 from nikolawannabe/patch-1

Include a note about text-based form control styling

11 years agoInclude a note about text-based form control styling 11110/head
Case Talbot [Wed, 16 Oct 2013 00:02:21 +0000 (17:02 -0700)] 
Include a note about text-based form control styling

fixes #8824.

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 15 Oct 2013 21:11:29 +0000 (14:11 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoupdate jumbotron docs; fixes #11109
Mark Otto [Tue, 15 Oct 2013 21:11:21 +0000 (14:11 -0700)] 
update jumbotron docs; fixes #11109

11 years agoMerge pull request #11105 from twbs/license-note
Mark Otto [Tue, 15 Oct 2013 20:12:46 +0000 (13:12 -0700)] 
Merge pull request #11105 from twbs/license-note

Add notes about dual-licensing contributions before switching to MIT in v3.1

11 years agoAdd Note About Changing to MIT 11105/head
Rhodry Korb [Wed, 21 Aug 2013 14:47:22 +0000 (22:47 +0800)] 
Add Note About Changing to MIT

11 years agoMerge pull request #11102 from ZDroid/less-fix
Mark Otto [Tue, 15 Oct 2013 18:19:24 +0000 (11:19 -0700)] 
Merge pull request #11102 from ZDroid/less-fix

Ditch `&`, as `+ ...` is enought

11 years agoDitch `&`, as `+ ...` is enought 11102/head
Zlatan Vasović [Tue, 15 Oct 2013 15:35:11 +0000 (17:35 +0200)] 
Ditch `&`, as `+ ...` is enought

11 years agonuke commented out docs css
Mark Otto [Tue, 15 Oct 2013 05:08:23 +0000 (22:08 -0700)] 
nuke commented out docs css

11 years agorun grunt
Chris Rebert [Tue, 15 Oct 2013 03:47:56 +0000 (20:47 -0700)] 
run grunt

11 years agofix #10952
Chris Rebert [Tue, 15 Oct 2013 03:45:43 +0000 (20:45 -0700)] 
fix #10952

11 years agoMerge pull request #11094 from twbs/address-10049
Mark Otto [Tue, 15 Oct 2013 03:21:17 +0000 (20:21 -0700)] 
Merge pull request #11094 from twbs/address-10049

Recommend only <div> (not <span>) for putting tooltips on disabled elements

11 years agoIn docs, recommend only <div> (not <span>) for putting tooltips on disabled elements 11094/head
Chris Rebert [Tue, 15 Oct 2013 03:10:35 +0000 (20:10 -0700)] 
In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements

Per issue comments, `display: inline` elements like <span> don't work for this.
Resolves #10049

11 years agoMerge pull request #10533 from topsitemakers/master
Mark Otto [Tue, 15 Oct 2013 02:56:33 +0000 (19:56 -0700)] 
Merge pull request #10533 from topsitemakers/master

adding required attribute for example signin form

11 years agoMerge pull request #10519 from zba/master
Chris Rebert [Tue, 15 Oct 2013 02:14:58 +0000 (19:14 -0700)] 
Merge pull request #10519 from zba/master

changed attr('data-target') to data('target');

11 years agoMerge pull request #10779 from ssorallen/customizer-bootstrap-less-order
Chris Rebert [Tue, 15 Oct 2013 01:56:10 +0000 (18:56 -0700)] 
Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order

Use bootstrap.less file order in Customizer

11 years agoadd IDs to frequently-referenced parts of the docs
Chris Rebert [Mon, 14 Oct 2013 23:23:20 +0000 (16:23 -0700)] 
add IDs to frequently-referenced parts of the docs

11 years agoMerge pull request #11091 from yokomizor/extended_thumbnail_hover_state
Mark Otto [Mon, 14 Oct 2013 23:14:28 +0000 (16:14 -0700)] 
Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state

Extended hover state of linked versions of .thumbnail

11 years agoextended hover state of linked versions of .thumbnail 11091/head
Rogério Yokomizo [Mon, 14 Oct 2013 23:10:49 +0000 (20:10 -0300)] 
extended hover state of linked versions of .thumbnail

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 20:45:57 +0000 (13:45 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
dist/css/bootstrap.min.css

11 years agounnest the list-group-item link variation for #11085 and #11088
Mark Otto [Mon, 14 Oct 2013 20:45:32 +0000 (13:45 -0700)] 
unnest the list-group-item link variation for #11085 and #11088

11 years agoMerge pull request #11084 from ZDroid/variable_way
Mark Otto [Mon, 14 Oct 2013 18:33:27 +0000 (11:33 -0700)] 
Merge pull request #11084 from ZDroid/variable_way

Unhardcode .table-responsive bottom margin

11 years agoMerge pull request #11086 from twbs/table-responsive-breakpoint
Mark Otto [Mon, 14 Oct 2013 18:32:46 +0000 (11:32 -0700)] 
Merge pull request #11086 from twbs/table-responsive-breakpoint

fix .table-responsive media query; refs #11067

11 years agofix about page html validation and run grunt
Mark Otto [Mon, 14 Oct 2013 18:30:06 +0000 (11:30 -0700)] 
fix about page html validation and run grunt

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 18:06:25 +0000 (11:06 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
getting-started.html

11 years agoremove dupe content
Mark Otto [Mon, 14 Oct 2013 18:05:49 +0000 (11:05 -0700)] 
remove dupe content

11 years agofix .table-responsive media query; refs #11067 11086/head
Chris Rebert [Mon, 14 Oct 2013 17:58:12 +0000 (10:58 -0700)] 
fix .table-responsive media query; refs #11067

11 years agoUnhardcode .table-responsive bottom margin 11084/head
Zlatan Vasović [Mon, 14 Oct 2013 16:22:31 +0000 (18:22 +0200)] 
Unhardcode .table-responsive bottom margin

11 years agoMerge pull request #11078 from twbs/issue-11019-note
Mark Otto [Mon, 14 Oct 2013 16:09:02 +0000 (09:09 -0700)] 
Merge pull request #11078 from twbs/issue-11019-note

add note to docs about Respond.js & file:// ; fixes part of #11019

11 years agoMerge pull request #11082 from ZDroid/nuke_zeros
Mark Otto [Mon, 14 Oct 2013 16:08:28 +0000 (09:08 -0700)] 
Merge pull request #11082 from ZDroid/nuke_zeros

Nuke trailing zeros

11 years agoNuke trailing zeros 11082/head
Zlatan Vasović [Mon, 14 Oct 2013 13:06:58 +0000 (15:06 +0200)] 
Nuke trailing zeros

11 years agoMerge pull request #11079 from wangsai/mother-language
Chris Rebert [Mon, 14 Oct 2013 08:21:26 +0000 (01:21 -0700)] 
Merge pull request #11079 from wangsai/mother-language

change english link text to chinese

11 years agoAdd description. And complete russian and spanish languages 11079/head
wangsai [Mon, 14 Oct 2013 08:04:48 +0000 (16:04 +0800)] 
Add description. And complete russian and spanish languages

11 years agomake Getting Started page's HTML more valid
Chris Rebert [Mon, 14 Oct 2013 07:40:51 +0000 (00:40 -0700)] 
make Getting Started page's HTML more valid

11 years agomake About page's HTML more valid
Chris Rebert [Mon, 14 Oct 2013 07:38:19 +0000 (00:38 -0700)] 
make About page's HTML more valid

11 years agoadd note to docs about Respond.js & file:// ; fixes part of #11019 11078/head
Chris Rebert [Mon, 14 Oct 2013 06:50:20 +0000 (23:50 -0700)] 
add note to docs about Respond.js & file:// ; fixes part of #11019

11 years agochange english link text to chinese
wangsai [Mon, 14 Oct 2013 06:52:53 +0000 (14:52 +0800)] 
change english link text to chinese

11 years agoupdate to latest jszip
Chris Rebert [Mon, 14 Oct 2013 06:37:14 +0000 (23:37 -0700)] 
update to latest jszip
commit 04fc93045334dc1b679aba5c2dce206da777a85c
2013-10-12T12:39:56-07:00

11 years agoMerge pull request #11076 from twbs/respond-js-cdn
Chris Rebert [Mon, 14 Oct 2013 06:26:28 +0000 (23:26 -0700)] 
Merge pull request #11076 from twbs/respond-js-cdn

use CDN for respond.js

11 years agoMerge pull request #11077 from twbs/avoid-docs-assets-in-example
Mark Otto [Mon, 14 Oct 2013 06:25:23 +0000 (23:25 -0700)] 
Merge pull request #11077 from twbs/avoid-docs-assets-in-example

avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js

11 years agoMerge pull request #11075 from twbs/respond-js-cross-domain-note
Mark Otto [Mon, 14 Oct 2013 06:24:35 +0000 (23:24 -0700)] 
Merge pull request #11075 from twbs/respond-js-cross-domain-note

fix #11003

11 years agoavoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for... 11077/head
Chris Rebert [Mon, 14 Oct 2013 06:23:04 +0000 (23:23 -0700)] 
avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js

11 years agoMerge branch 'docs_welcome'
Mark Otto [Mon, 14 Oct 2013 06:19:17 +0000 (23:19 -0700)] 
Merge branch 'docs_welcome'

11 years agoadd translations, copy edit a few things, and fix alignment of ads
Mark Otto [Mon, 14 Oct 2013 06:19:11 +0000 (23:19 -0700)] 
add translations, copy edit a few things, and fix alignment of ads

11 years agouse CDN for respond.js 11076/head
Chris Rebert [Mon, 14 Oct 2013 06:18:30 +0000 (23:18 -0700)] 
use CDN for respond.js

11 years agofix #11003 11075/head
Chris Rebert [Mon, 14 Oct 2013 05:55:50 +0000 (22:55 -0700)] 
fix #11003

11 years agoMerge pull request #11046 from ZDroid/patch-3
Mark Otto [Mon, 14 Oct 2013 03:26:36 +0000 (20:26 -0700)] 
Merge pull request #11046 from ZDroid/patch-3

Nicer docs license name

11 years agorun grunt
Mark Otto [Mon, 14 Oct 2013 03:12:07 +0000 (20:12 -0700)] 
run grunt

11 years agono trailing decimal place
Mark Otto [Mon, 14 Oct 2013 03:04:28 +0000 (20:04 -0700)] 
no trailing decimal place

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 03:04:00 +0000 (20:04 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #10949 from StevenBlack/jumbotron.fontsize
Mark Otto [Mon, 14 Oct 2013 03:03:02 +0000 (20:03 -0700)] 
Merge pull request #10949 from StevenBlack/jumbotron.fontsize

Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...

11 years agoscope top padding of .form-control-static to be within horizontal forms only; fixes...
Mark Otto [Mon, 14 Oct 2013 03:02:24 +0000 (20:02 -0700)] 
scope top padding of .form-control-static to be within horizontal forms only; fixes #10927

11 years agomove .hidden to utilities; fixes #10997
Mark Otto [Mon, 14 Oct 2013 02:59:42 +0000 (19:59 -0700)] 
move .hidden to utilities; fixes #10997

11 years agorun grunt on that scaffolding change
Mark Otto [Mon, 14 Oct 2013 02:57:45 +0000 (19:57 -0700)] 
run grunt on that scaffolding change

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 02:57:23 +0000 (19:57 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agofix #10257
Mark Otto [Mon, 14 Oct 2013 02:57:14 +0000 (19:57 -0700)] 
fix #10257

11 years agoMerge pull request #10955 from ZDroid/patch-1
Mark Otto [Mon, 14 Oct 2013 02:41:12 +0000 (19:41 -0700)] 
Merge pull request #10955 from ZDroid/patch-1

Insert comma to fix validation warning

11 years agoclarify more grid stuff, specifically 100% fluid designs; fixes #10711
Mark Otto [Mon, 14 Oct 2013 02:36:39 +0000 (19:36 -0700)] 
clarify more grid stuff, specifically 100% fluid designs; fixes #10711

11 years agomention rows must be in containers in grid docs
Mark Otto [Mon, 14 Oct 2013 02:31:39 +0000 (19:31 -0700)] 
mention rows must be in containers in grid docs

11 years agodocs notice for #11010
Mark Otto [Mon, 14 Oct 2013 02:24:13 +0000 (19:24 -0700)] 
docs notice for #11010

11 years agofollow up to #10102, cc @cvrebert
Mark Otto [Mon, 14 Oct 2013 02:12:23 +0000 (19:12 -0700)] 
follow up to #10102, cc @cvrebert

11 years agoadd docs example for #10938 to show responsive column clearing in grid
Mark Otto [Mon, 14 Oct 2013 02:10:17 +0000 (19:10 -0700)] 
add docs example for #10938 to show responsive column clearing in grid

11 years agoMerge pull request #11050 from twbs/restore_grid_mixins
Mark Otto [Mon, 14 Oct 2013 02:03:29 +0000 (19:03 -0700)] 
Merge pull request #11050 from twbs/restore_grid_mixins

Restore grid mixins

11 years agoMerge branch 'master' into restore_grid_mixins 11050/head
Mark Otto [Mon, 14 Oct 2013 01:59:40 +0000 (18:59 -0700)] 
Merge branch 'master' into restore_grid_mixins

Conflicts:
dist/css/bootstrap.min.css

11 years agocomment and spacing
Mark Otto [Mon, 14 Oct 2013 01:58:09 +0000 (18:58 -0700)] 
comment and spacing

11 years agodrop .tabbable since it's unused and undocumented /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:56:31 +0000 (18:56 -0700)] 
drop .tabbable since it's unused and undocumented /cc #10102

11 years agomention .invisible in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:56:03 +0000 (18:56 -0700)] 
mention .invisible in docs per #10102

11 years agomention .invisible in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:54:15 +0000 (18:54 -0700)] 
mention .invisible in docs per #10102

11 years agomention tooltip markup in docs per #10102
Mark Otto [Mon, 14 Oct 2013 01:49:13 +0000 (18:49 -0700)] 
mention tooltip markup in docs per #10102

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 14 Oct 2013 01:44:06 +0000 (18:44 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agomention .modal-open and .modal-backdrop in docs /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:43:19 +0000 (18:43 -0700)] 
mention .modal-open and .modal-backdrop in docs /cc #10102

11 years agomention .dropdown-backdrop and .open in dropdown docs /cc #10102
Mark Otto [Mon, 14 Oct 2013 01:40:47 +0000 (18:40 -0700)] 
mention .dropdown-backdrop and .open in dropdown docs /cc #10102

11 years agoMerge pull request #11016 from twbs/address-10965
Mark Otto [Mon, 14 Oct 2013 01:35:10 +0000 (18:35 -0700)] 
Merge pull request #11016 from twbs/address-10965

address #10965; mention Glyphicons-over-file:// problem in Carousel example

11 years agoMerge branch 'master' into restore_grid_mixins
Mark Otto [Mon, 14 Oct 2013 01:32:34 +0000 (18:32 -0700)] 
Merge branch 'master' into restore_grid_mixins

Conflicts:
dist/css/bootstrap.min.css

11 years agoanother grid .row mention
Mark Otto [Mon, 14 Oct 2013 00:25:27 +0000 (17:25 -0700)] 
another grid .row mention

11 years agofinish grid docs intro for now; needs work though
Mark Otto [Mon, 14 Oct 2013 00:12:04 +0000 (17:12 -0700)] 
finish grid docs intro for now; needs work though

11 years agomention .small in docs /cc #10102
Mark Otto [Sun, 13 Oct 2013 23:02:56 +0000 (16:02 -0700)] 
mention .small in docs /cc #10102

11 years agoremove undocumented and unsupported .pill-content and .pill-pane /cc #10102
Mark Otto [Sun, 13 Oct 2013 22:55:13 +0000 (15:55 -0700)] 
remove undocumented and unsupported .pill-content and .pill-pane /cc #10102

11 years agorun grunt dist on .small additions
Mark Otto [Sun, 13 Oct 2013 22:54:49 +0000 (15:54 -0700)] 
run grunt dist on .small additions

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Sun, 13 Oct 2013 22:24:48 +0000 (15:24 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoremove screen from all docs media queries
Mark Otto [Sun, 13 Oct 2013 22:24:39 +0000 (15:24 -0700)] 
remove screen from all docs media queries

11 years agoDocument caret /cc #10102
Mark Otto [Sun, 13 Oct 2013 22:23:58 +0000 (15:23 -0700)] 
Document caret /cc #10102

11 years agoSort dependencies A-Z
Zlatan Vasović [Sun, 13 Oct 2013 10:53:48 +0000 (12:53 +0200)] 
Sort dependencies A-Z

11 years agoMerge pull request #11059 from ZDroid/patch-5
Mark Otto [Sat, 12 Oct 2013 23:58:49 +0000 (16:58 -0700)] 
Merge pull request #11059 from ZDroid/patch-5

Add more functionality to .small to match <small>

11 years agoMerge pull request #10933 from ZDroid/patch-2
Mark Otto [Sat, 12 Oct 2013 22:35:07 +0000 (15:35 -0700)] 
Merge pull request #10933 from ZDroid/patch-2

Change border to border-radius

11 years agoAdd more functionality to .small 11059/head
Zlatan Vasović [Sat, 12 Oct 2013 21:28:50 +0000 (23:28 +0200)] 
Add more functionality to .small

11 years agorestore var to customizer
Mark Otto [Sat, 12 Oct 2013 05:01:11 +0000 (22:01 -0700)] 
restore var to customizer

11 years agoCombine separate efforts for grid mixins into one, cleanup and reorganize
Mark Otto [Sat, 12 Oct 2013 05:00:37 +0000 (22:00 -0700)] 
Combine separate efforts for grid mixins into one, cleanup and reorganize

11 years agoMerge pull request #11049 from alexdahl/multiple-modals-doc
Mark Otto [Sat, 12 Oct 2013 01:52:57 +0000 (18:52 -0700)] 
Merge pull request #11049 from alexdahl/multiple-modals-doc

documentation that multiple modals are not supported

11 years agodocumentation that multiple modals are not supported 11049/head
Alex Dahl [Sat, 12 Oct 2013 01:11:58 +0000 (18:11 -0700)] 
documentation that multiple modals are not supported

11 years agoNicer docs license name 11046/head
Zlatan Vasović [Fri, 11 Oct 2013 20:53:38 +0000 (22:53 +0200)] 
Nicer docs license name

DOCUMENTATION-LICENSE is so long.

11 years agoMerge pull request #11018 from twbs/use-https
Mark Otto [Thu, 10 Oct 2013 20:37:06 +0000 (13:37 -0700)] 
Merge pull request #11018 from twbs/use-https

use https:// for CDN links

11 years agofix typo in Getting Started docs prose
Chris Rebert [Thu, 10 Oct 2013 09:27:26 +0000 (02:27 -0700)] 
fix typo in Getting Started docs prose

11 years agouse https:// for CDN links 11018/head
Chris Rebert [Thu, 10 Oct 2013 08:51:09 +0000 (01:51 -0700)] 
use https:// for CDN links

- works when viewing page via file://
- sets a good example security-wise