Mark Otto
f367090671
countypo
2013-03-29 22:38:25 -07:00
Mark Otto
4ce9203f2c
Merge branch '3.0.0-wip' into bs3_new_nav
2013-03-29 14:21:03 -07:00
Mark Otto
9f59648702
add link to github project on getting started section
2013-03-29 14:04:11 -07:00
Mark Otto
2ebc060795
mo padding on side nav links
2013-03-29 13:43:37 -07:00
Mark Otto
d3fe506f04
clearer js instructions on how to include plugins
2013-03-29 13:43:30 -07:00
Mark Otto
3055f09a90
dat red
2013-03-29 10:45:00 -07:00
Mark Otto
e25ad912e2
correct page title and nuke liquid description
2013-03-28 17:20:17 -07:00
Mark Otto
384926a1d6
remove nonexistant example
2013-03-28 17:19:41 -07:00
Mark Otto
b844d5dd2f
Merge pull request #7409 from andriijas/3.0.0-wip-formactions
...
Make sure form actions are properly aligned with form-horizontal
2013-03-28 10:46:23 -07:00
Andreas Cederström
090545ffdf
Make sure form actions are properly aligned with form-horizontal
2013-03-28 11:33:18 +01:00
Mark Otto
3278c40631
move nav into partial; rejigger content some more
2013-03-28 03:06:00 -07:00
Mark Otto
df35e26142
rejigger some content and start exploring section headings
2013-03-28 01:34:42 -07:00
Mark Otto
ba46d859e3
none of that
2013-03-28 01:12:07 -07:00
Mark Otto
4b8b8d2e46
holy crap new docs layout separate from home, no more top navbar
2013-03-28 01:08:14 -07:00
Mark Otto
081c061281
new subnav on all pages
2013-03-28 00:21:21 -07:00
Mark Otto
fe414d8566
turn docs navbar into left navbar
2013-03-27 23:33:45 -07:00
Mark Otto
6696ff5d92
clarify docs on unstyled lists
2013-03-27 15:54:17 -07:00
Mark Otto
f0f33eb9a3
Refactor .list-inline and .list-unstyled
...
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto
5b298a2aaf
docs fixes with new .bs-docs-container; fixing some lingering grid classes
2013-03-26 23:54:17 -07:00
Mark Otto
d5303906bd
Remove grid example; update grid classes in examples
2013-03-26 17:17:39 -07:00
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