]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMerge pull request #8549 from ggam/patch-2
Mark Otto [Sun, 21 Jul 2013 23:07:55 +0000 (16:07 -0700)] 
Merge pull request #8549 from ggam/patch-2

Updated readme.md to reflect the latest changes in directory structure

12 years agoUpdated readme.md to reflect the latest changes in directory structure 8549/head
Guillermo González de Agüero [Sun, 21 Jul 2013 19:57:41 +0000 (21:57 +0200)] 
Updated readme.md to reflect the latest changes in directory structure

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sun, 21 Jul 2013 15:52:25 +0000 (08:52 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
dist/css/bootstrap.min.css

12 years agoMerge pull request #8546 from jeroenvisser101/patch-1
Mark Otto [Sun, 21 Jul 2013 15:50:12 +0000 (08:50 -0700)] 
Merge pull request #8546 from jeroenvisser101/patch-1

Fixed typo

12 years agoMerge pull request #8545 from liuyl/refactor-btngroups
Mark Otto [Sun, 21 Jul 2013 15:49:52 +0000 (08:49 -0700)] 
Merge pull request #8545 from liuyl/refactor-btngroups

refactor button-groups.less

12 years agoMerge pull request #8544 from liuyl/removeuseless
Mark Otto [Sun, 21 Jul 2013 15:49:34 +0000 (08:49 -0700)] 
Merge pull request #8544 from liuyl/removeuseless

remove useless display:inline-block

12 years agoFixed typo 8546/head
Jeroen Visser [Sun, 21 Jul 2013 12:20:21 +0000 (14:20 +0200)] 
Fixed typo

12 years agorefactor button-groups.less 8545/head
liuyl [Sun, 21 Jul 2013 12:03:59 +0000 (20:03 +0800)] 
refactor button-groups.less

12 years agoremove useless display:inline-block 8544/head
liuyl [Sun, 21 Jul 2013 11:44:30 +0000 (19:44 +0800)] 
remove useless display:inline-block

12 years agoUpdate file input to remove height and line-height
Mark Otto [Sun, 21 Jul 2013 04:09:03 +0000 (21:09 -0700)] 
Update file input to remove height and line-height

This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.

12 years agoUpdate docs on responsive images and elaborate on IE8 support using Respond.js
Mark Otto [Sun, 21 Jul 2013 03:58:23 +0000 (20:58 -0700)] 
Update docs on responsive images and elaborate on IE8 support using Respond.js

12 years agoUpdate forms example to show sequential form inputs for later testing
Mark Otto [Sun, 21 Jul 2013 03:11:53 +0000 (20:11 -0700)] 
Update forms example to show sequential form inputs for later testing

12 years agoRemove more commented out CSS from forms
Mark Otto [Sun, 21 Jul 2013 02:32:21 +0000 (19:32 -0700)] 
Remove more commented out CSS from forms

12 years agoRemove commented out CSS
Mark Otto [Sun, 21 Jul 2013 02:31:56 +0000 (19:31 -0700)] 
Remove commented out CSS

12 years agoMerge pull request #8538 from brentmulligan/3.0.0-wip
Mark Otto [Sat, 20 Jul 2013 23:58:00 +0000 (16:58 -0700)] 
Merge pull request #8538 from brentmulligan/3.0.0-wip

Update Normalize.css URL to new Github.io domain

12 years agoMerge pull request #8536 from ggam/patch-1
Mark Otto [Sat, 20 Jul 2013 23:57:30 +0000 (16:57 -0700)] 
Merge pull request #8536 from ggam/patch-1

Fixed breadcrumbs link in customize

12 years agoUpdate Normalize.css URL to new Github.io domain 8538/head
Brent Mulligan [Sat, 20 Jul 2013 19:38:38 +0000 (15:38 -0400)] 
Update Normalize.css URL to new Github.io domain

12 years agoFixed breadcrumbs link 8536/head
Guillermo González de Agüero [Sat, 20 Jul 2013 12:38:10 +0000 (14:38 +0200)] 
Fixed breadcrumbs link

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sat, 20 Jul 2013 07:11:02 +0000 (00:11 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoupdate headings and nav
Mark Otto [Sat, 20 Jul 2013 07:10:51 +0000 (00:10 -0700)] 
update headings and nav

12 years agoundo change to config exclude
Mark Otto [Sat, 20 Jul 2013 07:07:04 +0000 (00:07 -0700)] 
undo change to config exclude

12 years agoUpdate vars for badges, breadcrumbs; update customize page
Mark Otto [Sat, 20 Jul 2013 07:03:08 +0000 (00:03 -0700)] 
Update vars for badges, breadcrumbs; update customize page

12 years agoMove var in customize layout
Mark Otto [Sat, 20 Jul 2013 06:43:17 +0000 (23:43 -0700)] 
Move var in customize layout

12 years agoMerge pull request #8533 from frabrunelle/bower-link
Mark Otto [Sat, 20 Jul 2013 04:42:30 +0000 (21:42 -0700)] 
Merge pull request #8533 from frabrunelle/bower-link

update links to bower

12 years agoupdate links to bower 8533/head
Francis Brunelle [Sat, 20 Jul 2013 01:28:21 +0000 (21:28 -0400)] 
update links to bower

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Sat, 20 Jul 2013 00:36:16 +0000 (17:36 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8385: update carousel captions
Mark Otto [Sat, 20 Jul 2013 00:36:03 +0000 (17:36 -0700)] 
Fixes #8385: update carousel captions

* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing

12 years agoTwerk callouts and fix an unstyled one
Mark Otto [Sat, 20 Jul 2013 00:17:52 +0000 (17:17 -0700)] 
Twerk callouts and fix an unstyled one

12 years agoBetter code snippets on mobile in docs
Mark Otto [Sat, 20 Jul 2013 00:09:39 +0000 (17:09 -0700)] 
Better code snippets on mobile in docs

12 years agoMerge pull request #8530 from codeodor/3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 23:54:22 +0000 (16:54 -0700)] 
Merge pull request #8530 from codeodor/3.0.0-wip

ignore .files for bower packaging

12 years agoFixes #8278: fix on print
Mark Otto [Fri, 19 Jul 2013 23:49:38 +0000 (16:49 -0700)] 
Fixes #8278: fix  on print

12 years agohacky way of not showing ads or analytics in local dev
Mark Otto [Fri, 19 Jul 2013 21:08:16 +0000 (14:08 -0700)] 
hacky way of not showing ads or analytics in local dev

12 years agoVariables reorganization and breadcrumbs update
Mark Otto [Fri, 19 Jul 2013 18:44:35 +0000 (11:44 -0700)] 
Variables reorganization and breadcrumbs update

* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`

12 years agoMerge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0...
Mark Otto [Fri, 19 Jul 2013 18:29:21 +0000 (11:29 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

12 years agoignore .files for bower packaging 8530/head
Sammy Larbi [Fri, 19 Jul 2013 18:23:17 +0000 (13:23 -0500)] 
ignore .files for bower packaging

12 years agoImproved and followed pattern suggestions 8529/head
syed [Fri, 19 Jul 2013 18:14:13 +0000 (23:14 +0500)] 
Improved and followed pattern suggestions

12 years agoMerge pull request #8528 from dtmax/3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 16:34:20 +0000 (09:34 -0700)] 
Merge pull request #8528 from dtmax/3.0.0-wip

typo fixed: highligted source code of second radio button was missing

12 years agomove breadcrumb.less inline properties and also added @color-2 missed in last commit
syed [Fri, 19 Jul 2013 13:39:51 +0000 (18:39 +0500)] 
move breadcrumb.less inline properties and also added @color-2 missed in last commit

12 years agomove badges inline properties to variables.less
syed [Fri, 19 Jul 2013 13:29:19 +0000 (18:29 +0500)] 
move badges inline properties to variables.less

12 years agoMove accordion inline properties to variables.les
syed [Fri, 19 Jul 2013 13:18:01 +0000 (18:18 +0500)] 
Move accordion inline properties to variables.les

12 years agotypo fixed: highligted source code of second radio button was missing in css.html... 8528/head
Max [Fri, 19 Jul 2013 10:28:26 +0000 (13:28 +0300)] 
typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section

12 years agoMerge pull request #8524 from jholl/patch-1
Mark Otto [Fri, 19 Jul 2013 04:07:34 +0000 (21:07 -0700)] 
Merge pull request #8524 from jholl/patch-1

fix typo / doc components.html responsive menu dropdowns now have ref to...

12 years agofix typo / doc components.html responsive menu dropdowns now have ref to .dropdown... 8524/head
James Holland [Fri, 19 Jul 2013 04:04:58 +0000 (00:04 -0400)] 
fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 02:53:53 +0000 (19:53 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years ago`<input>` and `<select>` sizing update
Mark Otto [Fri, 19 Jul 2013 02:53:32 +0000 (19:53 -0700)] 
`<input>` and  `<select>` sizing update

Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).

12 years agoMerge pull request #8521 from epicyclist/3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 02:36:16 +0000 (19:36 -0700)] 
Merge pull request #8521 from epicyclist/3.0.0-wip

Documentation updates.

12 years agoRemove Mustache comment regarding contribution: it's going away. 8521/head
Christopher Canipe [Fri, 19 Jul 2013 02:09:33 +0000 (20:09 -0600)] 
Remove Mustache comment regarding contribution: it's going away.

12 years agoClean up tooltip's trigger description in the docs.
Christopher Canipe [Fri, 19 Jul 2013 01:41:42 +0000 (19:41 -0600)] 
Clean up tooltip's trigger description in the docs.

12 years agoAdd minified CSS to dist folder
Mark Otto [Fri, 19 Jul 2013 01:33:20 +0000 (18:33 -0700)] 
Add minified CSS to dist folder

12 years agoMerge branch 'bs3_rc1' into 3.0.0-wip
Mark Otto [Fri, 19 Jul 2013 01:16:50 +0000 (18:16 -0700)] 
Merge branch 'bs3_rc1' into 3.0.0-wip

12 years agofinish flattening repo structure; add dist folder of compiled css/js
Mark Otto [Fri, 19 Jul 2013 01:14:49 +0000 (18:14 -0700)] 
finish flattening repo structure; add dist folder of compiled css/js

12 years agoflatten docs dir back into root
Mark Otto [Fri, 19 Jul 2013 00:41:30 +0000 (17:41 -0700)] 
flatten docs dir back into root

12 years agoFixes #8516: correct input-small and input-large on select elements
Mark Otto [Thu, 18 Jul 2013 22:36:41 +0000 (15:36 -0700)] 
Fixes #8516: correct input-small and input-large on select elements

12 years agoJankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429...
Mark Otto [Thu, 18 Jul 2013 22:28:38 +0000 (15:28 -0700)] 
Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067)

12 years agoMerge pull request #8517 from cvrebert/gloss-unicode
Mark Otto [Thu, 18 Jul 2013 21:43:38 +0000 (14:43 -0700)] 
Merge pull request #8517 from cvrebert/gloss-unicode

add comments to gloss Unicode codepoint hex

12 years agochange download button label
Mark Otto [Thu, 18 Jul 2013 21:08:40 +0000 (14:08 -0700)] 
change download button label

12 years agocopy change to css page subheading
Mark Otto [Thu, 18 Jul 2013 21:06:13 +0000 (14:06 -0700)] 
copy change to css page subheading

12 years agorelative url
Mark Otto [Thu, 18 Jul 2013 20:51:08 +0000 (13:51 -0700)] 
relative url

12 years agovertically center ad
Mark Otto [Thu, 18 Jul 2013 20:35:55 +0000 (13:35 -0700)] 
vertically center ad

12 years agoMerge branch 'bs3_old_docs_callout' into bs3_rc1
Mark Otto [Thu, 18 Jul 2013 20:07:49 +0000 (13:07 -0700)] 
Merge branch 'bs3_old_docs_callout' into bs3_rc1

12 years agoMerge branch 'bs3_add_ads' into bs3_rc1
Mark Otto [Thu, 18 Jul 2013 20:07:17 +0000 (13:07 -0700)] 
Merge branch 'bs3_add_ads' into bs3_rc1

12 years agoclarify IE support and rearrange getting started docs a bit
Mark Otto [Thu, 18 Jul 2013 20:05:53 +0000 (13:05 -0700)] 
clarify IE support and rearrange getting started docs a bit

12 years agoadd comments to gloss Unicode codepoint hex 8517/head
Chris Rebert [Thu, 18 Jul 2013 18:49:39 +0000 (11:49 -0700)] 
add comments to gloss Unicode codepoint hex

12 years agofixes #8206: Use navbar height var to compute vertical padding on navbar-brand
Mark Otto [Thu, 18 Jul 2013 09:23:38 +0000 (02:23 -0700)] 
fixes #8206: Use navbar height var to compute vertical padding on navbar-brand

12 years agofor some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed...
Mark Otto [Thu, 18 Jul 2013 09:19:13 +0000 (02:19 -0700)] 
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions

12 years agoQuick pass at new touch and favicons
Mark Otto [Thu, 18 Jul 2013 09:05:41 +0000 (02:05 -0700)] 
Quick pass at new touch and favicons

12 years agotwerk comment
Mark Otto [Thu, 18 Jul 2013 08:46:31 +0000 (01:46 -0700)] 
twerk comment

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 08:25:28 +0000 (01:25 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8374: ensure navbar is always at least 50px
Mark Otto [Thu, 18 Jul 2013 08:25:08 +0000 (01:25 -0700)] 
Fixes #8374: ensure navbar is always at least 50px

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 08:08:19 +0000 (01:08 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js

12 years agocleaner way of preventing double click events + clean up tests for jshint
fat [Thu, 18 Jul 2013 08:07:11 +0000 (01:07 -0700)] 
cleaner way of preventing double click events + clean up tests for jshint

12 years agoFixes #8397: better navbar padding with grid gutter stuff
Mark Otto [Thu, 18 Jul 2013 08:04:54 +0000 (01:04 -0700)] 
Fixes #8397: better navbar padding with grid gutter stuff

12 years agoget button js working with actual form elements p cooll
fat [Thu, 18 Jul 2013 07:59:31 +0000 (00:59 -0700)] 
get button js working with actual form elements p cooll

12 years agospacing and local var rename
Mark Otto [Thu, 18 Jul 2013 07:56:36 +0000 (00:56 -0700)] 
spacing and local var rename

12 years agoMerge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen...
Mark Otto [Thu, 18 Jul 2013 07:55:36 +0000 (00:55 -0700)] 
Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1

12 years agorun make on mixin changes from #8380
Mark Otto [Thu, 18 Jul 2013 07:50:57 +0000 (00:50 -0700)] 
run make on mixin changes from #8380

12 years agoMerge pull request #8380 from joeybaker/patch-1
Mark Otto [Thu, 18 Jul 2013 07:50:15 +0000 (00:50 -0700)] 
Merge pull request #8380 from joeybaker/patch-1

Remove unneeded prefixes from some mixins

12 years agochange characters
Mark Otto [Thu, 18 Jul 2013 07:48:02 +0000 (00:48 -0700)] 
change characters

12 years agoMerge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3...
Mark Otto [Thu, 18 Jul 2013 07:43:48 +0000 (00:43 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip

12 years agoVurrriables and shit
Mark Otto [Thu, 18 Jul 2013 07:23:35 +0000 (00:23 -0700)] 
Vurrriables and shit

12 years agoFixes #8452: adds `.active` to table classes
Mark Otto [Thu, 18 Jul 2013 07:10:22 +0000 (00:10 -0700)] 
Fixes #8452: adds `.active` to table classes

12 years agomake on collapse changes
Mark Otto [Thu, 18 Jul 2013 06:56:38 +0000 (23:56 -0700)] 
make on collapse changes

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 06:56:27 +0000 (23:56 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoFixes #8441: remove `@font-size-mini`
Mark Otto [Thu, 18 Jul 2013 06:56:20 +0000 (23:56 -0700)] 
Fixes #8441: remove `@font-size-mini`

12 years agoBump tooltips to use `@font-size-small` (11px to 12px)
Mark Otto [Thu, 18 Jul 2013 06:55:58 +0000 (23:55 -0700)] 
Bump tooltips to use `@font-size-small` (11px to 12px)

12 years agoDrop `.nav-header` for `.dropdown-header`
Mark Otto [Thu, 18 Jul 2013 06:54:09 +0000 (23:54 -0700)] 
Drop `.nav-header` for `.dropdown-header`

* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:52:55 +0000 (23:52 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #7880
fat [Thu, 18 Jul 2013 06:52:29 +0000 (23:52 -0700)] 
fixes #7880

12 years agofixes #8477: use var for rounded image border-radius
Mark Otto [Thu, 18 Jul 2013 06:41:05 +0000 (23:41 -0700)] 
fixes #8477: use var for rounded image border-radius

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 18 Jul 2013 06:34:31 +0000 (23:34 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
docs/assets/js/bootstrap.min.js

12 years agofixes #8491: add vars for table padding
Mark Otto [Thu, 18 Jul 2013 06:34:04 +0000 (23:34 -0700)] 
fixes #8491: add vars for table padding

12 years agomake on prev js changes
Mark Otto [Thu, 18 Jul 2013 06:33:34 +0000 (23:33 -0700)] 
make on prev js changes

12 years agofixes #7777
fat [Thu, 18 Jul 2013 06:30:05 +0000 (23:30 -0700)] 
fixes #7777

12 years agofixes #7776
fat [Thu, 18 Jul 2013 06:25:26 +0000 (23:25 -0700)] 
fixes #7776

12 years agoadd ads to v3 docs
Mark Otto [Thu, 18 Jul 2013 06:22:28 +0000 (23:22 -0700)] 
add ads to v3 docs

12 years agofixes #7755
fat [Thu, 18 Jul 2013 06:15:50 +0000 (23:15 -0700)] 
fixes #7755

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Thu, 18 Jul 2013 06:02:15 +0000 (23:02 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix #7660
fat [Thu, 18 Jul 2013 06:01:33 +0000 (23:01 -0700)] 
fix #7660

12 years agoadd callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
Mark Otto [Thu, 18 Jul 2013 05:58:49 +0000 (22:58 -0700)] 
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post

12 years agoMerge pull request #8511 from twitter/bs3_remove_examples
Mark Otto [Thu, 18 Jul 2013 05:17:30 +0000 (22:17 -0700)] 
Merge pull request #8511 from twitter/bs3_remove_examples

BS3: Move examples to @twbs/bootstrap-examples