0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

7152 Commits

Author SHA1 Message Date
Mark Otto
c14fe7904a Merge branch 'master' of github.com:twbs/bootstrap 2013-09-16 18:59:06 -07:00
Mark Otto
776d3fd6a0 fixes #9908: add type attribute to customizer compile button to prevent accidental submissions 2013-09-16 18:58:52 -07:00
Chris Rebert
630bf13fb4 Merge pull request #10664 from ZDroid/patch-1
Fix package.json
2013-09-16 12:15:23 -07:00
Zlatan Vasović
d7fb54e5fb Remove "js" keyword /cc @cvrebert 2013-09-16 20:40:12 +02:00
Chris Rebert
46bb8b4290 Merge pull request #10661 from Shotster/simplified-responsive-invisibility
Simplified CSS responsive-invisibility mixin
2013-09-16 10:59:22 -07:00
Zlatan Vasović
66abfe577e Fix package.json
* Add "js" keyword
* Fix homepage link
* Bump grunt-contrib-connect to newer version
2013-09-16 19:42:52 +02:00
Lipis
a6e2a93feb Changed the border-color of .navbar-form to @navbar-default-border 2013-09-16 19:36:39 +02:00
Steve S
ae3a9169e0 Simplified CSS responsive-invisibility mixin 2013-09-16 09:16:53 -05:00
Soheil Behnezhad
cc69911335 Derp, there were more 2013-09-16 16:37:03 +04:30
Soheil Behnezhad
0c39045222 Remove some more unnecessary semicolons 2013-09-16 16:25:53 +04:30
Chris Ziogas
ab3d0a27b3 Dropdown in panel header does not inherit its colors
Fix for issue #10627
2013-09-16 12:38:26 +03:00
Soheil Behnezhad
bff23ee1fe Remove unnecessary semicolons 2013-09-16 13:47:48 +04:30
Chris Rebert
559fcbfbd6 Merge pull request #10653 from homeyer/patch-1
remove duplicate text in documentation for popover
2013-09-15 20:11:56 -07:00
Andrew Homeyer
31f32e8485 remove duplicate text in documentation for popover 2013-09-15 21:07:15 -06:00
ggam
3a20ec410b Removed unneeded 'accordion-toggle' class. Fixes #10481 2013-09-14 19:15:42 +02:00
Jake Buob
2381ab088b Add nav-pills-border-radius variable 2013-09-13 15:57:10 -04:00
Jake Buob
4d4976fdcc Make nav pills border-radius border-radius-base 2013-09-13 15:56:30 -04:00
Mark Otto
6b97970d31 Merge pull request #10623 from jdorfman/jdorfman-maxcdn-link
getting-started - Replace NetDNA.com with MaxCDN.com
2013-09-13 11:49:11 -07:00
Justin Dorfman
6397ba1125 getting-started - Replace NetDNA.com with MaxCDN.com 2013-09-13 11:45:15 -07:00
Chris Rebert
b896ce0270 Merge pull request #10619 from mathiasose/master
Further clarification about this step
2013-09-13 09:45:16 -07:00
Mathias Ose
03b1aed37b As a node.js noob, even with the previous clarification this was a bit unclear. This change should (hopefully) make it obvious. 2013-09-13 17:54:48 +02:00
Mark Otto
33a1852336 Merge pull request #10598 from ZDroid/patch-1
Linux users also love Chrome
2013-09-12 19:40:42 -07:00
Chris Rebert
4f20a29c32 rm irrelevant entries from .gitignore; fixes #10609 2013-09-12 11:29:26 -07:00
Zlatan Vasović
9a21fdaf6d Better? /cc @mdo 2013-09-12 18:35:33 +02:00
Mark Otto
370130669c Merge pull request #10602 from mikefrancis/patch-2
Added in list elements for dividers
2013-09-12 09:04:52 -07:00
Mike Francis
3c6229c435 Added in list elements for dividers 2013-09-12 12:46:03 +01:00
Zlatan Vasović
869238c071 We also use Chrome :P 2013-09-12 10:15:38 +02:00
Chris Rebert
129b85b70d Merge pull request #10597 from ZDroid/patch-1
@grid-float-breakpoint need to be @screen-sm-min
2013-09-12 00:57:27 -07:00
Zlatan Vasović
5caf780081 @grid-float-breakpoint need to be @screen-sm-min
😄
2013-09-12 09:52:33 +02:00
Mark Otto
88ae76536d Merge pull request #10573 from gribelu/tooltip-fix
Hardcoded Tooltip arrow positioning
2013-09-11 23:19:56 -07:00
Mark Otto
dbcb05880f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 23:13:28 -07:00
Mark Otto
28e5572bf4 Fixes #10492: Account for responsive tables in panels 2013-09-11 23:11:18 -07:00
Mark Otto
9c0d04d3e4 Merge pull request #10569 from ZDroid/patch-2
Change @screen-* to @screen-*-min
2013-09-11 23:07:47 -07:00
Mark Otto
fc92931107 Merge pull request #10594 from twbs/navbar-form-labels-warning
add same accessibility warning from .form-inline to .navbar-form docs
2013-09-11 23:02:11 -07:00
Chris Rebert
851acf3f33 add same accessibility warning from .form-inline to .navbar-form docs 2013-09-11 22:58:07 -07:00
Mark Otto
682ee3ab1e Merge branch 'master' of github.com:twbs/bootstrap 2013-09-11 21:14:25 -07:00
Mark Otto
291a23aa4f Massive customizer audit and overhaul
I probably missed a few things and screwed up a few others, but this
takes the place of much of #9910. I haven't added many variables—that
should be reserved for v3.1—but I have rejiggered the layout, added
missing ones, corrected wrong values, etc.

/cc @cvrebert @juthilo @saas786
2013-09-11 21:14:10 -07:00
Mark Otto
ba818bc4e3 Remove unneeded comment in layouts 2013-09-11 21:12:58 -07:00
Mark Otto
ecc6978241 Merge pull request #10590 from twbs/doc-jquery-version
document jQuery version requirement; fixes #10355
2013-09-11 20:22:33 -07:00
Chris Rebert
0e54a49b9d Merge pull request #10591 from twbs/modal-remote-migration-doc
add modal 'remote' option semantics change to migration docs
2013-09-11 20:17:18 -07:00
Chris Rebert
306d850d3a add modal 'remote' option semantics change to migration docs; fixes #10585 2013-09-11 20:08:59 -07:00
Chris Rebert
a1b0311597 document jQuery version requirement; fixes #10355 2013-09-11 19:53:32 -07:00
Mark Otto
a1cdbbe55e scope customizer h4 change 2013-09-11 16:59:51 -07:00
Mark Otto
d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-11 16:35:27 -07:00
Mark Otto
fddcadbc21 run grunt 2013-09-11 16:35:00 -07:00
Chris Rebert
725e2b9ccf re-fix typo in comment 2013-09-11 16:24:03 -07:00
Mark Otto
cd7cf40aff Merge pull request #10584 from twbs/ie_viewports
Fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply to docs
2013-09-11 16:19:12 -07:00
Mark Otto
b0ea3a08cd Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
Conflicts:
	getting-started.html
	less/responsive-utilities.less
2013-09-11 16:15:12 -07:00
Mark Otto
6519303549 fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 16:06:43 -07:00
Mark Otto
6e064894db remove unnecessary right and left properties on .modal-dialog 2013-09-11 14:56:02 -07:00