]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoFix minor grammatical problem 7227/head
Philip Arndt [Sun, 10 Mar 2013 23:07:52 +0000 (12:07 +1300)] 
Fix minor grammatical problem

"check out" makes more sense here.

12 years agoMerge pull request #7220 from jooag/patch-1
Mark Otto [Sun, 10 Mar 2013 17:40:00 +0000 (10:40 -0700)] 
Merge pull request #7220 from jooag/patch-1

Fix Typo sucess to success

12 years agoFix Typo sucess to success 7219/head 7220/head
Ufuk Avcu [Sat, 9 Mar 2013 20:04:09 +0000 (21:04 +0100)] 
Fix Typo sucess to success

Mini typo fix in the docs...

12 years agoRemove support for .uneditable-input
Mark Otto [Mon, 4 Mar 2013 07:31:09 +0000 (23:31 -0800)] 
Remove support for .uneditable-input

12 years agoNuke the gallery, punt it to the new http://expo.getbootstrap.com
Mark Otto [Mon, 4 Mar 2013 03:40:47 +0000 (19:40 -0800)] 
Nuke the gallery, punt it to the new http://expo.getbootstrap.com

12 years agofix row change at breakpoint
Mark Otto [Mon, 4 Mar 2013 02:19:31 +0000 (18:19 -0800)] 
fix row change at breakpoint

12 years agoMerge pull request #6968 from twitter/bs3_makefile_separated_done
Mark Otto [Fri, 1 Mar 2013 22:11:24 +0000 (14:11 -0800)] 
Merge pull request #6968 from twitter/bs3_makefile_separated_done

More accurate makefile step confirmation

12 years agoMerge branch '3.0.0-wip' into bs3_makefile_separated_done 6968/head
Mark Otto [Fri, 1 Mar 2013 21:53:21 +0000 (13:53 -0800)] 
Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts:
Makefile

12 years agonuke commented out unused var
Mark Otto [Fri, 1 Mar 2013 20:37:36 +0000 (12:37 -0800)] 
nuke commented out unused var

12 years agoMerge branch 'master' into 3.0.0-wip
Mark Otto [Fri, 1 Mar 2013 20:37:21 +0000 (12:37 -0800)] 
Merge branch 'master' 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/index.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
package.json

12 years agoFix alignment of .navbar-brand
Mark Otto [Fri, 1 Mar 2013 08:50:08 +0000 (00:50 -0800)] 
Fix alignment of .navbar-brand

12 years agoimprove navbar toggle and hide code snippets on mobile devices for now
Mark Otto [Fri, 1 Mar 2013 08:18:10 +0000 (00:18 -0800)] 
improve navbar toggle and hide code snippets on mobile devices for now

12 years agoredo the buttons examples
Mark Otto [Fri, 1 Mar 2013 08:04:41 +0000 (00:04 -0800)] 
redo the buttons examples

12 years agocustomize navbar in docs
Mark Otto [Fri, 1 Mar 2013 07:36:54 +0000 (23:36 -0800)] 
customize navbar in docs

12 years agoFixes #6998: disabled background color properly on pagination
Mark Otto [Fri, 1 Mar 2013 07:23:05 +0000 (23:23 -0800)] 
Fixes #6998: disabled background color properly on pagination

12 years agoFixes #6995: Add disabled navbar nav link support
Mark Otto [Fri, 1 Mar 2013 07:20:25 +0000 (23:20 -0800)] 
Fixes #6995: Add disabled navbar nav link support

12 years agoFixes #6954: properly reset grid classes within tables
Mark Otto [Fri, 1 Mar 2013 06:47:32 +0000 (22:47 -0800)] 
Fixes #6954: properly reset grid classes within tables

12 years agoMerge pull request #7111 from twitter/2.3.1-wip 7152/head v2.3.1
fat-kun [Fri, 1 Mar 2013 05:24:27 +0000 (21:24 -0800)] 
Merge pull request #7111 from twitter/2.3.1-wip

2.3.1 wip

