]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agofix typo 9851/head
Yulong Liu [Mon, 19 Aug 2013 15:02:03 +0000 (23:02 +0800)] 
fix typo

11 years agoRe-enable glyphicons in carousel controls and then remove redundant CSS from example
Mark Otto [Mon, 19 Aug 2013 07:58:29 +0000 (00:58 -0700)] 
Re-enable glyphicons in carousel controls and then remove redundant CSS from example

11 years agoMerge pull request #9828 from cmdoptesc/3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 07:56:04 +0000 (00:56 -0700)] 
Merge pull request #9828 from cmdoptesc/3.0.0-wip

Add background-color to carousel.

11 years agoFix vertical alignment of carousel navigation arrows. 9828/head
al // @idest [Mon, 19 Aug 2013 07:54:54 +0000 (00:54 -0700)] 
Fix vertical alignment of carousel navigation arrows.

Navigation arrows were aligned to the top of page. Vertically centered them in this fix.

11 years agoFix the customizer.js; Update alert styles for pre blocks
Mark Otto [Mon, 19 Aug 2013 07:54:53 +0000 (00:54 -0700)] 
Fix the customizer.js; Update alert styles for pre blocks

11 years agoAdd background-color to carousel.
al // @idest [Mon, 19 Aug 2013 07:49:28 +0000 (00:49 -0700)] 
Add background-color to carousel.

Set a background color for the carousel example so that white text is now legible. Also fixed typo on line 97.

11 years agoClarify responsive tables and tuck margin
Mark Otto [Mon, 19 Aug 2013 07:45:20 +0000 (00:45 -0700)] 
Clarify responsive tables and tuck margin

11 years agoFix remainder of panel default examples and reorder nav links
Mark Otto [Mon, 19 Aug 2013 07:43:22 +0000 (00:43 -0700)] 
Fix remainder of panel default examples and reorder nav links

11 years agoAdd subnav link for panels with tables
Mark Otto [Mon, 19 Aug 2013 07:42:39 +0000 (00:42 -0700)] 
Add subnav link for panels with tables

11 years agoFix broken tables in panel groups example
Mark Otto [Mon, 19 Aug 2013 07:42:12 +0000 (00:42 -0700)] 
Fix broken tables in panel groups example

11 years agoMore legible examples for progress bars
Mark Otto [Mon, 19 Aug 2013 07:41:03 +0000 (00:41 -0700)] 
More legible examples for progress bars

11 years agoDouble quotes not single quotes
Mark Otto [Mon, 19 Aug 2013 07:39:00 +0000 (00:39 -0700)] 
Double quotes not single quotes

11 years agoConsistent alert link examples (adds warning and reorders)
Mark Otto [Mon, 19 Aug 2013 07:38:20 +0000 (00:38 -0700)] 
Consistent alert link examples (adds warning and reorders)

11 years agoNuke top margin on pager examples
Mark Otto [Mon, 19 Aug 2013 07:36:45 +0000 (00:36 -0700)] 
Nuke top margin on pager examples

11 years agoChange up label padding to equalize top and bottom
Mark Otto [Mon, 19 Aug 2013 07:36:39 +0000 (00:36 -0700)] 
Change up label padding to equalize top and bottom

11 years agoNuke margin for last child navbar text
Mark Otto [Mon, 19 Aug 2013 07:34:31 +0000 (00:34 -0700)] 
Nuke margin for last child navbar text

11 years agoRun grunt dist on responsive changes
Mark Otto [Mon, 19 Aug 2013 07:34:16 +0000 (00:34 -0700)] 
Run grunt dist on responsive changes

11 years agoDoh! Really undo that navbar thing
Mark Otto [Mon, 19 Aug 2013 07:33:27 +0000 (00:33 -0700)] 
Doh! Really undo that navbar thing

11 years agoremove redundant docs section
Mark Otto [Mon, 19 Aug 2013 07:31:38 +0000 (00:31 -0700)] 
remove redundant docs section

11 years agoCopy edits, fix classes for demo, add subnav links
Mark Otto [Mon, 19 Aug 2013 07:16:51 +0000 (00:16 -0700)] 
Copy edits, fix classes for demo, add subnav links

