]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoreorder counters docs
Mark Otto [Tue, 5 Feb 2013 08:59:22 +0000 (00:59 -0800)] 
reorder counters docs

12 years agopagination docs cleanup
Mark Otto [Tue, 5 Feb 2013 08:54:48 +0000 (00:54 -0800)] 
pagination docs cleanup

12 years agosimpler breadcrumbs docs
Mark Otto [Tue, 5 Feb 2013 08:51:19 +0000 (00:51 -0800)] 
simpler breadcrumbs docs

12 years agoIncrease margins and line-height on h3; overhaul button dropdown docs
Mark Otto [Tue, 5 Feb 2013 08:49:54 +0000 (00:49 -0800)] 
Increase margins and line-height on h3; overhaul button dropdown docs

12 years agoAdd justified button groups for link buttons; reorganize dropdowns and button groups...
Mark Otto [Tue, 5 Feb 2013 08:30:03 +0000 (00:30 -0800)] 
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections

12 years agoForgot to remove base-css.mustache
Mark Otto [Tue, 5 Feb 2013 08:22:20 +0000 (00:22 -0800)] 
Forgot to remove base-css.mustache

12 years agoRemove base-css.html after recent merges
Mark Otto [Mon, 4 Feb 2013 19:12:32 +0000 (11:12 -0800)] 
Remove base-css.html after recent merges

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Mon, 4 Feb 2013 19:12:09 +0000 (11:12 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
less/type.less

12 years agoFixes #6794: incorrect docs mention of th element
Mark Otto [Mon, 4 Feb 2013 19:11:25 +0000 (11:11 -0800)] 
Fixes #6794: incorrect docs mention of th element

12 years agoFixes #6794: incorrect docs mention of th element
Mark Otto [Mon, 4 Feb 2013 19:11:04 +0000 (11:11 -0800)] 
Fixes #6794: incorrect docs mention of th element

12 years agoRevamp button mixins and pseudo states
Mark Otto [Sun, 3 Feb 2013 03:16:15 +0000 (19:16 -0800)] 
Revamp button mixins and pseudo states

* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states

12 years agoMerge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0...
Mark Otto [Sun, 3 Feb 2013 03:08:59 +0000 (19:08 -0800)] 
Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Sun, 3 Feb 2013 02:58:08 +0000 (18:58 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoAdd changelog file to repo instead of relying on the wiki
Mark Otto [Sun, 3 Feb 2013 02:57:24 +0000 (18:57 -0800)] 
Add changelog file to repo instead of relying on the wiki

12 years agoVerion number in JS makefile
Mark Otto [Sun, 3 Feb 2013 02:50:13 +0000 (18:50 -0800)] 
Verion number in JS makefile

12 years agoRearrange forms content
Mark Otto [Sun, 3 Feb 2013 02:30:52 +0000 (18:30 -0800)] 
Rearrange forms content

12 years agoSimplify input and input group sizing
Mark Otto [Sun, 3 Feb 2013 01:31:26 +0000 (17:31 -0800)] 
Simplify input and input group sizing

* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups

12 years agoMerge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara...
Mark Otto [Sun, 3 Feb 2013 01:01:29 +0000 (17:01 -0800)] 
Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip

12 years agoAdd @btn-color variable and use in buttons and carets; fixes dropup caret as well
Mark Otto [Sat, 2 Feb 2013 21:03:18 +0000 (13:03 -0800)] 
Add @btn-color variable and use in buttons and carets; fixes dropup caret as well

12 years agoMerge pull request #6763 from rjregenold/2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 20:35:39 +0000 (12:35 -0800)] 
Merge pull request #6763 from rjregenold/2.3.0-wip

fixes jankiness with anchor tags in carousel.

12 years agoRefactor navbar dividers
Mark Otto [Sat, 2 Feb 2013 06:56:09 +0000 (22:56 -0800)] 
Refactor navbar dividers

* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries

12 years agoFixes #6657: Upgrade Normalize to 2.1.0
Mark Otto [Sat, 2 Feb 2013 05:49:19 +0000 (21:49 -0800)] 
Fixes #6657: Upgrade Normalize to 2.1.0

12 years agoMerge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 05:44:35 +0000 (21:44 -0800)] 
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip

12 years agoMerge branch 'dospuntocero-master' into 2.3.0-wip
Mark Otto [Sat, 2 Feb 2013 05:41:13 +0000 (21:41 -0800)] 
Merge branch 'dospuntocero-master' into 2.3.0-wip

12 years agoadd horizontal-three-color gradient test
Mark Otto [Sat, 2 Feb 2013 05:41:02 +0000 (21:41 -0800)] 
add horizontal-three-color gradient test

12 years agoRefactor colors and progress bars
Mark Otto [Sat, 2 Feb 2013 00:21:38 +0000 (16:21 -0800)] 
Refactor colors and progress bars

* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS

12 years agoMerge pull request #6776 from ndabas/fix-inline-lists-ie7
Mark Otto [Fri, 1 Feb 2013 21:04:17 +0000 (13:04 -0800)] 
Merge pull request #6776 from ndabas/fix-inline-lists-ie7

Fix inline lists for IE7

12 years agoFixing inline lists for IE7 6776/head
Nikhil Dabas [Fri, 1 Feb 2013 20:34:30 +0000 (02:04 +0530)] 
Fixing inline lists for IE7

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Fri, 1 Feb 2013 18:34:25 +0000 (10:34 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

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

12 years agoUse button element instead of a for responsive navbar buttons
Mark Otto [Fri, 1 Feb 2013 18:33:36 +0000 (10:33 -0800)] 
Use button element instead of a for responsive navbar buttons

12 years agostart to refactor justified nav example
Mark Otto [Fri, 1 Feb 2013 18:32:08 +0000 (10:32 -0800)] 
start to refactor justified nav example

12 years agobutton element instead of href-less a tag for navbar button
Mark Otto [Fri, 1 Feb 2013 18:30:48 +0000 (10:30 -0800)] 
button element instead of href-less a tag for navbar button

12 years agoUpdate input-group-addon for input sizes 6767/head
Gil Barbara [Fri, 1 Feb 2013 03:39:26 +0000 (01:39 -0200)] 
Update input-group-addon for input sizes

12 years agoRefactor jumbotron-narrow.html example
Mark Otto [Fri, 1 Feb 2013 02:34:12 +0000 (18:34 -0800)] 
Refactor jumbotron-narrow.html example

* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout

12 years agoRename marketing-narrow to jumbotron-narrow for mo betta naming schemes
Mark Otto [Fri, 1 Feb 2013 02:25:44 +0000 (18:25 -0800)] 
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes

12 years agoRefactor jumbotron example:
Mark Otto [Fri, 1 Feb 2013 02:22:47 +0000 (18:22 -0800)] 
Refactor jumbotron example:

* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views

12 years agoonly round jumbotron corners at 768px+
Mark Otto [Fri, 1 Feb 2013 02:11:45 +0000 (18:11 -0800)] 
only round jumbotron corners at 768px+

12 years agoButton up navbar form which was adding 2px padding to .navbar
Mark Otto [Fri, 1 Feb 2013 02:09:49 +0000 (18:09 -0800)] 
Button up navbar form which was adding 2px padding to .navbar

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

12 years agoUpdate starter template to include left/right padding on inner container; also includ...
Mark Otto [Fri, 1 Feb 2013 02:06:56 +0000 (18:06 -0800)] 
Update starter template to include left/right padding on inner container; also include body padding

12 years agoRemove gallery link from navbar; add to homepage examples section instead
Mark Otto [Fri, 1 Feb 2013 02:00:11 +0000 (18:00 -0800)] 
Remove gallery link from navbar; add to homepage examples section instead

12 years agoMerge branch '2.3.0-wip' into 3.0.0-wip
Mark Otto [Fri, 1 Feb 2013 01:57:31 +0000 (17:57 -0800)] 
Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less

12 years agoUpdate line-height and padding for input sizes
Gil Barbara [Thu, 31 Jan 2013 21:00:22 +0000 (19:00 -0200)] 
Update line-height and padding for input sizes

12 years agoremoves anchor tag definition. 6763/head
RJ Regenold [Thu, 31 Jan 2013 18:49:53 +0000 (12:49 -0600)] 
removes anchor tag definition.

12 years agolets see how much i can mess this pull request up. :|
RJ Regenold [Thu, 31 Jan 2013 17:10:41 +0000 (11:10 -0600)] 
lets see how much i can mess this pull request up. :|

12 years agoits not dyslexic being easy.
RJ Regenold [Thu, 31 Jan 2013 17:04:12 +0000 (11:04 -0600)] 
its not dyslexic being easy.

12 years agofixes jankiness with anchor tags in carousel.
RJ Regenold [Thu, 31 Jan 2013 15:06:37 +0000 (09:06 -0600)] 
fixes jankiness with anchor tags in carousel.

12 years agomake on prev commit
Mark Otto [Thu, 31 Jan 2013 02:22:20 +0000 (18:22 -0800)] 
make on prev commit

12 years agoMerge branch 'baslr-master' into 2.3.0-wip
Mark Otto [Thu, 31 Jan 2013 02:22:11 +0000 (18:22 -0800)] 
Merge branch 'baslr-master' into 2.3.0-wip

12 years agoclear up show-grid stuff
Mark Otto [Thu, 31 Jan 2013 02:16:14 +0000 (18:16 -0800)] 
clear up show-grid stuff

12 years agoadd meta tag to second example
Mark Otto [Thu, 31 Jan 2013 01:46:18 +0000 (17:46 -0800)] 
add meta tag to second example

12 years agomake on prev commit
Mark Otto [Thu, 31 Jan 2013 01:45:02 +0000 (17:45 -0800)] 
make on prev commit

12 years agoMerge branch 'greg-raven-patch-2' into 2.3.0-wip
Mark Otto [Thu, 31 Jan 2013 01:44:45 +0000 (17:44 -0800)] 
Merge branch 'greg-raven-patch-2' into 2.3.0-wip

12 years agoUpdate pagination example HTML to match examples
Mark Otto [Thu, 31 Jan 2013 01:42:03 +0000 (17:42 -0800)] 
Update pagination example HTML to match examples

12 years agoMerge pull request #6750 from nextgenthemes/3.0.0-wip
Mark Otto [Wed, 30 Jan 2013 20:44:10 +0000 (12:44 -0800)] 
Merge pull request #6750 from nextgenthemes/3.0.0-wip

Update less/carousel.less

12 years agoUpdate less/carousel.less 6750/head
nextgenthemes [Wed, 30 Jan 2013 17:14:22 +0000 (18:14 +0100)] 
Update less/carousel.less

lessified .carousel-caption

12 years agoMerge pull request #6728 from fredsa/2.3.0-wip
Mark Otto [Mon, 28 Jan 2013 18:35:16 +0000 (10:35 -0800)] 
Merge pull request #6728 from fredsa/2.3.0-wip

Fix `form-actions` documentation

12 years agoFix form-actions documentation 6728/head
Fred Sauer [Mon, 28 Jan 2013 18:01:59 +0000 (10:01 -0800)] 
Fix form-actions documentation

12 years ago.icon-folder-close same width as icon-folder-open 6710/head
baslr [Sat, 26 Jan 2013 00:01:10 +0000 (01:01 +0100)] 
.icon-folder-close same width as icon-folder-open

.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folderĀ 

12 years agoUpdate less/mixins.less 6685/head
Francisco arenas [Thu, 24 Jan 2013 05:37:52 +0000 (03:37 -0200)] 
Update less/mixins.less

horizontal three color gradient added

12 years agoUpdate docs/templates/pages/getting-started.mustache 6667/head
Greg Raven [Tue, 22 Jan 2013 14:46:53 +0000 (06:46 -0800)] 
Update docs/templates/pages/getting-started.mustache

Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.

12 years agoTighten up badges docs; less bottom margin on h3
Mark Otto [Sun, 20 Jan 2013 02:53:41 +0000 (18:53 -0800)] 
Tighten up badges docs; less bottom margin on h3

12 years agoMerge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap...
Mark Otto [Sun, 20 Jan 2013 01:06:40 +0000 (17:06 -0800)] 
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters

12 years agoIE8 compatible fix for disabled button hover 6639/head
Vickash Mahabir [Sat, 19 Jan 2013 23:32:55 +0000 (19:32 -0400)] 
IE8 compatible fix for disabled button hover

12 years agoremove .navbar-inner from sticky footer navbar
Mark Otto [Sat, 19 Jan 2013 17:40:26 +0000 (09:40 -0800)] 
remove .navbar-inner from sticky footer navbar

12 years agomo betta links between sticky footer examples
Mark Otto [Sat, 19 Jan 2013 17:39:56 +0000 (09:39 -0800)] 
mo betta links between sticky footer examples

12 years agoAdd sticky footer navbar example to list; fix docs padding
Mark Otto [Sat, 19 Jan 2013 17:38:49 +0000 (09:38 -0800)] 
Add sticky footer navbar example to list; fix docs padding

12 years agoupdate sticky footer templates
Mark Otto [Sat, 19 Jan 2013 17:34:08 +0000 (09:34 -0800)] 
update sticky footer templates

12 years agoCounters example doesn't need to be a table 6634/head
Vickash Mahabir [Fri, 18 Jan 2013 22:03:43 +0000 (18:03 -0400)] 
Counters example doesn't need to be a table

12 years agoMake the counter example more meaningful
Vickash Mahabir [Fri, 18 Jan 2013 21:50:58 +0000 (17:50 -0400)] 
Make the counter example more meaningful

12 years agoChange .badge to .counter, make appearance more OSX-ish, and remove colors
Vickash Mahabir [Fri, 18 Jan 2013 21:35:23 +0000 (17:35 -0400)] 
Change .badge to .counter, make appearance more OSX-ish, and remove colors

12 years agoFix logic error where a disabled button would change color in an enabled fieldset 6630/head
Vickash Mahabir [Fri, 18 Jan 2013 16:12:30 +0000 (12:12 -0400)] 
Fix logic error where a disabled button would change color in an enabled fieldset

12 years agoForgot to add built docs css file
Vickash Mahabir [Fri, 18 Jan 2013 15:58:12 +0000 (11:58 -0400)] 
Forgot to add built docs css file

12 years agoFix that thing with disabled buttons changing color on hover
Vickash Mahabir [Fri, 18 Jan 2013 15:55:17 +0000 (11:55 -0400)] 
Fix that thing with disabled buttons changing color on hover

12 years agounified and simplified sign in form example
Mark Otto [Fri, 18 Jan 2013 09:52:16 +0000 (01:52 -0800)] 
unified and simplified sign in form example

12 years agocleanup more examples
Mark Otto [Fri, 18 Jan 2013 09:37:31 +0000 (01:37 -0800)] 
cleanup more examples

12 years agomo betta justified nav
Mark Otto [Fri, 18 Jan 2013 09:33:55 +0000 (01:33 -0800)] 
mo betta justified nav

12 years agooverhaul justified nav example
Mark Otto [Fri, 18 Jan 2013 05:05:23 +0000 (21:05 -0800)] 
overhaul justified nav example

12 years agoRemove docs and prettify css from examples thus far; update narrow page
Mark Otto [Fri, 18 Jan 2013 04:39:38 +0000 (20:39 -0800)] 
Remove docs and prettify css from examples thus far; update narrow page

12 years agofix up jumbotron example
Mark Otto [Fri, 18 Jan 2013 04:35:59 +0000 (20:35 -0800)] 
fix up jumbotron example

12 years agoRename hero.html to jumbotron.html
Mark Otto [Fri, 18 Jan 2013 04:32:07 +0000 (20:32 -0800)] 
Rename hero.html to jumbotron.html

12 years agoSemibold dat .navbar .brand
Mark Otto [Fri, 18 Jan 2013 04:30:40 +0000 (20:30 -0800)] 
Semibold dat .navbar .brand

12 years agofinish updating starter template
Mark Otto [Fri, 18 Jan 2013 04:30:19 +0000 (20:30 -0800)] 
finish updating starter template

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 agoUpdate commenting and structure of layout.mustache
Mark Otto [Fri, 18 Jan 2013 04:26:17 +0000 (20:26 -0800)] 
Update commenting and structure of layout.mustache

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 agoCombine .thumbnail and .img-thumbnail into simpler selectors
Mark Otto [Fri, 18 Jan 2013 04:18:03 +0000 (20:18 -0800)] 
Combine .thumbnail and .img-thumbnail into simpler selectors

12 years agoChange .img-polaroid to .img-thumbnail
Mark Otto [Fri, 18 Jan 2013 04:16:04 +0000 (20:16 -0800)] 
Change .img-polaroid to .img-thumbnail

* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail

12 years agoRemove .info from table rows
Mark Otto [Fri, 18 Jan 2013 04:13:11 +0000 (20:13 -0800)] 
Remove .info from table rows

12 years agoRestore .btn-info
Mark Otto [Fri, 18 Jan 2013 03:51:22 +0000 (19:51 -0800)] 
Restore .btn-info

12 years agoRestore nav tabs, pills, justified variation, disabled links, and a few more things...
Mark Otto [Fri, 18 Jan 2013 01:02:35 +0000 (17:02 -0800)] 
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.

12 years agoderp, numbers
Mark Otto [Fri, 18 Jan 2013 00:35:30 +0000 (16:35 -0800)] 
derp, numbers

12 years agodat min
Mark Otto [Fri, 18 Jan 2013 00:11:01 +0000 (16:11 -0800)] 
dat min

12 years agoremove global text-shadow from alerts components because it was fucking up buttons...
Mark Otto [Thu, 17 Jan 2013 23:43:23 +0000 (15:43 -0800)] 
remove global text-shadow from alerts components because it was fucking up buttons in a real way

12 years agoscrollspy example twerks
Mark Otto [Thu, 17 Jan 2013 23:42:52 +0000 (15:42 -0800)] 
scrollspy example twerks

12 years agorestore scrollspy example
Mark Otto [Thu, 17 Jan 2013 23:40:43 +0000 (15:40 -0800)] 
restore scrollspy example

12 years agoReadd focused example of inputs to docs; clean up alerts section
Mark Otto [Thu, 17 Jan 2013 23:36:36 +0000 (15:36 -0800)] 
Readd focused example of inputs to docs; clean up alerts section

12 years agocleanup example templates
Mark Otto [Thu, 17 Jan 2013 23:00:49 +0000 (15:00 -0800)] 
cleanup example templates

12 years agoUpdate Getting Started page to include mention of Respond
Mark Otto [Thu, 17 Jan 2013 22:49:52 +0000 (14:49 -0800)] 
Update Getting Started page to include mention of Respond

12 years agoNuke shadows around thumbnails
Mark Otto [Thu, 17 Jan 2013 22:25:40 +0000 (14:25 -0800)] 
Nuke shadows around thumbnails