]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agocomment tweaks and updating starter template
Mark Otto [Fri, 18 Jan 2013 04:28:05 +0000 (20:28 -0800)] 
comment tweaks and updating starter template

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Fri, 18 Jan 2013 04:23:33 +0000 (20:23 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less

12 years agoUpgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
Mark Otto [Mon, 14 Jan 2013 08:11:55 +0000 (00:11 -0800)] 
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Sun, 13 Jan 2013 12:26:52 +0000 (04:26 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json

12 years agofix username navbar text in fluid example for responsive variations
Mark Otto [Sat, 12 Jan 2013 08:20:13 +0000 (00:20 -0800)] 
fix username navbar text in fluid example for responsive variations

12 years agoComment fix
Mark Otto [Sat, 12 Jan 2013 04:30:56 +0000 (20:30 -0800)] 
Comment fix

12 years agoRemove navbar links from sticky footer navbar example
Mark Otto [Fri, 11 Jan 2013 19:00:45 +0000 (11:00 -0800)] 
Remove navbar links from sticky footer navbar example

12 years agoMerge branch 'wilfra-patch-2' into 2.3.0-wip
Mark Otto [Fri, 11 Jan 2013 18:58:17 +0000 (10:58 -0800)] 
Merge branch 'wilfra-patch-2' into 2.3.0-wip

12 years agoUpdate docs/examples/marketing-narrow.html
William Franceschine [Thu, 10 Jan 2013 10:14:14 +0000 (02:14 -0800)] 
Update docs/examples/marketing-narrow.html

Updated copyright to 2013

12 years agoUpdate docs/examples/marketing-alternate.html
William Franceschine [Thu, 10 Jan 2013 10:13:57 +0000 (02:13 -0800)] 
Update docs/examples/marketing-alternate.html

Updated copyright to 2013

12 years agoUpdate docs/examples/hero.html
William Franceschine [Thu, 10 Jan 2013 10:13:43 +0000 (02:13 -0800)] 
Update docs/examples/hero.html

Updated copyright to 2013

12 years agoUpdate docs/examples/carousel.html
William Franceschine [Thu, 10 Jan 2013 10:13:26 +0000 (02:13 -0800)] 
Update docs/examples/carousel.html

Updated copyright to 2013

12 years agoUpdate docs/examples/fluid.html
William Franceschine [Thu, 10 Jan 2013 10:10:52 +0000 (02:10 -0800)] 
Update docs/examples/fluid.html

Updated copyright to 2013

12 years agoMerge branch 'Justin-John-master' into 2.3.0-wip
Mark Otto [Thu, 10 Jan 2013 05:35:50 +0000 (21:35 -0800)] 
Merge branch 'Justin-John-master' into 2.3.0-wip

12 years agoadd sticky footer with navbar
Mark Otto [Thu, 10 Jan 2013 03:53:42 +0000 (19:53 -0800)] 
add sticky footer with navbar

12 years agoCorrected carousel arrows to active.#6494, #6489
Justin John Mathews [Wed, 9 Jan 2013 10:23:17 +0000 (15:53 +0530)] 
Corrected carousel arrows to active.#6494, #6489

Corrected the carousel arrows to active on resizing the browser window.

12 years agoFixes #6189: Add holder.js to carousel example
Mark Otto [Sat, 22 Dec 2012 03:10:05 +0000 (19:10 -0800)] 
Fixes #6189: Add holder.js to carousel example

12 years agoUpdate new example name and links
Mark Otto [Fri, 21 Dec 2012 04:27:07 +0000 (20:27 -0800)] 
Update new example name and links

12 years agoFixes #6352: marketing-alternate broken nav in FF17
Mark Otto [Thu, 20 Dec 2012 22:40:39 +0000 (14:40 -0800)] 
Fixes #6352: marketing-alternate broken nav in FF17

12 years agoMerge branch '2.2.3' into 3.0.0-wip
Mark Otto [Thu, 20 Dec 2012 08:02:52 +0000 (00:02 -0800)] 
Merge branch '2.2.3' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json

12 years agolowered carousel beneath the nav
Nathan Bridgewater [Mon, 10 Dec 2012 04:10:38 +0000 (22:10 -0600)] 
lowered carousel beneath the nav

12 years agoMerge branch '2.2.2-wip' into 3.0.0-wip
Mark Otto [Wed, 5 Dec 2012 19:05:10 +0000 (11:05 -0800)] 
Merge branch '2.2.2-wip' into 3.0.0-wip

Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less

12 years agoOnce more, update all the favicons to retina
Mark Otto [Mon, 3 Dec 2012 21:25:56 +0000 (13:25 -0800)] 
Once more, update all the favicons to retina

12 years agoImprove rendering of carousel example for IE10
Mark Otto [Mon, 3 Dec 2012 21:01:27 +0000 (13:01 -0800)] 
Improve rendering of carousel example for IE10

12 years agoRemove more fluid grid stuff
Mark Otto [Sat, 1 Dec 2012 00:18:40 +0000 (16:18 -0800)] 
Remove more fluid grid stuff

* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page

12 years agoadd holder and replace placehold.it
Mark Otto [Fri, 30 Nov 2012 04:59:14 +0000 (20:59 -0800)] 
add holder and replace placehold.it

12 years agoadd in latest carousel example, reorg examples on getting started
Mark Otto [Tue, 16 Oct 2012 17:50:10 +0000 (12:50 -0500)] 
add in latest carousel example, reorg examples on getting started

12 years agoimprove spacing in carousel example
Mark Otto [Mon, 15 Oct 2012 18:57:09 +0000 (13:57 -0500)] 
improve spacing in carousel example

12 years agocompress images and add new carousel example for .net magazine article
Mark Otto [Thu, 11 Oct 2012 00:58:22 +0000 (17:58 -0700)] 
compress images and add new carousel example for .net magazine article

12 years agocomments in template
Mark Otto [Tue, 9 Oct 2012 01:59:44 +0000 (18:59 -0700)] 
comments in template

12 years agoadding another template for same-width nav links using 'display: table-cell;'
Mark Otto [Tue, 9 Oct 2012 01:58:35 +0000 (18:58 -0700)] 
adding another template for same-width nav links using 'display: table-cell;'

12 years agoadd sticky footer example per martin bean's suggestion, using the implementation...
Mark Otto [Mon, 1 Oct 2012 05:09:51 +0000 (22:09 -0700)] 
add sticky footer example per martin bean's suggestion, using the implementation by ryan fait

12 years agoadd link to examples on index page; add back narrow marketing page and signin page...
Mark Otto [Mon, 1 Oct 2012 04:28:20 +0000 (21:28 -0700)] 
add link to examples on index page; add back narrow marketing page and signin page examples

12 years agonuke new examples for now
Mark Otto [Mon, 17 Sep 2012 15:53:13 +0000 (08:53 -0700)] 
nuke new examples for now

12 years agomore carouself example work
Mark Otto [Mon, 17 Sep 2012 04:53:56 +0000 (21:53 -0700)] 
more carouself example work

12 years agoway cooler carousel example, along with updated screenshots for examples
Mark Otto [Fri, 14 Sep 2012 22:55:46 +0000 (15:55 -0700)] 
way cooler carousel example, along with updated screenshots for examples

12 years agotweak copy on each template, add sign in template
Mark Otto [Fri, 14 Sep 2012 22:21:44 +0000 (15:21 -0700)] 
tweak copy on each template, add sign in template

12 years agoadding new examples
Mark Otto [Fri, 14 Sep 2012 22:17:46 +0000 (15:17 -0700)] 
adding new examples

12 years agonavbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from...
Mark Otto [Tue, 14 Aug 2012 23:24:58 +0000 (16:24 -0700)] 
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946

13 years agofix navbar form alignment, and update examples to show these cases
Mark Otto [Mon, 30 Jul 2012 19:15:08 +0000 (12:15 -0700)] 
fix navbar form alignment, and update examples to show these cases

13 years agofix examples collapse classes, rename navbar-redux to navbar and delete the old one
Mark Otto [Mon, 30 Jul 2012 17:08:27 +0000 (10:08 -0700)] 
fix examples collapse classes, rename navbar-redux to navbar and delete the old one

13 years agofixes #4210: indenting on hero example
Mark Otto [Sun, 29 Jul 2012 19:07:18 +0000 (12:07 -0700)] 
fixes #4210: indenting on hero example

13 years agomove navbar and update paths so it sits in tests
Mark Otto [Tue, 15 May 2012 16:45:53 +0000 (09:45 -0700)] 
move navbar and update paths so it sits in tests

13 years agomove forms test to less/tests
Mark Otto [Tue, 15 May 2012 06:45:25 +0000 (23:45 -0700)] 
move forms test to less/tests

13 years agoadd forms test page for all html5 input types and refactor selectors
Mark Otto [Tue, 15 May 2012 06:40:06 +0000 (23:40 -0700)] 
add forms test page for all html5 input types and refactor selectors

13 years agoadding navbar example, for fixed and static navbars
Mark Otto [Mon, 14 May 2012 15:57:24 +0000 (08:57 -0700)] 
adding navbar example, for fixed and static navbars

13 years agoRestrict collapsed items in Navbar to only those in .nav-collapse, and buttons in...
Bryan Petty [Sun, 1 Apr 2012 22:22:52 +0000 (16:22 -0600)] 
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.

13 years agointroduce .navbar-link to resolve issue with buttons in .navbar-text
Mark Otto [Sun, 25 Mar 2012 08:21:47 +0000 (01:21 -0700)] 
introduce .navbar-link to resolve issue with buttons in .navbar-text

13 years agoadding 144x144 ipad touch icon
Mark Otto [Sun, 25 Mar 2012 07:46:03 +0000 (00:46 -0700)] 
adding 144x144 ipad touch icon

13 years agofix apple touch icons in examples
Mark Otto [Mon, 12 Mar 2012 07:21:52 +0000 (00:21 -0700)] 
fix apple touch icons in examples

13 years agoMerge branch 'meleyal-patch-1' into 2.0.2-wip
Mark Otto [Tue, 28 Feb 2012 03:50:44 +0000 (19:50 -0800)] 
Merge branch 'meleyal-patch-1' into 2.0.2-wip

13 years agoreally add protocol to examples
Mark Otto [Tue, 28 Feb 2012 02:48:28 +0000 (18:48 -0800)] 
really add protocol to examples

13 years agoFix broken links to fav and touch icons in examples, fixes #2244
meleyal [Fri, 24 Feb 2012 22:06:02 +0000 (23:06 +0100)] 
Fix broken links to fav and touch icons in examples, fixes #2244

13 years agoMerge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip
Jacob Thornton [Wed, 8 Feb 2012 06:05:17 +0000 (22:05 -0800)] 
Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip

13 years agosome (android) devices need this viewport meta tag for responsive design to work
John Wright [Tue, 7 Feb 2012 19:06:08 +0000 (11:06 -0800)] 
some (android) devices need this viewport meta tag for responsive design to work

13 years agosome (android) devices need this viewport meta tag for responsive design to work.
John Wright [Tue, 7 Feb 2012 19:05:13 +0000 (11:05 -0800)] 
some (android) devices need this viewport meta tag for responsive design to work.

13 years agoSome devices need this for responsive design to work
John Wright [Tue, 7 Feb 2012 18:58:01 +0000 (10:58 -0800)] 
Some devices need this for responsive design to work

13 years agofix meta tag for viewport in examples and shims
Mark Otto [Sun, 5 Feb 2012 07:53:24 +0000 (23:53 -0800)] 
fix meta tag for viewport in examples and shims

13 years agoMerge branch 'master' of github.com:twitter/bootstrap
Mark Otto [Thu, 2 Feb 2012 06:13:26 +0000 (22:13 -0800)] 
Merge branch 'master' of github.com:twitter/bootstrap

13 years agoImport the responsive css *after* setting the body padding to fix the issue described...
ejain [Thu, 2 Feb 2012 05:17:04 +0000 (21:17 -0800)] 
Import the responsive css *after* setting the body padding to fix the issue described in #1570.

13 years agoremove twitter widgets js from examples
Mark Otto [Thu, 2 Feb 2012 02:00:40 +0000 (18:00 -0800)] 
remove twitter widgets js from examples

13 years agofix icon-bar class in exampless
Mark Otto [Thu, 2 Feb 2012 01:57:39 +0000 (17:57 -0800)] 
fix icon-bar class in exampless

13 years agofixing jquery links in examples
Mark Otto [Thu, 2 Feb 2012 01:41:24 +0000 (17:41 -0800)] 
fixing jquery links in examples

13 years agomove examples into docs...
Jacob Thornton [Wed, 1 Feb 2012 01:35:23 +0000 (17:35 -0800)] 
move examples into docs...