11 years agoMerge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff...
Mark Otto [Mon, 19 Aug 2013 07:15:47 +0000 (00:15 -0700)] 
Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip

11 years agoAdd Test case to documentation 9821/head
Elvis Ratzlaff [Mon, 19 Aug 2013 07:14:38 +0000 (03:14 -0400)] 
Add Test case to documentation

11 years agoupdate grid options max container width in docs to reflect latest changes
Mark Otto [Mon, 19 Aug 2013 07:06:26 +0000 (00:06 -0700)] 
update grid options max container width in docs to reflect latest changes

11 years agouse n/a not -
Mark Otto [Mon, 19 Aug 2013 07:05:03 +0000 (00:05 -0700)] 
use n/a not -

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 07:03:35 +0000 (00:03 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agomore copy edits
Mark Otto [Mon, 19 Aug 2013 07:03:28 +0000 (00:03 -0700)] 
more copy edits

11 years agodon't repeat ourselves in the disabled responsiveness stuff
Mark Otto [Mon, 19 Aug 2013 06:58:31 +0000 (23:58 -0700)] 
don't repeat ourselves in the disabled responsiveness stuff

11 years agoMerge pull request #9826 from phillipalexander/patch-1
Chris Rebert [Mon, 19 Aug 2013 06:57:43 +0000 (23:57 -0700)] 
Merge pull request #9826 from phillipalexander/patch-1

Remove unnecessary trailing comma in Gruntfile.js

11 years agono linenos
Mark Otto [Mon, 19 Aug 2013 06:54:42 +0000 (23:54 -0700)] 
no linenos

11 years agoRemove extra trailing comma in Gruntfile.js 9826/head
Phillip Alexander [Mon, 19 Aug 2013 06:54:25 +0000 (23:54 -0700)] 
Remove extra trailing comma in Gruntfile.js

    validation: {
      options: {
        reset: true
      },

11 years agono lead on that paragraph
Mark Otto [Mon, 19 Aug 2013 06:54:18 +0000 (23:54 -0700)] 
no lead on that paragraph

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 06:52:22 +0000 (23:52 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Conflicts:
getting-started.html

11 years agoNuke the repeated blog stuff and just point people to the upcoming post
Mark Otto [Mon, 19 Aug 2013 06:51:24 +0000 (23:51 -0700)] 
Nuke the repeated blog stuff and just point people to the upcoming post

11 years agoUndo jank jump to docs section via side nav thing for all but h1s
Mark Otto [Mon, 19 Aug 2013 06:51:09 +0000 (23:51 -0700)] 
Undo jank jump to docs section via side nav thing for all but h1s

While it worked, it overlaps content and makes links unclickable,
elements unselectable, etc. Le sad.

11 years agosimpler customizer files section; adds glyphicons.less
Mark Otto [Mon, 19 Aug 2013 06:36:36 +0000 (23:36 -0700)] 
simpler customizer files section; adds glyphicons.less

11 years agoupdate version number in anticipation of final release
Chris Rebert [Mon, 19 Aug 2013 06:27:46 +0000 (23:27 -0700)] 
update version number in anticipation of final release

11 years agolet's avoid calling it that
Chris Rebert [Mon, 19 Aug 2013 06:24:31 +0000 (23:24 -0700)] 
let's avoid calling it that

11 years agoThis-Is-SPARTA! Or rather, HTML. Not Markdown.
Chris Rebert [Mon, 19 Aug 2013 06:18:58 +0000 (23:18 -0700)] 
This-Is-SPARTA! Or rather, HTML. Not Markdown.

11 years agojanky not ghetto <3
Mark Otto [Mon, 19 Aug 2013 06:09:09 +0000 (23:09 -0700)] 
janky not ghetto <3

11 years agogive some more space on that janky docs navbar fix
Mark Otto [Mon, 19 Aug 2013 06:08:57 +0000 (23:08 -0700)] 
give some more space on that janky docs navbar fix

11 years agoupdate template in getting started docs to reflect shim and respond.js in examples
Mark Otto [Mon, 19 Aug 2013 06:07:36 +0000 (23:07 -0700)] 
update template in getting started docs to reflect shim and respond.js in examples

11 years agoMerge branch '3.0.0-wip' into bs3_homepage
Mark Otto [Mon, 19 Aug 2013 05:47:09 +0000 (22:47 -0700)] 
Merge branch '3.0.0-wip' into bs3_homepage

11 years agomore accurate dist contents
Mark Otto [Mon, 19 Aug 2013 05:45:30 +0000 (22:45 -0700)] 
more accurate dist contents

11 years agomore migration guide work
Mark Otto [Mon, 19 Aug 2013 05:43:29 +0000 (22:43 -0700)] 
more migration guide work

11 years agoMerge pull request #9822 from gdi2290/patch-1
Mark Otto [Mon, 19 Aug 2013 05:35:19 +0000 (22:35 -0700)] 
Merge pull request #9822 from gdi2290/patch-1

fix file structure in "What's included"

11 years agofix file structure in What's included 9822/head
PatrickJS [Mon, 19 Aug 2013 05:27:30 +0000 (22:27 -0700)] 
fix file structure in What's included

11 years agoSuper ghetto fix for preventing navbar overlap when clicking side nav links /cc @fat
Mark Otto [Mon, 19 Aug 2013 05:19:56 +0000 (22:19 -0700)] 
Super ghetto fix for preventing navbar overlap when clicking side nav links /cc @fat

11 years agoFix broken link and wrong label
Mark Otto [Mon, 19 Aug 2013 05:19:16 +0000 (22:19 -0700)] 
Fix broken link and wrong label

11 years agoscrew it, errbody gets a single map base64 image
Mark Otto [Mon, 19 Aug 2013 05:04:51 +0000 (22:04 -0700)] 
screw it, errbody gets a single map base64 image

11 years agocreate smaller map pattern so ios picks it up
Mark Otto [Mon, 19 Aug 2013 04:59:23 +0000 (21:59 -0700)] 
create smaller map pattern so ios picks it up

11 years agosmaller h1 and h2
Mark Otto [Mon, 19 Aug 2013 04:49:05 +0000 (21:49 -0700)] 
smaller h1 and h2

11 years agoVariable name fix
Elvis Ratzlaff [Mon, 19 Aug 2013 04:46:09 +0000 (00:46 -0400)] 
Variable name fix

11 years agoMerge branch '3.0.0-wip' into bs3_homepage
Mark Otto [Mon, 19 Aug 2013 04:43:58 +0000 (21:43 -0700)] 
Merge branch '3.0.0-wip' into bs3_homepage

11 years agocustomize.html: fix typo
Chris Rebert [Mon, 19 Aug 2013 04:43:14 +0000 (21:43 -0700)] 
customize.html: fix typo

11 years agoAdd responsive tables with help of `.table-responsive` wrapper
Mark Otto [Mon, 19 Aug 2013 04:43:05 +0000 (21:43 -0700)] 
Add responsive tables with help of `.table-responsive` wrapper

11 years agofix spelling of "Togglable"
Chris Rebert [Mon, 19 Aug 2013 04:34:17 +0000 (21:34 -0700)] 
fix spelling of "Togglable"

11 years agocatch a view data-vars
Jacob Thornton [Mon, 19 Aug 2013 04:29:46 +0000 (21:29 -0700)] 
catch a view data-vars

11 years agomake visible/hidden classes mixable
Elvis Ratzlaff [Mon, 19 Aug 2013 04:23:53 +0000 (00:23 -0400)] 
make visible/hidden classes mixable

11 years agodocs cleanup around alignment on homepage and footers
Mark Otto [Mon, 19 Aug 2013 04:15:07 +0000 (21:15 -0700)] 
docs cleanup around alignment on homepage and footers

11 years agolarger download btn on customizer
Mark Otto [Mon, 19 Aug 2013 04:04:46 +0000 (21:04 -0700)] 
larger download btn on customizer

11 years agomo betta btn classes in docs
Mark Otto [Mon, 19 Aug 2013 04:02:52 +0000 (21:02 -0700)] 
mo betta btn classes in docs

11 years agoMerge branch '3.0.0-wip' into bs3_homepage
Mark Otto [Mon, 19 Aug 2013 03:15:45 +0000 (20:15 -0700)] 
Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
customize.html
dist/css/bootstrap.min.css

11 years agoMerge pull request #9819 from twbs/bs3_panel_base_class
Mark Otto [Mon, 19 Aug 2013 03:11:36 +0000 (20:11 -0700)] 
Merge pull request #9819 from twbs/bs3_panel_base_class

BS3: Refactor panels to require default class

11 years agoMerge branch '3.0.0-wip' into bs3_panel_base_class 9819/head
Mark Otto [Mon, 19 Aug 2013 03:11:04 +0000 (20:11 -0700)] 
Merge branch '3.0.0-wip' into bs3_panel_base_class

Conflicts:
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.min.css

11 years agoMerge pull request #9818 from twbs/bs3_alert_base_class
Mark Otto [Mon, 19 Aug 2013 03:10:14 +0000 (20:10 -0700)] 
Merge pull request #9818 from twbs/bs3_alert_base_class

BS3: Refactor alerts to require a modifier class

11 years agoupdate customizer to latest vars
Mark Otto [Mon, 19 Aug 2013 03:08:03 +0000 (20:08 -0700)] 
update customizer to latest vars

11 years agoUpdate var in theme 9818/head
Mark Otto [Mon, 19 Aug 2013 02:57:25 +0000 (19:57 -0700)] 
Update var in theme

11 years agoupdate theme to match
Mark Otto [Mon, 19 Aug 2013 02:53:28 +0000 (19:53 -0700)] 
update theme to match

11 years agoRefactor alerts to have a base class, but no default class, thus requiring a modifier...
Mark Otto [Mon, 19 Aug 2013 02:50:53 +0000 (19:50 -0700)] 
Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times

11 years agoRefactor panels to have a base class for improved flexibility when customizing (and...
Mark Otto [Mon, 19 Aug 2013 02:40:57 +0000 (19:40 -0700)] 
Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too)

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Jacob Thornton [Mon, 19 Aug 2013 02:40:56 +0000 (19:40 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agofixes #9807
Jacob Thornton [Mon, 19 Aug 2013 02:40:26 +0000 (19:40 -0700)] 
fixes #9807

11 years agoimprove dependencies for image thumbnails and thumbnail component
Mark Otto [Mon, 19 Aug 2013 02:24:10 +0000 (19:24 -0700)] 
improve dependencies for image thumbnails and thumbnail component

11 years agobetter alignment of glyphicons vertically
Mark Otto [Mon, 19 Aug 2013 02:05:48 +0000 (19:05 -0700)] 
better alignment of glyphicons vertically

11 years agomove glyphicons styles to docs css
Mark Otto [Mon, 19 Aug 2013 02:04:30 +0000 (19:04 -0700)] 
move glyphicons styles to docs css

11 years agoMerge branch '3.0.0-wip' into bs3_homepage
Mark Otto [Mon, 19 Aug 2013 02:02:42 +0000 (19:02 -0700)] 
Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
customize.html
examples/justified-nav/justified-nav.css

11 years agofixes #9815: proper alignment of navbar nav if first child
Mark Otto [Mon, 19 Aug 2013 01:49:07 +0000 (18:49 -0700)] 
fixes #9815: proper alignment of navbar nav if first child

11 years agoupdate non responsive example
Mark Otto [Mon, 19 Aug 2013 01:47:05 +0000 (18:47 -0700)] 
update non responsive example

11 years agodon't include other navbar links in non responsive docs; use generic links
Mark Otto [Mon, 19 Aug 2013 01:44:40 +0000 (18:44 -0700)] 
don't include other navbar links in non responsive docs; use generic links

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Mon, 19 Aug 2013 01:16:14 +0000 (18:16 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoprevent navbar from collapsing in non responsive example (fixes #9812)
Mark Otto [Mon, 19 Aug 2013 01:16:01 +0000 (18:16 -0700)] 
prevent navbar from collapsing in non responsive example (fixes #9812)

11 years agotweak formatting of additional migration notes
Chris Rebert [Sun, 18 Aug 2013 23:39:08 +0000 (16:39 -0700)] 
tweak formatting of additional migration notes

11 years agoadd angle brackets
Chris Rebert [Sun, 18 Aug 2013 23:36:49 +0000 (16:36 -0700)] 
add angle brackets

11 years agoclarify inline block mention in docs
Mark Otto [Sun, 18 Aug 2013 23:27:20 +0000 (16:27 -0700)] 
clarify inline block mention in docs

11 years agoMerge pull request #9791 from pereorga/pere-optimize-images
Mark Otto [Sun, 18 Aug 2013 22:52:24 +0000 (15:52 -0700)] 
Merge pull request #9791 from pereorga/pere-optimize-images

Optimize images using lossless compression

11 years agoMerge branch '3.0.0-wip' into glyphicons-LESS-fixes
Mark Otto [Sun, 18 Aug 2013 22:47:29 +0000 (15:47 -0700)] 
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes

Conflicts:
dist/css/bootstrap.min.css

11 years agofix broken button
Mark Otto [Sun, 18 Aug 2013 22:45:56 +0000 (15:45 -0700)] 
fix broken button

11 years agoMerge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into...
Mark Otto [Sun, 18 Aug 2013 22:43:27 +0000 (15:43 -0700)] 
Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default

Conflicts:
dist/css/bootstrap.min.css

11 years agofixes #9798: update spacing on checkboxes and radios for horizontal
Mark Otto [Sun, 18 Aug 2013 22:41:24 +0000 (15:41 -0700)] 
fixes #9798: update spacing on checkboxes and radios for horizontal

11 years agoaccount for 9fa0a5d12718bef464e002d9b850aebcb63c79e4 in the docs 9808/head
Chris Rebert [Sun, 18 Aug 2013 22:33:32 +0000 (15:33 -0700)] 
account for 9fa0a5d12718bef464e002d9b850aebcb63c79e4 in the docs

11 years agoregenerate Glyphicons listing/demo section of docs
Chris Rebert [Sun, 18 Aug 2013 22:30:44 +0000 (15:30 -0700)] 
regenerate Glyphicons listing/demo section of docs

11 years agoAdd new navbar-default class to examples 9806/head
Julian Thilo [Sun, 18 Aug 2013 22:35:40 +0000 (00:35 +0200)] 
Add new navbar-default class to examples

11 years agoMerge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Mark Otto [Sun, 18 Aug 2013 22:30:02 +0000 (15:30 -0700)] 
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

11 years agoregenerate CSS
Chris Rebert [Sun, 18 Aug 2013 22:20:16 +0000 (15:20 -0700)] 
regenerate CSS

11 years agotweak some of the Glyphicon class names to match Bootstrap conventions
Chris Rebert [Sun, 18 Aug 2013 22:19:13 +0000 (15:19 -0700)] 
tweak some of the Glyphicon class names to match Bootstrap conventions

11 years agoMerge pull request #9804 from twbs/redundant-ampersands
Mark Otto [Sun, 18 Aug 2013 22:15:53 +0000 (15:15 -0700)] 
Merge pull request #9804 from twbs/redundant-ampersands

rm redundant ampersands from button-groups LESS

11 years agoregenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers
Chris Rebert [Sun, 18 Aug 2013 22:15:33 +0000 (15:15 -0700)] 
regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers

11 years agoMerge pull request #9800 from ZDroid/patch-1
Mark Otto [Sun, 18 Aug 2013 22:10:48 +0000 (15:10 -0700)] 
Merge pull request #9800 from ZDroid/patch-1

Nesting for link styles

11 years agofixes #9803: label and input alignment in horizontal forms
Mark Otto [Sun, 18 Aug 2013 22:10:28 +0000 (15:10 -0700)] 
fixes #9803: label and input alignment in horizontal forms

11 years agorm redundant ampersands from button-groups LESS 9804/head
Chris Rebert [Sun, 18 Aug 2013 22:05:42 +0000 (15:05 -0700)] 
rm redundant ampersands from button-groups LESS