12 years agoHoly fucking shit fix that input group with buttons rounded corner noise
Mark Otto [Fri, 1 Mar 2013 05:19:02 +0000 (21:19 -0800)] 
Holy fucking shit fix that input group with buttons rounded corner noise

12 years agoupdate changelog 7111/head
fat [Fri, 1 Mar 2013 05:16:08 +0000 (21:16 -0800)] 
update changelog

12 years agoshiiiit
fat [Fri, 1 Mar 2013 05:15:33 +0000 (21:15 -0800)] 
shiiiit

12 years agowoops that should stay 2.3.0
fat [Fri, 1 Mar 2013 05:00:21 +0000 (21:00 -0800)] 
woops that should stay 2.3.0

12 years ago2.3.1
fat [Fri, 1 Mar 2013 04:55:14 +0000 (20:55 -0800)] 
2.3.1

12 years agorebuild
fat [Fri, 1 Mar 2013 04:48:48 +0000 (20:48 -0800)] 
rebuild

12 years agowhitespace
fat [Fri, 1 Mar 2013 04:48:02 +0000 (20:48 -0800)] 
whitespace

12 years agoWHOOPS ( >_>)
fat [Fri, 1 Mar 2013 04:46:51 +0000 (20:46 -0800)] 
WHOOPS ( >_>)

12 years agoonly pass unique options through to child nodes in tooltips
fat [Fri, 1 Mar 2013 04:39:07 +0000 (20:39 -0800)] 
only pass unique options through to child nodes in tooltips

12 years agorebuild
fat [Fri, 1 Mar 2013 03:49:08 +0000 (19:49 -0800)] 
rebuild

12 years agopass true to cycle
fat [Fri, 1 Mar 2013 03:47:01 +0000 (19:47 -0800)] 
pass true to cycle

12 years agoFixes #6935: Use standard decimal points for .opacity() mixin
Mark Otto [Fri, 1 Mar 2013 03:46:49 +0000 (19:46 -0800)] 
Fixes #6935: Use standard decimal points for .opacity() mixin

12 years agoFixes #6897: Print styles get own .less file
Mark Otto [Fri, 1 Mar 2013 03:42:51 +0000 (19:42 -0800)] 
Fixes #6897: Print styles get own .less file

12 years agole sigh
fat [Fri, 1 Mar 2013 03:37:30 +0000 (19:37 -0800)] 
le sigh

12 years agoRemove margin between buttons in button groups; use border-radius mixins to avoid...
Mark Otto [Fri, 1 Mar 2013 03:34:02 +0000 (19:34 -0800)] 
Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting

12 years agoremove auto regen
Mark Otto [Fri, 1 Mar 2013 03:32:39 +0000 (19:32 -0800)] 
remove auto regen

12 years agoadd new example thumbnails; update links to point to new windows
Mark Otto [Tue, 26 Feb 2013 08:56:06 +0000 (00:56 -0800)] 
add new example thumbnails; update links to point to new windows

12 years agonuke remaining less/tests/ files and move grid over to examples dir
Mark Otto [Tue, 26 Feb 2013 08:49:21 +0000 (00:49 -0800)] 
nuke remaining less/tests/ files and move grid over to examples dir

12 years agonuke glyphicons changes in buttons for now because it's whack
Mark Otto [Tue, 26 Feb 2013 08:44:15 +0000 (00:44 -0800)] 
nuke glyphicons changes in buttons for now because it's whack

12 years agomoved examples added
Mark Otto [Tue, 26 Feb 2013 08:42:24 +0000 (00:42 -0800)] 
moved examples added

12 years agoMove navbar examples to /examples directory
Mark Otto [Tue, 26 Feb 2013 08:37:59 +0000 (00:37 -0800)] 
Move navbar examples to /examples directory

12 years agotry out new table-based type example
Mark Otto [Sun, 24 Feb 2013 09:29:19 +0000 (01:29 -0800)] 
try out new table-based type example

12 years agoMerge pull request #6967 from twitter/readme_npm_fix
Mark Otto [Thu, 21 Feb 2013 21:10:21 +0000 (13:10 -0800)] 
Merge pull request #6967 from twitter/readme_npm_fix

