Mark Otto
ca31f060a8
New grid classes
2013-03-26 17:12:17 -07:00
Mark Otto
1e9be3644c
remove .navbar-inner from starter template
2013-03-26 12:31:03 -07:00
Mark Otto
954dcc0dc5
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
...
Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html
2013-03-26 12:28:00 -07:00
mo
ab09fb25b9
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"
2013-03-25 18:13:13 -07:00
mo
a9e9d9d544
Fixed all the .brand in navbar to .navbar-brand
2013-03-25 17:46:44 -07:00
Mark Otto
3c82ccaa2b
color border in table contextual classes
2013-03-17 17:26:02 -07:00
Mark Otto
3aee2adb4b
Fixes #7297 : add support for .success, .error, and .warning on td and th elements in tables
2013-03-17 12:10:58 -07:00
Mark Otto
28cdc8dc5f
incorporate print utilities classes into responsive docs; rejigger some content
2013-03-17 11:57:00 -07:00
Mark Otto
160ff23c85
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip
2013-03-17 11:45:21 -07:00
Mark Otto
8d5a9371be
update readme to resolve conflict
2013-03-17 11:45:13 -07:00
Mark Otto
4aba489cfd
Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable
2013-03-17 11:34:27 -07:00
Mark Otto
6012d8221b
Exploring rems as font-size unit
...
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto
47f69c0d9e
mixin, not copypasta
2013-03-17 11:15:04 -07:00
Mark Otto
ef4898990f
convert to preboot's retina mixin
2013-03-16 17:19:05 -07:00
Mark Otto
71d4b5b6e7
Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip
2013-03-16 17:06:20 -07:00
Mark Otto
68dfd322f4
fixes #7140 : hide navbar toggle in print
2013-03-16 16:17:32 -07:00
Mark Otto
fe2658ed61
Fixes #7150 : colorize links in alerts
2013-03-16 15:31:03 -07:00
Mark Otto
7e933db2dd
comment
2013-03-16 15:03:22 -07:00
Mark Otto
070c77a960
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-16 14:59:43 -07:00
Mark Otto
1d94d777c3
Merge pull request #7258 from acconrad/patch-1
...
Update buttons.less to disable btn pointer events
2013-03-16 14:59:33 -07:00
Mark Otto
e0de08c389
typo
2013-03-16 14:49:21 -07:00
Mark Otto
8c9e9e28cf
Fix vertical button groups
2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5
Use form elements in checkbox and radio button groups
...
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto
be8f992c94
remove inner shadow from .highlight
2013-03-16 12:09:26 -07:00
Mark Otto
f77dc548a1
update pygments highlighting with customizations from preboot
2013-03-16 12:07:00 -07:00
Mark Otto
bb38fa5286
Overhaul the grid system and its docs
...
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot )
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto
145eb054d9
begin to rewrite the grid docs
2013-03-15 21:57:16 -07:00
Mark Otto
2a0fb08fad
getting started as navbar link label
2013-03-15 21:23:59 -07:00
Mark Otto
ecfdecea00
Use translucent box shadow on hr elements; colorize hr elements within alert components
2013-03-14 23:01:23 -07:00
Mark Otto
4c0719ea5f
fix derpy linenos in pygments for thumbnails component
2013-03-14 22:34:20 -07:00
Mark Otto
7e07c89b8b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-14 22:25:53 -07:00
Mark Otto
ed7fe0e5ba
unfuck misaligned main container
2013-03-14 21:45:31 -07:00
Mark Otto
8f04096205
Merge pull request #7285 from stilliard/patch-1
...
Additional heading font-size classes
2013-03-14 20:55:43 -07:00
Mark Otto
4247008e23
more readme copy
2013-03-14 20:55:23 -07:00
Mark Otto
b375283597
readme copy
2013-03-14 20:54:53 -07:00
Mark Otto
2b9c936a3a
start listing other bootstrap powered starter doodads in the readme
2013-03-14 19:19:06 -07:00
Andrew Stilliard
706dd8c045
Additional heading font-size classes
...
This relates to changes in issue #7284
2013-03-15 02:11:37 +00:00
Mark Otto
c9bfcfcfd5
underp license maybe
2013-03-14 19:08:09 -07:00
Mark Otto
45606ae6a0
herp derp, spelling booboo
2013-03-14 19:06:47 -07:00
Mark Otto
8f20a5ac91
Rename license to license.md; point readme to it via link
2013-03-14 19:05:54 -07:00
Mark Otto
85e5d40099
fix example navbar brand
2013-03-14 18:54:43 -07:00
Mark Otto
3cd6d00cc4
use the proper selector
2013-03-14 18:53:46 -07:00
Mark Otto
b5eca07be1
modify copy
2013-03-14 18:23:08 -07:00
Mark Otto
d8234b38cb
Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip
2013-03-14 13:34:48 -07:00
Mark Otto
224296f695
Fixes #7281 : make tables super specific for hovers and striping to avoid nesting issues
2013-03-14 13:29:43 -07:00
Mark Otto
00169b48bd
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto
7bff231ea5
Merge pull request #7227 from parndt/patch-1
...
Fix minor grammatical problem
2013-03-14 13:04:50 -07:00
Addy
0c65a0e1ee
Added bower install to download/install options in getting started guide
2013-03-14 10:58:16 +00:00
Adam Conrad
e488e709a0
Update buttons.less to disable btn pointer events
...
Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen.
2013-03-12 17:58:41 -03:00
Mark Otto
d0e1b56603
Merge pull request #7181 from lukeapage/3.0.0-wip
...
make less files compile with strict maths in 1.4.0
2013-03-11 01:16:08 -07:00