]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
14 years agoGrammatical changes have been made as suggested by @cvrebert for issue #1787. 1789/head
raphaelz [Tue, 7 Feb 2012 07:11:25 +0000 (02:11 -0500)] 
Grammatical changes have been made as suggested by @cvrebert for issue #1787.

14 years agofix alert tests + add show option back to modals
Jacob Thornton [Mon, 6 Feb 2012 08:17:31 +0000 (00:17 -0800)] 
fix alert tests + add show option back to modals

14 years agoMerge pull request #1603 from mikaelbr/master
Jacob Thornton [Fri, 3 Feb 2012 07:47:22 +0000 (23:47 -0800)] 
Merge pull request #1603 from mikaelbr/master

Fixed ID and for-attr in the doc forms

14 years agoits core (typo)
Jacob Thornton [Fri, 3 Feb 2012 07:31:03 +0000 (23:31 -0800)] 
its core (typo)

14 years agoMerge pull request #1647 from htanata/fix_alerts_code_example
Jacob Thornton [Fri, 3 Feb 2012 07:16:17 +0000 (23:16 -0800)] 
Merge pull request #1647 from htanata/fix_alerts_code_example

Fix alerts JavaScript code example

14 years agoFix alerts JavaScript code example. 1647/head
Hendy Tanata [Fri, 3 Feb 2012 04:45:06 +0000 (20:45 -0800)] 
Fix alerts JavaScript code example.

14 years agoFixed duplicate and wrong IDs and label fors in forms. 1603/head
Mikael Brevik [Thu, 2 Feb 2012 13:09:27 +0000 (14:09 +0100)] 
Fixed duplicate and wrong IDs and label fors in forms.

14 years agoMerge pull request #1549 from TannerNMO/patch-1
Jacob Thornton [Thu, 2 Feb 2012 06:37:42 +0000 (22:37 -0800)] 
Merge pull request #1549 from TannerNMO/patch-1

Fixed simple grammatical errors.

14 years agoremove 2.0-wip ref
Jacob Thornton [Thu, 2 Feb 2012 06:30:51 +0000 (22:30 -0800)] 
remove 2.0-wip ref

14 years agofix makefile to reset zips
Jacob Thornton [Thu, 2 Feb 2012 06:27:46 +0000 (22:27 -0800)] 
fix makefile to reset zips

14 years agorebuild with correct zip
Jacob Thornton [Thu, 2 Feb 2012 06:21:29 +0000 (22:21 -0800)] 
rebuild with correct zip

14 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

14 years agoMerge pull request #1576 from ejain/patch-1
Mark Otto [Thu, 2 Feb 2012 06:13:07 +0000 (22:13 -0800)] 
Merge pull request #1576 from ejain/patch-1

Import the responsive css *after* setting the body padding to fix...

14 years agoImport the responsive css *after* setting the body padding to fix the issue described... 1576/head
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.

14 years agonuke all curly ticks
Mark Otto [Thu, 2 Feb 2012 02:27:38 +0000 (18:27 -0800)] 
nuke all curly ticks

14 years agofix spelling in examples page
Mark Otto [Thu, 2 Feb 2012 02:25:34 +0000 (18:25 -0800)] 
fix spelling in examples page

14 years agofix the makefile
Mark Otto [Thu, 2 Feb 2012 02:24:41 +0000 (18:24 -0800)] 
fix the makefile

14 years agofix missing ; in buttons.less
Mark Otto [Thu, 2 Feb 2012 02:18:39 +0000 (18:18 -0800)] 
fix missing ; in buttons.less

14 years agoupdate scaffolding responsive section to reflect proper media query ranges
Mark Otto [Thu, 2 Feb 2012 02:12:14 +0000 (18:12 -0800)] 
update scaffolding responsive section to reflect proper media query ranges

14 years agofix mis-labeled label
Mark Otto [Thu, 2 Feb 2012 02:11:19 +0000 (18:11 -0800)] 
fix mis-labeled label

14 years agofix js links in components
Mark Otto [Thu, 2 Feb 2012 02:06:52 +0000 (18:06 -0800)] 
fix js links in components

14 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

14 years agoMerge pull request #1490 from amenonsen/master
Mark Otto [Thu, 2 Feb 2012 01:59:19 +0000 (17:59 -0800)] 
Merge pull request #1490 from amenonsen/master

Typo fix: Sprited => Striped

14 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

14 years agoremove excess td in less docs
Mark Otto [Thu, 2 Feb 2012 01:55:32 +0000 (17:55 -0800)] 
remove excess td in less docs