Update readme npm instructions

12 years agoMerge pull request #6990 from acmetech/3.0.0-wip
Mark Otto [Wed, 20 Feb 2013 00:09:18 +0000 (16:09 -0800)] 
Merge pull request #6990 from acmetech/3.0.0-wip

Additional minor updates to the docs

12 years agoforgot navbar-fixed-bottom in the commit 6990/head
Tom Pietschker [Tue, 19 Feb 2013 19:54:56 +0000 (14:54 -0500)] 
forgot navbar-fixed-bottom in the commit

12 years agotweak the position of the fixed to top/bottom navbars to remove double border
Tom Pietschker [Tue, 19 Feb 2013 19:50:44 +0000 (14:50 -0500)] 
tweak the position of the fixed to top/bottom navbars to remove double border

12 years agoremove the search-query class and increase the width
Tom Pietschker [Tue, 19 Feb 2013 19:40:05 +0000 (14:40 -0500)] 
remove the search-query class and increase the width

12 years agoreplace navbar-search with navbar-form
Tom Pietschker [Tue, 19 Feb 2013 19:35:48 +0000 (14:35 -0500)] 
replace navbar-search with navbar-form

12 years agoremove navbar-inner
Tom Pietschker [Tue, 19 Feb 2013 19:32:28 +0000 (14:32 -0500)] 
remove navbar-inner

12 years agoMerge pull request #6979 from acmetech/3.0.0-wip
Mark Otto [Tue, 19 Feb 2013 02:26:26 +0000 (18:26 -0800)] 
Merge pull request #6979 from acmetech/3.0.0-wip

Minor fixes to docs

12 years agoadded missing slash in the src for Gather Content 6979/head
Tom Pietschker [Tue, 19 Feb 2013 02:03:52 +0000 (21:03 -0500)] 
added missing slash in the src for Gather Content

12 years agofix incorrect section id for labels
Tom Pietschker [Tue, 19 Feb 2013 01:57:54 +0000 (20:57 -0500)] 
fix incorrect section id for labels

12 years agoNavbar realignment:
Mark Otto [Mon, 18 Feb 2013 09:28:35 +0000 (01:28 -0800)] 
Navbar realignment:

* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering

12 years agoremove unused include
Mark Otto [Mon, 18 Feb 2013 09:27:08 +0000 (01:27 -0800)] 
remove unused include

12 years agoBring back the label, make it scale somewhat with the font-size of the parent using...
Mark Otto [Mon, 18 Feb 2013 06:20:49 +0000 (22:20 -0800)] 
Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems

12 years agoDrop the recently added .counter class for .badge
Mark Otto [Mon, 18 Feb 2013 05:06:20 +0000 (21:06 -0800)] 
Drop the recently added .counter class for .badge

12 years agoremove old todo comment
Mark Otto [Mon, 18 Feb 2013 04:26:44 +0000 (20:26 -0800)] 
remove old todo comment

12 years agoremove unnecessary select border reset
Mark Otto [Mon, 18 Feb 2013 04:26:21 +0000 (20:26 -0800)] 
remove unnecessary select border reset

12 years agofix inaccurate text classes code
Mark Otto [Mon, 18 Feb 2013 04:23:31 +0000 (20:23 -0800)] 
fix inaccurate text classes code

12 years agofix broken marketing section with updated class
Mark Otto [Mon, 18 Feb 2013 04:18:29 +0000 (20:18 -0800)] 
fix broken marketing section with updated class

12 years agoforgot about those quotes
Mark Otto [Mon, 18 Feb 2013 03:15:09 +0000 (19:15 -0800)] 
forgot about those quotes

12 years agofix the docs include logic
Mark Otto [Mon, 18 Feb 2013 03:12:30 +0000 (19:12 -0800)] 
fix the docs include logic

12 years agomore narrow jumbotron example fixes in the mobile first arena
Mark Otto [Mon, 18 Feb 2013 03:04:38 +0000 (19:04 -0800)] 
more narrow jumbotron example fixes in the mobile first arena

