Mark Otto
7241d7beb7
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 18:16:14 -07:00
Mark Otto
35ad599df6
prevent navbar from collapsing in non responsive example ( fixes #9812 )
2013-08-18 18:16:01 -07:00
Chris Rebert
ed3e870da8
tweak formatting of additional migration notes
2013-08-18 16:39:08 -07:00
Chris Rebert
2ca46ff97e
add angle brackets
2013-08-18 16:36:49 -07:00
Mark Otto
9c12d670ed
clarify inline block mention in docs
2013-08-18 16:27:20 -07:00
Mark Otto
f4b744e697
Merge pull request #9791 from pereorga/pere-optimize-images
...
Optimize images using lossless compression
2013-08-18 15:52:24 -07:00
Mark Otto
c240460f0b
Merge branch '3.0.0-wip' into glyphicons-LESS-fixes
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 15:47:29 -07:00
Mark Otto
638db635d7
fix broken button
2013-08-18 15:45:56 -07:00
Mark Otto
7b4e2a9a4a
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
2013-08-18 15:43:27 -07:00
Mark Otto
fe767a18d3
fixes #9798 : update spacing on checkboxes and radios for horizontal
2013-08-18 15:41:24 -07:00
Chris Rebert
fa7cc6cafd
account for 9fa0a5d127 in the docs
2013-08-18 15:37:07 -07:00
Chris Rebert
c338f2782d
regenerate Glyphicons listing/demo section of docs
2013-08-18 15:36:24 -07:00
Julian Thilo
ef68cf8ebd
Add new navbar-default class to examples
2013-08-19 00:35:40 +02:00
Mark Otto
5746979aad
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 15:30:02 -07:00
Chris Rebert
0501d83f8b
regenerate CSS
2013-08-18 15:20:16 -07:00
Chris Rebert
9fa0a5d127
tweak some of the Glyphicon class names to match Bootstrap conventions
2013-08-18 15:19:13 -07:00
Mark Otto
43271f1ab6
Merge pull request #9804 from twbs/redundant-ampersands
...
rm redundant ampersands from button-groups LESS
2013-08-18 15:15:53 -07:00
Chris Rebert
7b0d93f79e
regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers
2013-08-18 15:15:33 -07:00
Mark Otto
8d8d165ee7
Merge pull request #9800 from ZDroid/patch-1
...
Nesting for link styles
2013-08-18 15:10:48 -07:00
Mark Otto
9b61b7a722
fixes #9803 : label and input alignment in horizontal forms
2013-08-18 15:10:28 -07:00
Chris Rebert
fa3959a1e1
rm redundant ampersands from button-groups LESS
2013-08-18 15:05:42 -07:00
Julian Thilo
546b2cc614
Fix some forgotten things for navbar-default
...
New variable names were missing here and there.
2013-08-18 23:30:40 +02:00
Zlatan Vasović
743fc9ac7e
Nesting for link styles
2013-08-18 23:28:55 +02:00
Julian Thilo
abca00870f
Add a .navbar-default class for default colors
...
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
2013-08-18 23:05:56 +02:00
Chris Rebert
518488cb40
make Recess part of the Grunt test task to guard against bad LESS
2013-08-18 13:47:16 -07:00
Chris Rebert
b5d87fc42b
rename HTML5 validation Grunt task since it checks the examples too
2013-08-18 13:43:53 -07:00
Chris Rebert
af9fd02638
Merge pull request #9796 from twbs/fix-glyphicons-btns-docs
...
fix wrong closing tags on Glyphicons-in-buttons examples
2013-08-18 13:41:21 -07:00
Chris Rebert
1b49b42683
fix wrong closing tag on Glyphicons-in-buttons examples
2013-08-18 13:40:39 -07:00
Chris Rebert
896bd327c7
Merge pull request #9793 from vsn4ik/fix_examples_url
...
Fix examples url in _layouts/home.html
2013-08-18 13:18:55 -07:00
vsn4ik
d721c61d99
Fix examples url in _layouts/home.html
2013-08-18 23:06:56 +04:00
Pere Orga
0665b67760
Optimize images using lossless compression
2013-08-18 19:50:33 +01:00
Mark Otto
9b66e6b0f4
fixes #9790 : nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav
2013-08-18 11:17:28 -07:00
Mark Otto
776fb435c5
update nav for getting started migration
2013-08-18 11:13:56 -07:00
Mark Otto
26067d3d7d
fixes #9768 : unbold buttons
2013-08-18 11:11:31 -07:00
Mark Otto
b5ac1b065e
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-18 11:08:29 -07:00
Mark Otto
ef4590dfb4
fixes #9786 : enable tables in panels
2013-08-18 11:08:20 -07:00
Chris Rebert
0cbffb3bcb
Delete glphyicons.less
...
File is empty and has misspelled name.
Fixes #9787
2013-08-18 11:00:27 -07:00
Mark Otto
3c1d951d29
fixes #9787 : remove derp file
2013-08-18 11:00:04 -07:00
Chris Rebert
40a1bcea7d
Merge pull request #9789 from thgh/patch-2
...
Fix well class names in migration section of getting-started.html
2013-08-18 10:57:23 -07:00
Chris Rebert
25d9b2ad49
Merge pull request #9788 from brunoamaral/3.0.0-wip
...
fixes two type-o's in glyphicons
2013-08-18 10:55:22 -07:00
thgh
5e2569f15b
Fix well class names in migration section of getting-started.html
2013-08-18 19:54:28 +02:00
Bruno Amaral
0989babe5d
fixes two type-os in glyphicons
2013-08-18 18:47:40 +01:00
Mark Otto
d7eee9bd6e
Merge pull request #9767 from twbs/bs3_restore_glyphicons
...
BS3: Restore Glyphicons
2013-08-18 10:35:26 -07:00
Mark Otto
f8b65b41ab
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-18 10:28:32 -07:00
Mark Otto
92d8989553
Merge pull request #9785 from mikepage/patch-1
...
Update mixins.less to fix error .button-variant is undefined in Grunt
2013-08-18 10:27:53 -07:00
Mark Otto
6496ffb7d4
reformat all the things
2013-08-18 10:26:50 -07:00
Mike Pagé
2488f2ae68
Update mixins.less
2013-08-18 19:23:42 +02:00
Mark Otto
a5ac0b7498
Merge branch '3.0.0-wip' of https://github.com/iatek/bootstrap into iatek-3.0.0-wip
2013-08-18 10:12:33 -07:00
Mark Otto
73a1a4133c
combine and simplify caret border widths
2013-08-18 10:08:18 -07:00
Mark Otto
a9e741bffc
Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret
2013-08-18 10:07:34 -07:00