14 years agofix hover state on .nav-list for active links
Mark Otto [Thu, 2 Feb 2012 01:54:21 +0000 (17:54 -0800)] 
fix hover state on .nav-list for active links

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

14 years agoremove unused css files and add scaffolding and hero-unit to the builder
Mark Otto [Thu, 2 Feb 2012 01:06:40 +0000 (17:06 -0800)] 
remove unused css files and add scaffolding and hero-unit to the builder

14 years agoMerge branch 'master' of github.com:twitter/bootstrap
Mark Otto [Thu, 2 Feb 2012 00:45:25 +0000 (16:45 -0800)] 
Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
docs/assets/bootstrap.zip

14 years agofix that jank hack
Mark Otto [Thu, 2 Feb 2012 00:44:07 +0000 (16:44 -0800)] 
fix that jank hack

14 years agorebuild
Jacob Thornton [Thu, 2 Feb 2012 00:39:15 +0000 (16:39 -0800)] 
rebuild

14 years agoonly add the anyalytics to production
Jacob Thornton [Thu, 2 Feb 2012 00:38:58 +0000 (16:38 -0800)] 
only add the anyalytics to production

14 years agoFixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus... 1549/head
TannerNMO [Wed, 1 Feb 2012 21:14:49 +0000 (14:14 -0700)] 
Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx

14 years agoTypo fix 1490/head
Abhijit Menon-Sen [Wed, 1 Feb 2012 07:51:37 +0000 (13:21 +0530)] 
Typo fix

14 years agofix links and rebuild
Mark Otto [Wed, 1 Feb 2012 03:32:42 +0000 (19:32 -0800)] 
fix links and rebuild

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

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Wed, 1 Feb 2012 01:27:01 +0000 (17:27 -0800)] 
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip

14 years agoupdate upgrade page
Mark Otto [Wed, 1 Feb 2012 01:24:20 +0000 (17:24 -0800)] 
update upgrade page

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Tue, 31 Jan 2012 22:38:06 +0000 (14:38 -0800)] 
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip

14 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Tue, 31 Jan 2012 22:30:07 +0000 (14:30 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

14 years agoremove unused examples, update examples docs page, add starter template to examples...
Mark Otto [Tue, 31 Jan 2012 22:29:44 +0000 (14:29 -0800)] 
remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Tue, 31 Jan 2012 22:11:45 +0000 (14:11 -0800)] 
Merge branch '2.0-wip'

14 years agoadd makefile to make it easier to publish to gh-pages...
Jacob Thornton [Tue, 31 Jan 2012 22:05:30 +0000 (14:05 -0800)] 
add makefile to make it easier to publish to gh-pages...

14 years agoremove warning alert on less docs
Mark Otto [Tue, 31 Jan 2012 22:00:26 +0000 (14:00 -0800)] 
remove warning alert on less docs

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Tue, 31 Jan 2012 21:59:40 +0000 (13:59 -0800)] 
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip

14 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Tue, 31 Jan 2012 21:59:08 +0000 (13:59 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

14 years agomove js stuff into assets
Jacob Thornton [Tue, 31 Jan 2012 21:58:28 +0000 (13:58 -0800)] 
move js stuff into assets

14 years agofix broken nav on less page
Mark Otto [Tue, 31 Jan 2012 21:57:43 +0000 (13:57 -0800)] 
fix broken nav on less page

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Tue, 31 Jan 2012 21:23:29 +0000 (13:23 -0800)] 
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip

14 years agoMerge branch '2.0-wip'
Jacob Thornton [Tue, 31 Jan 2012 21:18:34 +0000 (13:18 -0800)] 
Merge branch '2.0-wip'

Conflicts:
.gitignore
LICENSE
Makefile
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/assets/js/google-code-prettify/prettify.css
docs/index.html
docs/javascript.html
examples/container-app.html
examples/fluid.html
examples/hero.html
js/bootstrap-alerts.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tabs.js
js/bootstrap-twipsy.js
js/tests/index.html
js/tests/unit/bootstrap-modal.js
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tabs.js
lib/forms.less
lib/mixins.less
lib/patterns.less
lib/scaffolding.less
lib/tables.less

14 years agoclean up responsive media queries and docs css
Mark Otto [Tue, 31 Jan 2012 21:16:11 +0000 (13:16 -0800)] 
clean up responsive media queries and docs css