12 years agoRefactor some common classes from docs css and examples, then prevent examples from...
Mark Otto [Mon, 18 Feb 2013 02:58:40 +0000 (18:58 -0800)] 
Refactor some common classes from docs css and examples, then prevent examples from using docs.css

12 years agorevamp narrow jumbotron to avoid conflicts with docs .masthead
Mark Otto [Mon, 18 Feb 2013 02:48:00 +0000 (18:48 -0800)] 
revamp narrow jumbotron to avoid conflicts with docs .masthead

12 years agodecrease top/bottom padding a bit in mobile fixed navbars
Mark Otto [Mon, 18 Feb 2013 02:47:44 +0000 (18:47 -0800)] 
decrease top/bottom padding a bit in mobile fixed navbars

12 years agocss to go with it
Mark Otto [Mon, 18 Feb 2013 02:46:49 +0000 (18:46 -0800)] 
css to go with it

12 years agoAdd class to body for special styles to avoid conflict with examples
Mark Otto [Mon, 18 Feb 2013 02:46:30 +0000 (18:46 -0800)] 
Add class to body for special styles to avoid conflict with examples

12 years agoRevert the statis navbar in mobile views--they're back to being fixed all the time
Mark Otto [Mon, 18 Feb 2013 02:33:55 +0000 (18:33 -0800)] 
Revert the statis navbar in mobile views--they're back to being fixed all the time

12 years agoUpdate some links and rename #gridsystem to #grid-system
Mark Otto [Mon, 18 Feb 2013 02:10:29 +0000 (18:10 -0800)] 
Update some links and rename #gridsystem to #grid-system

12 years agoremove duplicate done text; change label on docs prep step
Mark Otto [Mon, 18 Feb 2013 00:58:43 +0000 (16:58 -0800)] 
remove duplicate done text; change label on docs prep step

12 years agocorrect version
Mark Otto [Mon, 18 Feb 2013 00:56:57 +0000 (16:56 -0800)] 
correct version

12 years agoResolve conflicts
Mark Otto [Mon, 18 Feb 2013 00:56:30 +0000 (16:56 -0800)] 
Resolve conflicts

12 years agoBackport v3's readme update on npm install to 2.3 6967/head
Mark Otto [Sun, 17 Feb 2013 23:36:24 +0000 (15:36 -0800)] 
Backport v3's readme update on npm install to 2.3

12 years agoadd note to readme about fubared npm installs
Mark Otto [Sun, 17 Feb 2013 21:54:47 +0000 (13:54 -0800)] 
add note to readme about fubared npm installs

12 years agoclarification on readme makefile
Mark Otto [Sun, 17 Feb 2013 21:42:31 +0000 (13:42 -0800)] 
clarification on readme makefile

12 years agoRestore submenu support
Mark Otto [Sun, 17 Feb 2013 21:35:14 +0000 (13:35 -0800)] 
Restore submenu support

12 years agorestore auto regen of docs
Mark Otto [Sun, 17 Feb 2013 21:35:08 +0000 (13:35 -0800)] 
restore auto regen of docs

12 years agoadd visibility note to docs about captions
Mark Otto [Sat, 16 Feb 2013 10:49:12 +0000 (02:49 -0800)] 
add visibility note to docs about captions

12 years agoScrach that: carousel caption is always left aligned, but still hidden for mobile...
Mark Otto [Sat, 16 Feb 2013 10:47:48 +0000 (02:47 -0800)] 
Scrach that: carousel caption is always left aligned, but still hidden for mobile views

12 years agoRe-add carousel captions as optional
Mark Otto [Sat, 16 Feb 2013 10:47:15 +0000 (02:47 -0800)] 
Re-add carousel captions as optional

* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports

12 years agoNuke the fluid example since it's no longer applicable
Mark Otto [Sat, 16 Feb 2013 09:43:23 +0000 (01:43 -0800)] 
Nuke the fluid example since it's no longer applicable

