]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
12 years agoFix glyphicon in "Dropdown in a button group" example 7874/head
Robert Burns [Tue, 14 May 2013 01:40:48 +0000 (21:40 -0400)] 
Fix glyphicon in "Dropdown in a button group" example

12 years agoMerge pull request #7872 from burnsra/3.0.0-wip-caret
Mark Otto [Tue, 14 May 2013 00:21:05 +0000 (17:21 -0700)] 
Merge pull request #7872 from burnsra/3.0.0-wip-caret

Fix caret position

12 years agoFix caret position 7872/head
Robert Burns [Tue, 14 May 2013 00:01:59 +0000 (20:01 -0400)] 
Fix caret position

12 years agoMerge pull request #7866 from marsuboss/patch-3
Mark Otto [Mon, 13 May 2013 19:02:32 +0000 (12:02 -0700)] 
Merge pull request #7866 from marsuboss/patch-3

Fix

12 years agoFix 7866/head
marsuboss [Mon, 13 May 2013 12:50:02 +0000 (15:50 +0300)] 
Fix

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Mon, 13 May 2013 07:09:35 +0000 (00:09 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agofix broken responsive utilities table
Mark Otto [Mon, 13 May 2013 06:54:10 +0000 (23:54 -0700)] 
fix broken responsive utilities table

12 years agospacing
Mark Otto [Mon, 13 May 2013 04:00:37 +0000 (21:00 -0700)] 
spacing

12 years agoMerge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3...
Mark Otto [Mon, 13 May 2013 03:57:07 +0000 (20:57 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip

12 years agoMerge pull request #7861 from burnsra/3.0.0-wip
Mark Otto [Mon, 13 May 2013 02:20:55 +0000 (19:20 -0700)] 
Merge pull request #7861 from burnsra/3.0.0-wip

Couple of fixes for docs and examples

12 years agoFix buttons within examples 7861/head
Robert Burns [Mon, 13 May 2013 02:04:22 +0000 (22:04 -0400)] 
Fix buttons within examples

12 years agoFix invalid input within docs
Robert Burns [Mon, 13 May 2013 02:04:01 +0000 (22:04 -0400)] 
Fix invalid input within docs

12 years agoFix navbar button docs
Mark Otto [Sun, 12 May 2013 23:34:12 +0000 (16:34 -0700)] 
Fix navbar button docs

12 years agoLess specific dropdown styles, change up navbar dropdown styles
Mark Otto [Sun, 12 May 2013 23:30:54 +0000 (16:30 -0700)] 
Less specific dropdown styles, change up navbar dropdown styles

12 years agorun make on last commit
Mark Otto [Sun, 12 May 2013 23:13:51 +0000 (16:13 -0700)] 
run make on last commit

12 years agofix broke example
Mark Otto [Sun, 12 May 2013 23:13:39 +0000 (16:13 -0700)] 
fix broke example

12 years agoConsolidate active dropdown toggle styles and comment out the rest
Mark Otto [Sun, 12 May 2013 23:12:13 +0000 (16:12 -0700)] 
Consolidate active dropdown toggle styles and comment out the rest

12 years agoRestore commented out dropdown styles, get open dropdown state working again
Mark Otto [Sun, 12 May 2013 23:03:56 +0000 (16:03 -0700)] 
Restore commented out dropdown styles, get open dropdown state working again

12 years agoStart some nav and dropdown cleanup
Mark Otto [Sun, 12 May 2013 22:47:18 +0000 (15:47 -0700)] 
Start some nav and dropdown cleanup

* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place  on all
* Use  on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup

12 years agoTimestamp correction 2 7850/head
Vinay Raghu [Sun, 12 May 2013 06:55:56 +0000 (12:25 +0530)] 
Timestamp correction 2

12 years agoTimestamp correction
Vinay Raghu [Sun, 12 May 2013 06:55:47 +0000 (12:25 +0530)] 
Timestamp correction

11 years agoRecompiled using makefile recess
Vinay Raghu [Wed, 4 Dec 2013 20:06:19 +0000 (01:36 +0530)] 
Recompiled using makefile recess

12 years agoMerge pull request #7851 from blakeembrey/input-group-btn-radius
Mark Otto [Sat, 11 May 2013 19:25:46 +0000 (12:25 -0700)] 
Merge pull request #7851 from blakeembrey/input-group-btn-radius

[v3] Fix the selectors for the .input-group-btn class

12 years agoFix the selectors for the .input-group-btn selector. 7851/head
Blake Embrey [Sat, 11 May 2013 16:38:48 +0000 (09:38 -0700)] 
Fix the selectors for the .input-group-btn selector.

12 years agoChanged Responsive utilities section in docs/css.html
Vinay Raghu [Sat, 11 May 2013 14:04:59 +0000 (19:34 +0530)] 
Changed Responsive utilities section in docs/css.html

12 years agoChanged Screen Notations on responsive-utilities.less and recompiled the stylesheet
Vinay Raghu [Sat, 11 May 2013 13:58:59 +0000 (19:28 +0530)] 
Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet

12 years agoMerge pull request #7838 from blakeembrey/btn-group-radius
Mark Otto [Fri, 10 May 2013 23:35:25 +0000 (16:35 -0700)] 
Merge pull request #7838 from blakeembrey/btn-group-radius

Remove the overrides and resets from button groups

12 years agoFont-size and line-height tweaks
Mark Otto [Fri, 10 May 2013 17:33:35 +0000 (10:33 -0700)] 
Font-size and line-height tweaks

* Use 1.428 for line-height instead of 1.5
* Use  function for full pixel values instead of decimals

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 10 May 2013 17:31:52 +0000 (10:31 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agotwerk nested nav links
Mark Otto [Fri, 10 May 2013 17:29:54 +0000 (10:29 -0700)] 
twerk nested nav links

12 years agoMerge pull request #7845 from aricketson/3.0.0-wip
Mark Otto [Fri, 10 May 2013 17:05:58 +0000 (10:05 -0700)] 
Merge pull request #7845 from aricketson/3.0.0-wip

Fix component margin and padding values to use @line-height-computed

12 years agoMerge pull request #7843 from burnsra/3.0.0-wip
Mark Otto [Fri, 10 May 2013 17:04:32 +0000 (10:04 -0700)] 
Merge pull request #7843 from burnsra/3.0.0-wip

Fix link to examples

12 years agoFix component margin and padding values to use @line-height-computed 7845/head
Aaron [Fri, 10 May 2013 15:21:27 +0000 (09:21 -0600)] 
Fix component margin and padding values to use @line-height-computed

12 years agoFix link to examples 7843/head
Robert Burns [Fri, 10 May 2013 11:37:14 +0000 (07:37 -0400)] 
Fix link to examples

12 years agoredo docs footer a bit
Mark Otto [Fri, 10 May 2013 00:36:02 +0000 (17:36 -0700)] 
redo docs footer a bit

12 years agomore nav twerks for getting started page
Mark Otto [Fri, 10 May 2013 00:32:39 +0000 (17:32 -0700)] 
more nav twerks for getting started page

12 years agoremove duplicate text scaling
Mark Otto [Fri, 10 May 2013 00:29:07 +0000 (17:29 -0700)] 
remove duplicate text scaling

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Fri, 10 May 2013 00:22:48 +0000 (17:22 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Conflicts:
less/forms.less

12 years agoupdate reference to value of base line-height
Mark Otto [Fri, 10 May 2013 00:21:18 +0000 (17:21 -0700)] 
update reference to value of base line-height

12 years agoUnitless line-height
Mark Otto [Fri, 10 May 2013 00:20:46 +0000 (17:20 -0700)] 
Unitless line-height

* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components

12 years agoUpdate button groups to use not selector and remove redundant CSS. 7838/head
Blake Embrey [Thu, 9 May 2013 23:26:35 +0000 (16:26 -0700)] 
Update button groups to use not selector and remove redundant CSS.

12 years agoFix up navbar forms by using inline form as a mixin; fix docs for those
Mark Otto [Thu, 9 May 2013 23:41:35 +0000 (16:41 -0700)] 
Fix up navbar forms by using inline form as a mixin; fix docs for those

12 years agoremove the input from an example
Mark Otto [Thu, 9 May 2013 23:31:10 +0000 (16:31 -0700)] 
remove the input from an example

12 years agoMerge pull request #7837 from blakeembrey/input-group-radius
Mark Otto [Thu, 9 May 2013 23:30:48 +0000 (16:30 -0700)] 
Merge pull request #7837 from blakeembrey/input-group-radius

Remove input-group border radius resets

12 years agoMore forms overhaul
Mark Otto [Thu, 9 May 2013 22:05:06 +0000 (15:05 -0700)] 
More forms overhaul

* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides

12 years agoMake the border-radius on input-groups to be overrides instead of resets on every... 7837/head
Blake Embrey [Thu, 9 May 2013 21:48:27 +0000 (14:48 -0700)] 
Make the border-radius on input-groups to be overrides instead of resets on every size.

12 years agosubnav for icons section
Mark Otto [Thu, 9 May 2013 21:08:06 +0000 (14:08 -0700)] 
subnav for icons section

12 years agoMerge pull request #7836 from blakeembrey/icon-antialias
Mark Otto [Thu, 9 May 2013 20:59:18 +0000 (13:59 -0700)] 
Merge pull request #7836 from blakeembrey/icon-antialias

Make icons antialiased on Webkit browsers

12 years agoMake icons antialiased on Webkit browsers. 7836/head
Blake Embrey [Thu, 9 May 2013 20:48:02 +0000 (13:48 -0700)] 
Make icons antialiased on Webkit browsers.

12 years agofix some broke buttons on the js page
Mark Otto [Thu, 9 May 2013 20:28:05 +0000 (13:28 -0700)] 
fix some broke buttons on the js page

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Thu, 9 May 2013 20:19:38 +0000 (13:19 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoMerge pull request #7835 from blakeembrey/progress-bars
Mark Otto [Thu, 9 May 2013 20:18:39 +0000 (13:18 -0700)] 
Merge pull request #7835 from blakeembrey/progress-bars

Remove backface-visibility from progress bars

12 years agofix broken buttons on css docs
Mark Otto [Thu, 9 May 2013 20:12:40 +0000 (13:12 -0700)] 
fix broken buttons on css docs

12 years agoRemove backface-visibility from progress bars. 7835/head
Blake Embrey [Thu, 9 May 2013 20:09:33 +0000 (13:09 -0700)] 
Remove backface-visibility from progress bars.

12 years agoUpdate getting started page
Mark Otto [Thu, 9 May 2013 18:40:39 +0000 (11:40 -0700)] 
Update getting started page

12 years agorename welcome to getting started
Mark Otto [Thu, 9 May 2013 18:20:15 +0000 (11:20 -0700)] 
rename welcome to getting started

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

12 years agoFixes #7823: add mention of container to CSS page; build out CSS overview subnav
Mark Otto [Thu, 9 May 2013 16:22:49 +0000 (09:22 -0700)] 
Fixes #7823: add mention of container to CSS page; build out CSS overview subnav

12 years agoMerge pull request #7824 from burnsra/3.0.0-wip-examples
Mark Otto [Thu, 9 May 2013 16:14:31 +0000 (09:14 -0700)] 
Merge pull request #7824 from burnsra/3.0.0-wip-examples

Fix form in navbar

12 years agoremove lingering typeahead reference in makefile
Mark Otto [Thu, 9 May 2013 16:09:44 +0000 (09:09 -0700)] 
remove lingering typeahead reference in makefile

12 years agoFix form in navbar 7824/head
Robert Burns [Thu, 9 May 2013 11:21:22 +0000 (07:21 -0400)] 
Fix form in navbar

12 years ago.bs-docs-sidenote to .bs-callout
Mark Otto [Thu, 9 May 2013 05:58:54 +0000 (22:58 -0700)] 
.bs-docs-sidenote to .bs-callout

12 years ago.bs-docs-tooltip-examples to .bs-example-tooltips
Mark Otto [Thu, 9 May 2013 05:57:42 +0000 (22:57 -0700)] 
.bs-docs-tooltip-examples to .bs-example-tooltips

12 years ago.bs-docs-example to .bs-example
Mark Otto [Thu, 9 May 2013 05:56:29 +0000 (22:56 -0700)] 
.bs-docs-example to .bs-example

12 years ago.bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container...
Mark Otto [Thu, 9 May 2013 05:55:17 +0000 (22:55 -0700)] 
.bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer

12 years ago.bs-docs-social-* to .bs-social-*
Mark Otto [Thu, 9 May 2013 05:54:25 +0000 (22:54 -0700)] 
.bs-docs-social-* to .bs-social-*

12 years agonuke stuff from customizer
Mark Otto [Thu, 9 May 2013 05:53:22 +0000 (22:53 -0700)] 
nuke stuff from customizer

12 years ago.bs-docs-top to .bs-top
Mark Otto [Thu, 9 May 2013 05:52:48 +0000 (22:52 -0700)] 
.bs-docs-top to .bs-top

12 years ago.bs-docs-header to .bs-header
Mark Otto [Thu, 9 May 2013 05:51:44 +0000 (22:51 -0700)] 
.bs-docs-header to .bs-header

12 years agodocs css reorg
Mark Otto [Thu, 9 May 2013 05:50:41 +0000 (22:50 -0700)] 
docs css reorg

12 years agomore work on the sidenav, including small css refactor and new classes
Mark Otto [Thu, 9 May 2013 05:42:42 +0000 (22:42 -0700)] 
more work on the sidenav, including small css refactor and new classes

12 years agomore navbar and header tweaks
Mark Otto [Thu, 9 May 2013 05:31:49 +0000 (22:31 -0700)] 
more navbar and header tweaks

12 years agonew docs page headers
Mark Otto [Thu, 9 May 2013 05:29:53 +0000 (22:29 -0700)] 
new docs page headers

12 years agored navbar for docs
Mark Otto [Thu, 9 May 2013 05:24:07 +0000 (22:24 -0700)] 
red navbar for docs

12 years agomake restored top navbar collapsable
Mark Otto [Thu, 9 May 2013 05:17:26 +0000 (22:17 -0700)] 
make restored top navbar collapsable

12 years agorefactor homepage jumbotron masthead doodad
Mark Otto [Thu, 9 May 2013 05:13:56 +0000 (22:13 -0700)] 
refactor homepage jumbotron masthead doodad

12 years agomove social buttons to separate include
Mark Otto [Thu, 9 May 2013 05:07:28 +0000 (22:07 -0700)] 
move social buttons to separate include

12 years agoSuper massive docs overhaul
Mark Otto [Thu, 9 May 2013 04:56:08 +0000 (21:56 -0700)] 
Super massive docs overhaul

* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)

12 years agoDrop typeahead.js--instead try Twitter's typeahead plugin
Mark Otto [Thu, 9 May 2013 03:04:54 +0000 (20:04 -0700)] 
Drop typeahead.js--instead try Twitter's typeahead plugin

12 years agohide entire navbar in print views
Mark Otto [Thu, 9 May 2013 02:57:42 +0000 (19:57 -0700)] 
hide entire navbar in print views

12 years agoFixes #7816: revert negative margin on .navbar-nav
Mark Otto [Thu, 9 May 2013 02:55:20 +0000 (19:55 -0700)] 
Fixes #7816: revert negative margin on .navbar-nav

12 years agoMerge pull request #7809 from twitter/bs3_adding_btn_default
Mark Otto [Wed, 8 May 2013 18:47:43 +0000 (11:47 -0700)] 
Merge pull request #7809 from twitter/bs3_adding_btn_default

BS3: Require .btn-default for all standard buttons

12 years agoindentation fix
Mark Otto [Wed, 8 May 2013 06:43:51 +0000 (23:43 -0700)] 
indentation fix

12 years agoUpdate forms
Mark Otto [Wed, 8 May 2013 04:56:55 +0000 (21:56 -0700)] 
Update forms

* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms

12 years agonuke the unused navbar that was leftover
Mark Otto [Wed, 8 May 2013 03:48:37 +0000 (20:48 -0700)] 
nuke the unused navbar that was leftover

12 years agoFixes #7796: change @list-group-active-text to @list-group-active-color
Mark Otto [Wed, 8 May 2013 03:01:57 +0000 (20:01 -0700)] 
Fixes #7796: change @list-group-active-text to @list-group-active-color

12 years agoRequire .btn-default for regular buttons 7809/head
Mark Otto [Wed, 8 May 2013 01:07:06 +0000 (18:07 -0700)] 
Require .btn-default for regular buttons

* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS

12 years agoUpdate config after updating to jekyll 1.0.1
Mark Otto [Wed, 8 May 2013 01:03:32 +0000 (18:03 -0700)] 
Update config after updating to jekyll 1.0.1

12 years agoMerge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Mark Otto [Tue, 7 May 2013 17:33:49 +0000 (10:33 -0700)] 
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

12 years agoOutdent nav links a bit more so they line up in navbar
Mark Otto [Tue, 7 May 2013 17:33:41 +0000 (10:33 -0700)] 
Outdent nav links a bit more so they line up in navbar

12 years agoMerge pull request #7806 from koenpunt/patch-1
Mark Otto [Tue, 7 May 2013 16:13:48 +0000 (09:13 -0700)] 
Merge pull request #7806 from koenpunt/patch-1

Updated URL for jekyll installation

12 years agoUpdated URL for jekyll installation 7806/head
Koen Punt [Tue, 7 May 2013 12:20:28 +0000 (15:20 +0300)] 
Updated URL for jekyll installation

12 years agoMerge pull request #7798 from mediafreakch/3.0.0-wip
Mark Otto [Tue, 7 May 2013 06:44:12 +0000 (23:44 -0700)] 
Merge pull request #7798 from mediafreakch/3.0.0-wip

fixed not working example code for modals

12 years agofixed not working example code for modals 7798/head
Edgar Schnueriger [Mon, 6 May 2013 07:48:05 +0000 (09:48 +0200)] 
fixed not working example code for modals

12 years agocorrect right nav in navbar examples
Mark Otto [Sat, 4 May 2013 22:00:59 +0000 (15:00 -0700)] 
correct right nav in navbar examples

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

12 years agoFixes #7783: nuke bottom margin on fixed-bottom-navbar
Mark Otto [Sat, 4 May 2013 20:11:20 +0000 (13:11 -0700)] 
Fixes #7783: nuke bottom margin on fixed-bottom-navbar

12 years agoMerge pull request #7782 from cvrebert/patch-1
Mark Otto [Sat, 4 May 2013 20:09:53 +0000 (13:09 -0700)] 
Merge pull request #7782 from cvrebert/patch-1

use @screen-small var in grid.less

12 years agouse @screen-small var in grid.less 7782/head
Chris Rebert [Sat, 4 May 2013 00:38:58 +0000 (17:38 -0700)] 
use @screen-small var in grid.less

Per comment by @nextgenthemes on/in cd06c5baac64a366

12 years agoMerge pull request #7621 from jeremydenoun/patch-1
Mark Otto [Sat, 4 May 2013 00:32:54 +0000 (17:32 -0700)] 
Merge pull request #7621 from jeremydenoun/patch-1

Fix flickering on progress bar width update