]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoExample of textarea 8630/head
Fred Delrieu [Fri, 26 Jul 2013 22:09:27 +0000 (00:09 +0200)] 
Example of textarea

12 years agoFixes #8605: use `.form-control` in `.input-group` instead of HTML tags
Mark Otto [Fri, 26 Jul 2013 21:31:24 +0000 (14:31 -0700)] 
Fixes #8605: use `.form-control` in `.input-group` instead of HTML tags

12 years agomore readme clarity and reorg--think this makes more sense now
Mark Otto [Fri, 26 Jul 2013 21:15:48 +0000 (14:15 -0700)] 
more readme clarity and reorg--think this makes more sense now

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 26 Jul 2013 21:09:45 +0000 (14:09 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agomore readme love
Mark Otto [Fri, 26 Jul 2013 21:09:12 +0000 (14:09 -0700)] 
more readme love

12 years agotweak terminology to be pedantically correct & add link
Chris Rebert [Fri, 26 Jul 2013 21:04:35 +0000 (14:04 -0700)] 
tweak terminology to be pedantically correct & add link

12 years agoupdate 2.3.x version mention and link in readme
Mark Otto [Fri, 26 Jul 2013 20:59:56 +0000 (13:59 -0700)] 
update 2.3.x version mention and link in readme

12 years agoupdate readme per comments in pr
Mark Otto [Fri, 26 Jul 2013 20:58:18 +0000 (13:58 -0700)] 
update readme per comments in pr

12 years agoMerge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3...
Mark Otto [Fri, 26 Jul 2013 20:51:27 +0000 (13:51 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip

12 years agoMake customize layout match default layout
Mark Otto [Fri, 26 Jul 2013 20:50:55 +0000 (13:50 -0700)] 
Make customize layout match default layout

12 years agoMore customizer changes, and revert to placeholder layout
Mark Otto [Fri, 26 Jul 2013 18:17:48 +0000 (11:17 -0700)] 
More customizer changes, and revert to placeholder layout

12 years agoFix broken indentation
Mark Otto [Fri, 26 Jul 2013 18:11:09 +0000 (11:11 -0700)] 
Fix broken indentation

Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.

12 years agoVars update
Mark Otto [Fri, 26 Jul 2013 18:08:27 +0000 (11:08 -0700)] 
Vars update

* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`

12 years agoMerge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0...
Mark Otto [Fri, 26 Jul 2013 17:44:46 +0000 (10:44 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip

12 years agoMerge pull request #8619 from jholl/patch-2
Mark Otto [Fri, 26 Jul 2013 17:35:20 +0000 (10:35 -0700)] 
Merge pull request #8619 from jholl/patch-2

align dropdown menu with .pull-right for .input-group-btn when btn on ri...

12 years agoMerge pull request #8624 from jholl/patch-2
Mark Otto [Fri, 26 Jul 2013 17:31:20 +0000 (10:31 -0700)] 
Merge pull request #8624 from jholl/patch-2

Update typo css.html move double class .form-control from label in examp...

12 years agoMerge pull request #8625 from liuyl/fixbtnbg
Mark Otto [Fri, 26 Jul 2013 17:30:41 +0000 (10:30 -0700)] 
Merge pull request #8625 from liuyl/fixbtnbg

Fix #8623

12 years agoMerge pull request #8626 from cowboy/3.0.0-wip
Chris Rebert [Fri, 26 Jul 2013 16:17:59 +0000 (09:17 -0700)] 
Merge pull request #8626 from cowboy/3.0.0-wip

It's Grunt, not GruntJS :)

12 years agoIt's Grunt, not GruntJS :) 8626/head
Ben Alman [Fri, 26 Jul 2013 16:00:45 +0000 (12:00 -0400)] 
It's Grunt, not GruntJS :)

12 years agofix background of btn-link 8625/head
Yulong Liu [Fri, 26 Jul 2013 14:27:55 +0000 (22:27 +0800)] 
fix background of btn-link

12 years agoremove background:none
Yulong Liu [Fri, 26 Jul 2013 13:59:50 +0000 (21:59 +0800)] 
remove background:none

12 years agoUpdate typo css.html move double class .form-control from label in example mark up... 8624/head
James Holland [Fri, 26 Jul 2013 13:43:05 +0000 (09:43 -0400)] 
Update typo css.html move double class .form-control from label in example mark up to input

missed the double class in label in recent commit #8621

12 years agomove things around :) 8620/head
syed [Fri, 26 Jul 2013 12:04:15 +0000 (17:04 +0500)] 
move things around :)

Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less

12 years agoalign dropdown menu with .pull-right for .input-group-btn when btn on right of input 8619/head
James Holland [Fri, 26 Jul 2013 11:52:40 +0000 (07:52 -0400)] 
align dropdown menu with .pull-right for .input-group-btn when btn on right of input

12 years agoAdded windows hint to jekyll documentation instructions. 8618/head
Jordan Hess [Fri, 26 Jul 2013 09:25:12 +0000 (03:25 -0600)] 
Added windows hint to jekyll documentation instructions.

12 years agoChanged old reference to "grunt bootstrap" to "grunt dist"
Jordan Hess [Fri, 26 Jul 2013 09:16:27 +0000 (03:16 -0600)] 
Changed old reference to "grunt bootstrap" to "grunt dist"

12 years agoreadme /cc @zdroid
Mark Otto [Fri, 26 Jul 2013 08:46:30 +0000 (01:46 -0700)] 
readme /cc @zdroid

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

12 years agoMo betta placement of old docs callouts
Mark Otto [Fri, 26 Jul 2013 08:43:43 +0000 (01:43 -0700)] 
Mo betta placement of old docs callouts

12 years agoMerge pull request #8614 from cvrebert/grunt
Chris Rebert [Fri, 26 Jul 2013 08:34:58 +0000 (01:34 -0700)] 
Merge pull request #8614 from cvrebert/grunt

Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1

12 years agoMerge pull request #8616 from caouecs/patch-1
Chris Rebert [Fri, 26 Jul 2013 08:20:10 +0000 (01:20 -0700)] 
Merge pull request #8616 from caouecs/patch-1

Small typo in less/mixins.less

12 years agore-integrate #8560 using @fat's code from the comment on #8614 8614/head
Chris Rebert [Fri, 26 Jul 2013 08:15:41 +0000 (01:15 -0700)] 
re-integrate #8560 using @fat's code from the comment on #8614

12 years agoSmall typo 8616/head
Fred Delrieu [Fri, 26 Jul 2013 08:10:35 +0000 (10:10 +0200)] 
Small typo

12 years agospecify explicit ordering for grunt concat step
Chris Rebert [Fri, 26 Jul 2013 08:07:56 +0000 (01:07 -0700)] 
specify explicit ordering for grunt concat step

12 years agoReplace Makefile with GruntJS
John-Philip Johansson [Sat, 4 May 2013 14:55:52 +0000 (16:55 +0200)] 
Replace Makefile with GruntJS

A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess

Rebased by @cvrebert

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Fri, 26 Jul 2013 07:22:48 +0000 (00:22 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix makefile error thing
fat [Fri, 26 Jul 2013 07:22:20 +0000 (00:22 -0700)] 
fix makefile error thing

12 years agoFixes #8586: add addional color text classes to apply all of branch colors easily
Mark Otto [Fri, 26 Jul 2013 07:18:18 +0000 (00:18 -0700)] 
Fixes #8586: add addional color text classes to apply all of branch colors easily

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

12 years agoFuck a color purple
Mark Otto [Fri, 26 Jul 2013 07:04:15 +0000 (00:04 -0700)] 
Fuck a color purple

12 years agoMake it so back to top link ain't broked no mo
Mark Otto [Fri, 26 Jul 2013 07:02:20 +0000 (00:02 -0700)] 
Make it so back to top link ain't broked no mo

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Fri, 26 Jul 2013 06:57:37 +0000 (23:57 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoupdate docs a bit more for affix
fat [Fri, 26 Jul 2013 06:57:21 +0000 (23:57 -0700)] 
update docs a bit more for affix

12 years agoupdate the affix docs a bit
fat [Fri, 26 Jul 2013 06:53:34 +0000 (23:53 -0700)] 
update the affix docs a bit

12 years agoFix up navbar forms
Mark Otto [Fri, 26 Jul 2013 06:32:12 +0000 (23:32 -0700)] 
Fix up navbar forms

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Fri, 26 Jul 2013 06:30:29 +0000 (23:30 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix affix…
fat [Fri, 26 Jul 2013 06:30:13 +0000 (23:30 -0700)] 
fix affix…

12 years agoDisable the customizer for rc1 for now
Mark Otto [Fri, 26 Jul 2013 06:29:43 +0000 (23:29 -0700)] 
Disable the customizer for rc1 for now

12 years agoBump version of old docs in callout
Mark Otto [Fri, 26 Jul 2013 04:52:21 +0000 (21:52 -0700)] 
Bump version of old docs in callout

12 years agoUpdate docs to better indicate v3 RC1
Mark Otto [Fri, 26 Jul 2013 04:51:45 +0000 (21:51 -0700)] 
Update docs to better indicate v3 RC1

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

12 years agofixes #8560
fat [Fri, 26 Jul 2013 04:49:19 +0000 (21:49 -0700)] 
fixes #8560

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
fat [Fri, 26 Jul 2013 04:34:02 +0000 (21:34 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix collapse event #8596
fat [Fri, 26 Jul 2013 04:33:26 +0000 (21:33 -0700)] 
fix collapse event #8596

12 years agoMerge pull request #8419 from hollensteiner/3.0.0-wip
Jacob [Fri, 26 Jul 2013 04:19:57 +0000 (21:19 -0700)] 
Merge pull request #8419 from hollensteiner/3.0.0-wip

Replace position() with offset() in scrollspy.js

12 years agoAdd `.panel-title` to panel component to mirror modals
Mark Otto [Fri, 26 Jul 2013 04:16:43 +0000 (21:16 -0700)] 
Add `.panel-title` to panel component to mirror modals

/cc @leeaston

12 years agosingle include for old ads callout
Mark Otto [Fri, 26 Jul 2013 03:56:44 +0000 (20:56 -0700)] 
single include for old ads callout

12 years agoMerge pull request #8611 from twitter/bs3_form_classes
Mark Otto [Fri, 26 Jul 2013 03:31:11 +0000 (20:31 -0700)] 
Merge pull request #8611 from twitter/bs3_form_classes

Updated BS3 form classes

12 years agoAdd comment about opacity mixin not being used
Mark Otto [Fri, 26 Jul 2013 02:56:04 +0000 (19:56 -0700)] 
Add comment about opacity mixin not being used

12 years agoUpdate form validation states 8611/head
Mark Otto [Fri, 26 Jul 2013 02:45:14 +0000 (19:45 -0700)] 
Update form validation states

* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.

12 years agoSpacing
Mark Otto [Fri, 26 Jul 2013 01:55:00 +0000 (18:55 -0700)] 
Spacing

12 years agoRefactor forms styles
Mark Otto [Fri, 26 Jul 2013 01:29:51 +0000 (18:29 -0700)] 
Refactor forms styles

* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).

12 years agoMerge pull request #8603 from cvrebert/twbs
Mark Otto [Thu, 25 Jul 2013 20:42:51 +0000 (13:42 -0700)] 
Merge pull request #8603 from cvrebert/twbs

twbs ALL the links

12 years agotwbs ALL the links 8603/head
Chris Rebert [Thu, 25 Jul 2013 19:24:13 +0000 (12:24 -0700)] 
twbs ALL the links

12 years agoupdate docs to use buttons for tooltips
Mark Otto [Thu, 25 Jul 2013 18:55:12 +0000 (11:55 -0700)] 
update docs to use buttons for tooltips

12 years agomove some thing around
Mark Otto [Thu, 25 Jul 2013 17:50:59 +0000 (10:50 -0700)] 
move some thing around

12 years agorun make on prev commits
Mark Otto [Thu, 25 Jul 2013 17:12:51 +0000 (10:12 -0700)] 
run make on prev commits

12 years agoMerge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip
Mark Otto [Thu, 25 Jul 2013 17:11:30 +0000 (10:11 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip

12 years agofixes #8571 completely: add better th support for table classes
Mark Otto [Thu, 25 Jul 2013 17:01:42 +0000 (10:01 -0700)] 
fixes #8571 completely: add better th support for table classes

12 years agomake on prev commits
Mark Otto [Thu, 25 Jul 2013 16:58:28 +0000 (09:58 -0700)] 
make on prev commits

12 years agoMerge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3...
Mark Otto [Thu, 25 Jul 2013 16:57:49 +0000 (09:57 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3.0.0-wip

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

12 years agofix #8584: add readme callout for npm and node
Mark Otto [Thu, 25 Jul 2013 16:57:33 +0000 (09:57 -0700)] 
fix #8584: add readme callout for npm and node

12 years agoNavbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height 8599/head
Geremia Taglialatela [Thu, 25 Jul 2013 15:09:12 +0000 (17:09 +0200)] 
Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height

When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/

Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/

12 years agoMoved navs inline properties to variables.less and customize.html & nav-customize... 8593/head
syed [Thu, 25 Jul 2013 07:43:14 +0000 (12:43 +0500)] 
Moved navs inline properties to variables.less and customize.html & nav-customize.html

12 years agoMoving navbar inline properties to variables.less and customize.html
syed [Thu, 25 Jul 2013 06:58:25 +0000 (11:58 +0500)] 
Moving navbar inline properties to variables.less and customize.html

12 years agofixes #8568 -- account for margins in offset
Jacob Thornton [Thu, 25 Jul 2013 03:57:26 +0000 (20:57 -0700)] 
fixes #8568 -- account for margins in offset

12 years agofixes #8569
Jacob Thornton [Thu, 25 Jul 2013 03:21:23 +0000 (20:21 -0700)] 
fixes #8569

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

12 years agofixes #8399 w/ tests
Jacob Thornton [Thu, 25 Jul 2013 03:10:16 +0000 (20:10 -0700)] 
fixes #8399 w/ tests

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Wed, 24 Jul 2013 23:53:34 +0000 (16:53 -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 agomake again
Mark Otto [Wed, 24 Jul 2013 23:52:47 +0000 (16:52 -0700)] 
make again

12 years agoMerge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into...
Mark Otto [Wed, 24 Jul 2013 23:42:13 +0000 (16:42 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip

12 years agoMerge pull request #8583 from liuyl/disabled
Mark Otto [Wed, 24 Jul 2013 23:32:25 +0000 (16:32 -0700)] 
Merge pull request #8583 from liuyl/disabled

set cursor to not-allowed for disabled elements

12 years agomake footer border color use header border color in modals
Mark Otto [Wed, 24 Jul 2013 23:31:17 +0000 (16:31 -0700)] 
make footer border color use header border color in modals

12 years agorun make on prev commits
Mark Otto [Wed, 24 Jul 2013 23:28:34 +0000 (16:28 -0700)] 
run make on prev commits

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 agoset cursor to not-allowed for disabled elements 8583/head
liuyl [Wed, 24 Jul 2013 09:10:27 +0000 (17:10 +0800)] 
set cursor to not-allowed for disabled elements

12 years agoissues fixed for nav-justified on pills on android default browser. 8582/head
Salman Javed [Wed, 24 Jul 2013 08:39:16 +0000 (13:39 +0500)] 
issues fixed for nav-justified on pills on android default browser.

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