12 years agoNuke the old_docs.css file
Mark Otto [Sat, 16 Feb 2013 09:39:09 +0000 (01:39 -0800)] 
Nuke the old_docs.css file

12 years agoNuke @mdo's photos from the repo since we're using holder.js for carousel demo
Mark Otto [Sat, 16 Feb 2013 09:38:32 +0000 (01:38 -0800)] 
Nuke @mdo's photos from the repo since we're using holder.js for carousel demo

12 years agoAll Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star
Mark Otto [Sat, 16 Feb 2013 09:26:43 +0000 (01:26 -0800)] 
All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star

12 years agoOverhaul carousel a bit more:
Mark Otto [Sat, 16 Feb 2013 09:22:15 +0000 (01:22 -0800)] 
Overhaul carousel a bit more:

* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting

12 years agoMore accurate padding for fixed navbars at >768px
Mark Otto [Sat, 16 Feb 2013 08:20:20 +0000 (00:20 -0800)] 
More accurate padding for fixed navbars at >768px

12 years agoDon't affix the fixed navbars in mobile views
Mark Otto [Sat, 16 Feb 2013 08:19:17 +0000 (00:19 -0800)] 
Don't affix the fixed navbars in mobile views

12 years agotwerk gallery examples to stay at 400px or less for proper retinafying
Mark Otto [Sat, 16 Feb 2013 01:27:05 +0000 (17:27 -0800)] 
twerk gallery examples to stay at 400px or less for proper retinafying

12 years agoUpdate gallery examples on homepage; make all gallery entries open in new tabs
Mark Otto [Sat, 16 Feb 2013 01:21:41 +0000 (17:21 -0800)] 
Update gallery examples on homepage; make all gallery entries open in new tabs

12 years agofix #6950: use var for font-family
Mark Otto [Sat, 16 Feb 2013 00:51:16 +0000 (16:51 -0800)] 
fix #6950: use var for font-family

12 years agorestore jekyll-based css.html to docs
Mark Otto [Fri, 15 Feb 2013 20:22:26 +0000 (12:22 -0800)] 
restore jekyll-based css.html to docs

12 years agoMerge pull request #6944 from canburak/3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 20:17:27 +0000 (12:17 -0800)] 
Merge pull request #6944 from canburak/3.0.0-wip

Fixed typo on JavaScript documentation

12 years agoFix typo on JavaScript documentation 6944/head
Can Burak Cilingir [Fri, 15 Feb 2013 10:47:34 +0000 (18:47 +0800)] 
Fix typo on JavaScript documentation

12 years agoFixes #6941: add alt attribute to images
Mark Otto [Fri, 15 Feb 2013 07:55:04 +0000 (23:55 -0800)] 
Fixes #6941: add alt attribute to images

12 years agofix spelling as pointed out by @jodytate that got nuked in the merge
Mark Otto [Fri, 15 Feb 2013 07:51:35 +0000 (23:51 -0800)] 
fix spelling as pointed out by @jodytate that got nuked in the merge

12 years agorearrange readme
Mark Otto [Fri, 15 Feb 2013 07:48:29 +0000 (23:48 -0800)] 
rearrange readme

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 07:44:50 +0000 (23:44 -0800)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html

12 years agoMerge branch 'bs3_jekyll' into 3.0.0-wip
Mark Otto [Fri, 15 Feb 2013 07:42:47 +0000 (23:42 -0800)] 
Merge branch 'bs3_jekyll' into 3.0.0-wip

Conflicts:
docs/css.html
docs/templates/pages/css.mustache

12 years agoMake example pages use Jekyll; add sticky footer navbar image to examples 6925/head
Mark Otto [Fri, 15 Feb 2013 07:38:00 +0000 (23:38 -0800)] 
Make example pages use Jekyll; add sticky footer navbar image to examples

12 years agono need for scrollspy in example template
Mark Otto [Fri, 15 Feb 2013 07:07:36 +0000 (23:07 -0800)] 
no need for scrollspy in example template

12 years agoUpdate makefile
Mark Otto [Fri, 15 Feb 2013 06:57:25 +0000 (22:57 -0800)] 
Update makefile