14 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Tue, 31 Jan 2012 17:40:11 +0000 (09:40 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

14 years agoMerge pull request #1459 from nkryptic/add-help-text
Mark Otto [Tue, 31 Jan 2012 17:39:59 +0000 (09:39 -0800)] 
Merge pull request #1459 from nkryptic/add-help-text

[2.0-wip] Add form help text information to docs

14 years agofix typo in base css docs
Mark Otto [Tue, 31 Jan 2012 17:37:44 +0000 (09:37 -0800)] 
fix typo in base css docs

14 years agofix js docs typo
Mark Otto [Tue, 31 Jan 2012 17:37:14 +0000 (09:37 -0800)] 
fix js docs typo

14 years agoadd form help-* documentation 1459/head
nkryptic [Tue, 31 Jan 2012 08:54:07 +0000 (03:54 -0500)] 
add form help-* documentation

14 years agofix disabled button docs
Mark Otto [Tue, 31 Jan 2012 08:15:43 +0000 (00:15 -0800)] 
fix disabled button docs

14 years agoMerge pull request #1457 from nkryptic/2.0-wip
Mark Otto [Tue, 31 Jan 2012 08:12:34 +0000 (00:12 -0800)] 
Merge pull request #1457 from nkryptic/2.0-wip

[2.0-wip] added missing nav- prefixes to docs

14 years agochance icon class
Mark Otto [Tue, 31 Jan 2012 08:11:19 +0000 (00:11 -0800)] 
chance icon class

14 years agoadd nav- prefix to rest of docs 1457/head
nkryptic [Tue, 31 Jan 2012 07:54:10 +0000 (02:54 -0500)] 
add nav- prefix to rest of docs

14 years agodisable cursor on disabled and active pagination links
Mark Otto [Tue, 31 Jan 2012 07:27:58 +0000 (23:27 -0800)] 
disable cursor on disabled and active pagination links

14 years agoonce more, overhaul the icons and use the css regex selector on our icons
Mark Otto [Tue, 31 Jan 2012 07:24:35 +0000 (23:24 -0800)] 
once more, overhaul the icons and use the css regex selector on our icons

14 years agofix the other disabled button style
Mark Otto [Tue, 31 Jan 2012 07:17:05 +0000 (23:17 -0800)] 
fix the other disabled button style

14 years agofix button styles on active and disabled
Mark Otto [Tue, 31 Jan 2012 07:16:27 +0000 (23:16 -0800)] 
fix button styles on active and disabled

14 years agoupdate layout docs
Mark Otto [Tue, 31 Jan 2012 07:10:29 +0000 (23:10 -0800)] 
update layout docs

14 years agorestore a few commented out responsive items
Mark Otto [Tue, 31 Jan 2012 07:02:24 +0000 (23:02 -0800)] 
restore a few commented out responsive items

14 years agoupdate icons everywhere to be scoped per other components, fix broken elements on...
Mark Otto [Tue, 31 Jan 2012 06:57:00 +0000 (22:57 -0800)] 
update icons everywhere to be scoped per other components, fix broken elements on js docs page

14 years agorefactor the navs to use prefixed classes, because you know, consistency is beast...
Mark Otto [Tue, 31 Jan 2012 05:29:50 +0000 (21:29 -0800)] 
refactor the navs to use prefixed classes, because you know, consistency is beast mode

14 years ago*really* refactor the buttons and update them all over the docs
Mark Otto [Tue, 31 Jan 2012 05:15:57 +0000 (21:15 -0800)] 
*really* refactor the buttons and update them all over the docs

14 years agorefactor buttons.less
Mark Otto [Tue, 31 Jan 2012 04:50:51 +0000 (20:50 -0800)] 
refactor buttons.less

14 years agospeed up topbar animation for responsive
Jacob Thornton [Mon, 30 Jan 2012 21:59:05 +0000 (13:59 -0800)] 
speed up topbar animation for responsive

14 years agofix wrong value in grid column width in download page
Mark Otto [Mon, 30 Jan 2012 18:01:02 +0000 (10:01 -0800)] 
fix wrong value in grid column width in download page

14 years agoimplement @textColor for body text
Mark Otto [Mon, 30 Jan 2012 17:41:31 +0000 (09:41 -0800)] 
implement @textColor for body text

14 years agolarge carousel images and margin bottom added
Mark Otto [Mon, 30 Jan 2012 17:19:25 +0000 (09:19 -0800)] 
large carousel images and margin bottom added

14 years agofix docs: move .pull-left from search input to search form in navbar
Mark Otto [Mon, 30 Jan 2012 16:58:40 +0000 (08:58 -0800)] 
fix docs: move .pull-left from search input to search form in navbar

14 years agoaccount for floated inputs in the .navbar-form
Mark Otto [Mon, 30 Jan 2012 16:20:37 +0000 (08:20 -0800)] 
account for floated inputs in the .navbar-form

14 years agoadding warning (orange) button, fix responsive navbar problem
Mark Otto [Mon, 30 Jan 2012 16:15:28 +0000 (08:15 -0800)] 
adding warning (orange) button, fix responsive navbar problem

14 years agoremove all new dropdown button stuff
Mark Otto [Mon, 30 Jan 2012 16:04:48 +0000 (08:04 -0800)] 
remove all new dropdown button stuff

14 years agotesting out button dropdown group
Mark Otto [Mon, 30 Jan 2012 15:59:03 +0000 (07:59 -0800)] 
testing out button dropdown group

14 years agoadd skew mixin
Mark Otto [Mon, 30 Jan 2012 15:54:47 +0000 (07:54 -0800)] 
add skew mixin

14 years agoadd in regular button dropdowns, rejigger the button dropdowns section to reflect...
Mark Otto [Mon, 30 Jan 2012 15:49:28 +0000 (07:49 -0800)] 
add in regular button dropdowns, rejigger the button dropdowns section to reflect change

14 years agoremove top 5px padding from first inline radio/checkbox
Mark Otto [Mon, 30 Jan 2012 15:40:24 +0000 (07:40 -0800)] 
remove top 5px padding from first inline radio/checkbox

14 years agoupdate vars in less and download pages
Mark Otto [Mon, 30 Jan 2012 09:34:59 +0000 (01:34 -0800)] 
update vars in less and download pages

14 years agoupdate tests for popover to use proper classes
Mark Otto [Mon, 30 Jan 2012 09:30:18 +0000 (01:30 -0800)] 
update tests for popover to use proper classes

14 years agofix forms typo on error state
Mark Otto [Mon, 30 Jan 2012 09:25:02 +0000 (01:25 -0800)] 
fix forms typo on error state

14 years agoupdated upgrade page to reflect popover changes
Mark Otto [Mon, 30 Jan 2012 09:24:02 +0000 (01:24 -0800)] 
updated upgrade page to reflect popover changes

14 years agonamespace popover values
Mark Otto [Mon, 30 Jan 2012 09:20:51 +0000 (01:20 -0800)] 
namespace popover values

14 years agoscope .content in container example
Mark Otto [Mon, 30 Jan 2012 09:18:45 +0000 (01:18 -0800)] 
scope .content in container example

14 years agorename vertical-divider to divider-vertical, add more space around the divider
Mark Otto [Mon, 30 Jan 2012 09:09:34 +0000 (01:09 -0800)] 
rename vertical-divider to divider-vertical, add more space around the divider

14 years agoupdate reverse fluid layout to mirror the fluid layout
Mark Otto [Mon, 30 Jan 2012 09:06:20 +0000 (01:06 -0800)] 
update reverse fluid layout to mirror the fluid layout

14 years agoupdate js docs page to clarify usage of images on carousel
Mark Otto [Mon, 30 Jan 2012 08:44:27 +0000 (00:44 -0800)] 
update js docs page to clarify usage of images on carousel

14 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 30 Jan 2012 08:43:57 +0000 (00:43 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip
less/responsive.less

14 years agooverhaul grid mixins and variables, standardize fluid grid system and enable it acros...
Mark Otto [Mon, 30 Jan 2012 08:39:44 +0000 (00:39 -0800)] 
overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts

14 years agoMerge pull request #1421 from MarkReeder/2.0-wip
Jacob Thornton [Mon, 30 Jan 2012 07:40:34 +0000 (23:40 -0800)] 
Merge pull request #1421 from MarkReeder/2.0-wip

Fixes Opera flickering on the collapse plugin when reset is called without specifying the size

14 years agoFixes issue with Opera flickering on the collapse plugin when reset is called without... 1421/head
Mark Reeder [Mon, 30 Jan 2012 05:14:07 +0000 (21:14 -0800)] 
Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size

https://github.com/twitter/bootstrap/issues/1208

14 years agoMerge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Jacob Thornton [Mon, 30 Jan 2012 03:07:14 +0000 (19:07 -0800)] 
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip

14 years agoadd license for responsive and rebuild
Jacob Thornton [Mon, 30 Jan 2012 03:04:26 +0000 (19:04 -0800)] 
add license for responsive and rebuild

14 years agosubnav adjustments
Mark Otto [Mon, 30 Jan 2012 01:03:05 +0000 (17:03 -0800)] 
subnav adjustments

14 years agomove vars and mixins for default grid back to appropriate files
Mark Otto [Mon, 30 Jan 2012 00:58:51 +0000 (16:58 -0800)] 
move vars and mixins for default grid back to appropriate files

14 years agoMerge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Mark Otto [Mon, 30 Jan 2012 00:55:56 +0000 (16:55 -0800)] 
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
docs/assets/bootstrap.zip