]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoMoved modals inline properties to variables.less 8585/head
syed [Wed, 24 Jul 2013 13:43:21 +0000 (18:43 +0500)] 
Moved modals inline properties to variables.less

In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Wed, 24 Jul 2013 06:51:18 +0000 (23:51 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoadd placement auto for tooltips + tests… kinda sad about this doe
Jacob Thornton [Wed, 24 Jul 2013 06:50:23 +0000 (23:50 -0700)] 
add placement auto for tooltips + tests… kinda sad about this doe

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

12 years agoRun make on prev commits
Mark Otto [Wed, 24 Jul 2013 06:48:17 +0000 (23:48 -0700)] 
Run make on prev commits

12 years agoUpdate forms vars
Mark Otto [Wed, 24 Jul 2013 06:25:46 +0000 (23:25 -0700)] 
Update forms vars

* Reorganize layout
* Add input group var
* Add legend border var

12 years agoReorganize dropdown vars section
Mark Otto [Wed, 24 Jul 2013 06:22:13 +0000 (23:22 -0700)] 
Reorganize dropdown vars section

12 years agoUpdate dropdown vars
Mark Otto [Wed, 24 Jul 2013 06:18:53 +0000 (23:18 -0700)] 
Update dropdown vars

* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer

12 years agoUpdate code vars
Mark Otto [Wed, 24 Jul 2013 06:13:15 +0000 (23:13 -0700)] 
Update code vars

* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`

12 years agoUpdate close vars
Mark Otto [Wed, 24 Jul 2013 06:09:06 +0000 (23:09 -0700)] 
Update close vars

* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer

12 years agoUpdate carousel vars
Mark Otto [Wed, 24 Jul 2013 06:03:57 +0000 (23:03 -0700)] 
Update carousel vars

* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Wed, 24 Jul 2013 05:59:33 +0000 (22:59 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
dist/js/bootstrap.min.js

12 years agofixes #7814
Jacob Thornton [Wed, 24 Jul 2013 05:58:14 +0000 (22:58 -0700)] 
fixes #7814

12 years agoUpdate and add `@btn-hover-color` to Customize page
Mark Otto [Wed, 24 Jul 2013 05:53:30 +0000 (22:53 -0700)] 
Update and add `@btn-hover-color` to Customize page

12 years agoMerge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0...
Mark Otto [Wed, 24 Jul 2013 05:49:13 +0000 (22:49 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

12 years agoFixes #8571: allow table classes in thead and tfoot
Mark Otto [Wed, 24 Jul 2013 05:27:49 +0000 (22:27 -0700)] 
Fixes #8571: allow table classes in thead and tfoot

12 years agomake on prev commit
Mark Otto [Wed, 24 Jul 2013 04:23:13 +0000 (21:23 -0700)] 
make on prev commit

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

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Jacob Thornton [Wed, 24 Jul 2013 03:53:32 +0000 (20:53 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofixes #8232
Jacob Thornton [Wed, 24 Jul 2013 03:53:12 +0000 (20:53 -0700)] 
fixes #8232

12 years agoMerge pull request #8576 from sfaxon/3.0.0-wip
Mark Otto [Wed, 24 Jul 2013 03:17:40 +0000 (20:17 -0700)] 
Merge pull request #8576 from sfaxon/3.0.0-wip

update carousel js docs to reflect leading .glyphicon

12 years agoClear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source...
Mark Otto [Wed, 24 Jul 2013 03:16:02 +0000 (20:16 -0700)] 
Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software"

12 years agoUpdate link to blog
Mark Otto [Wed, 24 Jul 2013 02:52:44 +0000 (19:52 -0700)] 
Update link to blog

12 years agoupdate carousel js docs to reflect leading .glyphicon 8576/head
Seth Faxon [Wed, 24 Jul 2013 02:38:23 +0000 (19:38 -0700)] 
update carousel js docs to reflect leading .glyphicon
  https://github.com/twitter/bootstrap/pull/6342 icons section
  mentions the change to using glyphicon base class
  this adds it to the docs

12 years agoadd additional carousel test
Jacob Thornton [Wed, 24 Jul 2013 01:56:00 +0000 (18:56 -0700)] 
add additional carousel test

12 years agofixes #8134
Jacob Thornton [Wed, 24 Jul 2013 01:54:00 +0000 (18:54 -0700)] 
fixes #8134

12 years agorevert collapse change + add emulateTransitionEvent to catch dead css transitions
Jacob Thornton [Wed, 24 Jul 2013 01:44:08 +0000 (18:44 -0700)] 
revert collapse change + add emulateTransitionEvent to catch dead css transitions

12 years agoshown.bs.modal fix
Jacob Thornton [Wed, 24 Jul 2013 00:32:20 +0000 (17:32 -0700)] 
shown.bs.modal fix

12 years agofixes #7970
Jacob Thornton [Wed, 24 Jul 2013 00:23:02 +0000 (17:23 -0700)] 
fixes #7970

12 years agoMerge pull request #8572 from mohnish/patch-1
Mark Otto [Tue, 23 Jul 2013 21:23:17 +0000 (14:23 -0700)] 
Merge pull request #8572 from mohnish/patch-1

Use input type `password` for the password field in the CSS documentatio...

12 years agoMerge pull request #8573 from cvrebert/patch-2
Mark Otto [Tue, 23 Jul 2013 21:22:59 +0000 (14:22 -0700)] 
Merge pull request #8573 from cvrebert/patch-2

getting-started.html: add <code> around mention of `placeholder`

12 years agogetting-started.html: add <code> around mention of `placeholder` 8573/head
Chris Rebert [Tue, 23 Jul 2013 20:00:28 +0000 (13:00 -0700)] 
getting-started.html: add <code> around mention of `placeholder`

12 years agoUse input type `password` for the password field in the CSS documentation. 8572/head
Mohnish Thallavajhula [Tue, 23 Jul 2013 18:50:01 +0000 (11:50 -0700)] 
Use input type `password` for the password field in the CSS documentation.

12 years agoDrop rounded corners on `.table-bordered`
Mark Otto [Tue, 23 Jul 2013 17:48:30 +0000 (10:48 -0700)] 
Drop rounded corners on `.table-bordered`

* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 23 Jul 2013 17:19:04 +0000 (10:19 -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 agoNo more left margin on dd elements, fixes #8567
Mark Otto [Tue, 23 Jul 2013 17:18:34 +0000 (10:18 -0700)] 
No more left margin on dd elements, fixes #8567

12 years agoMerge pull request #8564 from frabrunelle/3.0.0-wip
Mark Otto [Tue, 23 Jul 2013 17:05:49 +0000 (10:05 -0700)] 
Merge pull request #8564 from frabrunelle/3.0.0-wip

@badge-bg should be @gray-light not #f5f5f5

12 years ago@badge-bg should be @gray-light not #f5f5f5 8564/head
Francis Brunelle [Tue, 23 Jul 2013 04:05:45 +0000 (00:05 -0400)] 
@badge-bg should be @gray-light not #f5f5f5

12 years agofixes #8559
Mark Otto [Mon, 22 Jul 2013 21:44:36 +0000 (14:44 -0700)] 
fixes #8559

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 agomoving forms, labels and list-group to variables.less 8534/head
syed [Sat, 20 Jul 2013 08:38:27 +0000 (13:38 +0500)] 
moving forms, labels and list-group to variables.less

12 years agomoving code and dropdowns to variables.less
syed [Sat, 20 Jul 2013 08:17:56 +0000 (13:17 +0500)] 
moving code and dropdowns to variables.less

12 years agoMove inline properties to variables.less
syed [Sat, 20 Jul 2013 07:56:20 +0000 (12:56 +0500)] 
Move inline properties to variables.less

moved buttons.less, carousel.less & close.less in this commit

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