Mark Otto
46378c7ba3
Merge pull request #8411 from cvrebert/navbar-LESS-nesting
...
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Chris Rebert
e40aee9c9e
code.less: cleanup styles that get immediately overriden later in the file
2013-07-07 20:03:52 -07:00
Chris Rebert
6bda16f6be
use nesting more in pagination.less
2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c
more nesting in navbar.less
2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2
more nesting in buttons.less
2013-07-07 19:16:38 -07:00
Maurice Wahba
8a84da6341
Carousel no longer dependent on glyphicons
...
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto
95655e7275
Remove more Glyphicons
2013-07-05 14:27:54 -05:00
Mark Otto
fffb37ecea
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42
Merge pull request #8378 from liuyl/aftertosibling
...
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:22:46 -05:00
Mark Otto
61823dbff1
Move hr
to scaffolding.less (out of type.less) and simplify styles
2013-07-05 14:21:05 -05:00
Mark Otto
88a266b800
Add tfoot back (addresses more than #8387 )
2013-07-05 14:15:00 -05:00
Mark Otto
14056409c3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:13:24 -05:00
Mark Otto
817972724a
Remove further mentions of Glyphicons
2013-07-05 14:11:12 -05:00
liuyl
e6529e9588
delete typeahead style
2013-07-05 15:09:16 +08:00
liuyl
5b69d34053
use sibling selector instead of pseudo selector
2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21
refactor tables.less to use nesting more
2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328
comma for the guardian angel /cc @cvrebert
2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6
Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
...
Conflicts:
less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto
5b2d933524
Fixes #8350 : unfuck Chrome number input element cursor /cc @cvrebert @eintnohick
2013-07-01 19:49:29 -07:00
Mark Otto
08b3515fd7
fixes #8345 : use inline-block on .img-responsive
2013-07-01 19:42:43 -07:00
Mark Otto
9da90adb4c
fixes #8068 : add .help-block to form field state mixin
2013-07-01 18:21:19 -07:00
Mark Otto
c9df1db502
fixes #7367 : slightly larger carousel indicators
2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3
Make more components mixin-friendly
2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c
Fix responsive utilities for table elements
...
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
Mark Otto
534eac5242
Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
...
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto
eeaa70ab4a
Merge pull request #8341 from Quy/3.0.0-wip
...
Remove references to fonts
2013-06-29 17:29:01 -07:00
Francis Brunelle
6a20810ca4
reset left padding for .media-list, .pagination and .pager
2013-06-29 16:06:14 -04:00
Quy Ton
02351c0589
Remove references to fonts
2013-06-29 07:37:53 -07:00
John O'Nolan
4252dff850
Fixes broken links to navbar component in docs.
2013-06-29 13:21:16 +02:00
Mark Otto
0a92efce0c
Nuke hella things
...
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Mark Otto
09cdee2f03
Overall responsive img
styles
...
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto
1a09eada35
Run make on JS
2013-06-28 00:08:19 -07:00
Mark Otto
8e6d5be8e4
update close button example display
2013-06-27 23:26:04 -07:00
Mark Otto
88ece4fc59
fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly
2013-06-27 20:50:21 -07:00
Mark Otto
bf3c5e070e
remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s
2013-06-27 20:49:29 -07:00
Mark Otto
89117ec6b2
run make on last commit
2013-06-27 20:18:16 -07:00
Mark Otto
d9a662ed1d
fixes #7977 : prevent some table bullshit on input groups
2013-06-27 20:15:44 -07:00
Mark Otto
ca8ca2177f
fixes #4852 : popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR
2013-06-27 19:36:56 -07:00
Mark Otto
6a2858f7bf
make on js i guess? /cc @fat
2013-06-27 19:36:35 -07:00
Mark Otto
81b5e74057
remove glyphicons from compiled css
2013-06-27 19:36:09 -07:00
Mark Otto
416cc6b2ee
fix broke js markup
2013-06-27 19:33:26 -07:00
Mark Otto
2af67238a4
Merge pull request #8332 from twitter/bs3_remove_icons
...
BS3: Remove Glyphicons
2013-06-27 19:23:55 -07:00
Mark Otto
8cd5d0be71
add docs callout for glyphicons on homepage and CSS page
2013-06-27 19:22:11 -07:00
fat
b06ec345ce
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-27 19:19:57 -07:00
Mark Otto
2981f0089f
remove glyphicons from demo component
2013-06-27 18:51:06 -07:00
Mark Otto
879d517cb3
delete icons in assets
2013-06-27 18:49:59 -07:00
Mark Otto
e5a9a1f5ff
remove icons from sidenav
2013-06-27 18:49:37 -07:00
Mark Otto
62f76ad33f
Merge branch '3.0.0-wip' into bs3_remove_icons
...
Conflicts:
docs/components.html
2013-06-27 18:49:05 -07:00
fat
94761c2216
use collapse in dropdown js example
2013-06-27 18:47:35 -07:00
Mark Otto
cb29ed0751
Merge pull request #8307 from cvrebert/8287-docs-patch
...
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto
296b9d7293
Merge pull request #8313 from jholl/patch-1
...
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto
68792fc1f9
Merge pull request #8306 from cvrebert/styling-n-typo
...
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Julian Thilo
b4e0e4fee6
Adjust info callout, add callouts to docs
...
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland
2471b9d725
typo: match doc text and example
2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c
Fix #8287
2013-06-25 20:18:30 -07:00
Chris Rebert
274a342657
Docs: fix 1 typo; use <code> in 1 place
2013-06-25 19:50:37 -07:00
Chris Rebert
694c650f8e
copyedit JS docs
2013-06-25 19:32:17 -07:00
Chris Rebert
266bdfcaaa
rm :invalid styling from docs
...
It was removed from the code in 90d4343f66
:-/
2013-06-25 16:31:12 -07:00
Julian Thilo
f00c885d4c
Docs: create new callout classes
2013-06-25 23:12:36 +02:00
Mark Otto
6ac063430f
Merge pull request #8290 from juthilo/3.0.0-docs-nothird
...
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto
534ba060be
Merge pull request #8292 from cvrebert/patch-1
...
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Julian Thilo
fe25ebc2af
Recess welcome
2013-06-25 22:22:23 +02:00
Chris Rebert
e46e63463a
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 14:16:39 -06:00
Chris Rebert
4be21c422a
fix "Data attributes" link in JS docs sidenav
...
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo
a87ea9345b
Add IDs, adjust text
2013-06-25 21:59:34 +02:00
Julian Thilo
0f0e7fc376
Add a link to the mailing list for JS help
2013-06-25 21:19:19 +02:00
Julian Thilo
30e5e89fac
Add callout to docs: LESS compiler support
2013-06-25 21:01:13 +02:00
Julian Thilo
abb112173e
Add callout to docs: 3rd-party libs not supported
2013-06-25 20:52:49 +02:00
Luis Hdez
9ed5b5e653
Fix line breaks on add-ons with spaces
2013-06-25 14:34:57 +02:00
Kyle
c455d92f9e
Replaced <i> with <span> for glyphicon
2013-06-24 11:27:05 +08:00
Mark Otto
55120d124c
Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
...
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto
573a197417
Move grid offsets to desktop only ( fixes #8229 )
2013-06-23 15:15:42 -07:00
Mark Otto
164e88781b
Make on previous commits
2013-06-23 15:05:58 -07:00
Luis Hdez
5af22ab89f
Fix overlap sidebar for Tablets and up in docs
2013-06-23 23:15:32 +02:00
Mark Otto
976322b2a6
run make on previous merge
2013-06-22 18:56:55 -07:00
Mark Otto
b0e943399d
Improve alignment of navbar brand and fix up left padding on list groups
2013-06-21 17:21:44 -07:00
Mark Otto
eba9b4de6c
Reset padding on homepage links
2013-06-21 11:56:47 -07:00
Tom Pietschker
9d43fbb57e
Remove the offcanvas js from the footer
...
This was moved inline in 65ad52060e
2013-06-21 10:03:28 -04:00
Tom Pietschker
8ef3df418f
Rename class name in placeholder
...
applies 2535e060a4
to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Quy Ton
ac1058e435
Rename class name in placeholder
2013-06-20 18:44:19 -07:00
Mark Otto
ef8e5853cb
Fixes #8154 : enforce full width .navbar-nav.pull-right
in mobile
...
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto
82f9de9459
Fixes #8159 : Be more specific about disabled inputs to avoid iOS bug
...
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto
90d4343f66
Fixes #8093 : Removes invalid focus styles on inputs
2013-06-20 16:42:05 -07:00
Mark Otto
4db90244c4
run make on previous commit
2013-06-20 16:27:39 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
2fccf927c5
Run make on last commit
2013-06-20 16:02:05 -07:00
Mark Otto
f64fe29003
Move Glyphicons into their own repo
...
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto
c5fb401a62
Move examples out of the main repo to twbs/bootstrap-examples
...
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.
Specifically, we're doing the following:
* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project
All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto
8383209521
run make on @nextgenthemes last commit
2013-06-20 09:58:21 -07:00
Mark Otto
65ad52060e
Offcanvas example update
...
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
b0bece66f2
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
2013-06-19 19:13:38 -07:00
Mark Otto
5fcdf1229d
Fixes #8001 : add IDs for example inputs
2013-06-19 19:02:29 -07:00
Kurt MacDonald
98a8eaffc0
Add missing property to form-horizontal docs
2013-06-19 17:08:14 -06:00
Mark Otto
546d40a143
Add support for tr
, th
, and td
to responsive utilities
2013-06-18 19:16:50 -07:00
Mark Otto
112dabb3c2
run make on last commit
2013-06-18 19:16:50 -07:00
Chris Rebert
7b60d04f0c
docs/javascript.html: backticks -> <code>
2013-06-18 14:35:37 -07:00
Mark Otto
bcc3af4b2a
Fixes #7599 : Improved print styles for a few key components
...
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto
37f4a25be4
Better clearing on .dl-horizontal
for empty dd
elements
...
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.
Addresses a few old issues, including #2824 , #3819 , #3821 , #4062 ,
#6707 , and #7180 .
Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto
4436e727ed
Properly unstyle the .list-unstyled
class by switching from margin
to padding
...
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto
84c0dc13ba
Remove explicit, unncessary line-height
on li
elements
2013-06-17 14:21:16 -07:00
Mark Otto
731cbb302e
Better base ul
and ol
styles
...
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Mark Otto
5f3f73c620
Merge pull request #8184 from FLOKER/3.0.0-wip
...
redundant lines removed
2013-06-16 20:48:27 -07:00
Chris Rebert
5c63883062
components docs: backticks ==> <code>
2013-06-16 21:40:50 -06:00
Mark Otto
1555992e35
Merge pull request #8187 from imsky/3.0.0-wip
...
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Chris Rebert
50df5de14f
CSS docs page: backticks ==> <code>
2013-06-16 21:36:56 -06:00
Ivan Malopinsky
c1655e6cbd
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 23:16:56 -04:00
FLOKER
125e472d6f
redundant lines removed
2013-06-16 22:18:46 +02:00
Mark Otto
ac3521fef4
Remove WebKit overflow scrolling for now
2013-06-16 10:56:30 -07:00
Mark Otto
6ce154c7ed
Fixes #8175 : Update input min-height vars to fix FF21 input rendering
2013-06-15 11:46:13 -07:00
Mark Otto
258e1d62fb
Fix up broken input group example layouts
2013-06-15 11:37:59 -07:00
Mark Otto
ecf9b020dd
Merge pull request #8168 from marsuboss/patch-2
...
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto
c14f23192a
Merge pull request #8167 from marsuboss/patch-1
...
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
marsuboss
1421a0e9bb
Fix
2013-06-13 15:50:06 +03:00
marsuboss
436cffdaaf
Duplicate ID navbar-example
2013-06-13 15:36:52 +03:00
marsuboss
c6f51d0919
Duplicate ID drop5
2013-06-13 14:29:34 +02:00
Mark Otto
949c7cca00
Merge pull request #8156 from baer/toggle-button-fix
...
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3
Merge pull request #8158 from baer/download-button-fix-proper
...
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced
Docs Customize "Customize and Download" button not working properly
2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86
Docs Customize toggle button used incorrect selectors
2013-06-12 12:51:10 -06:00
Mark Otto
d74a9634b0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-09 23:45:23 -07:00
Mark Otto
9fac2c0467
Update docs JS to prevent clicks on links with hash hrefs
2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a
No more need for grid column highlighting, so nuke that
2013-06-09 23:44:14 -07:00
Mark Otto
0a18d33d2c
Redo grid documentation
...
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto
8b136f5b66
Merge pull request #8080 from mladenplavsic/patch-2
...
Update css.html
2013-06-08 20:53:37 -07:00
Mark Otto
eb21410cc8
add new grid subnav link
2013-06-08 18:36:29 -02:30
Mark Otto
441bbe1998
Another grid update
...
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi
df5ddeb7cc
Set validation states also for addons
2013-06-06 21:00:32 -04:00
Mladen Plavsic
232c03dc2f
Update css.html
...
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto
b1cc11cd98
reverse order of grid column examples for dual grid section
2013-06-04 21:55:59 -07:00
Mark Otto
567b8b5631
fix docs highlighting of grid
2013-06-03 21:58:58 -07:00
Mark Otto
245ebda651
nuke the .col
2013-06-03 21:57:51 -07:00
Mark Otto
45c5b4e45c
restore .col-*-12 classes for now
2013-06-03 21:51:35 -07:00
Mark Otto
a05f6d4cea
fixes #8066 : add missing % functions to grid less code
2013-06-03 11:58:38 -07:00
Mark Otto
1b8cd2d8eb
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 15:51:35 -07:00
Mark Otto
21441f1292
Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up
2013-06-02 15:33:42 -07:00
Robert Burns
97e6e5f150
Fix navbar toggles
2013-06-02 17:51:36 -04:00
Mark Otto
bd170e8366
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 14:08:50 -07:00
Mark Otto
ddf95c91db
Merge pull request #8057 from burnsra/3.0.0-wip-getting-started
...
Fix layout for examples in getting-started
2013-06-02 14:08:21 -07:00
Mark Otto
b5095d3e8a
Merge pull request #8046 from burnsra/3.0.0-wip-carousel
...
Fix for carousel indicators
2013-06-02 13:48:18 -07:00
Mark Otto
19d0726609
Grid updates
...
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Robert Burns
19ce707a00
Fix layout for examples in getting-started
2013-06-02 15:52:51 -04:00
Mark Otto
75db70a6c2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 11:57:28 -07:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
Mark Otto
8899c30f16
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-27 19:23:17 -07:00
fat
a7a87c8e8c
rebuild
2013-05-27 12:48:16 -07:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Mark Otto
60575dfb46
Gradients refactor
...
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Robert Burns
79666385f7
Use base padding for input-group-addon class
2013-05-24 08:14:11 -04:00
Mark Otto
3160bd872e
rearrange customizer content
2013-05-23 21:34:32 -07:00
Mark Otto
371d14e217
Remove commented out code and properly nest CSS again for .collapse
2013-05-23 21:06:02 -07:00
Mark Otto
a3cba92edd
rejigger the customizer layout
2013-05-22 23:45:12 -07:00
Mark Otto
acc0875259
fix up customizer js and classes; turn buttons into real buttons
2013-05-22 23:34:28 -07:00
Mark Otto
9868d9403c
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-22 21:51:54 -07:00
Mark Otto
cdcc3e8768
delete customize layout since it's no longer in use
2013-05-22 21:50:25 -07:00
Julian Thilo
52a348aa3f
Bring the customizer up to speed
...
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
2013-05-23 02:30:58 +02:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Jacob Thornton
7cbec6e89a
remove jszip files
2013-05-21 19:33:57 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
AJ Acevedo
9a2218dd38
Fixed broken Customizer link for docs
2013-05-21 02:23:19 -04:00
Mark Otto
0c167a1d9d
Fixes #7474 : Use @input-height-base
in .navbar-vertical-align()
for .navbar-form
2013-05-19 22:12:48 -07:00
Mark Otto
35573db810
Fixes #7611 : fix optgroup formatting for Firefox
2013-05-19 22:06:10 -07:00
Mark Otto
5f7352a6fe
Better grid template; link color change in docs navbar
2013-05-16 22:11:31 -07:00
Mark Otto
5fbb9e9f5d
More row change ups:
...
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto
e94e5e8b40
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:54:14 -07:00
Mark Otto
c0f5a0775d
Run make on latest JS
2013-05-16 20:54:06 -07:00
Mark Otto
9762f95bde
Change up link alerts
...
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
fat
abc49c729b
update js docs
2013-05-16 20:42:31 -07:00
Mark Otto
0f4b4acce1
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:32:37 -07:00
Mark Otto
8a3e982305
Fix broke dropdown navbar example
2013-05-16 20:29:50 -07:00
fat
2433a076ac
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:20:27 -07:00
fat
140ef2320b
change namespace back to dot notation and someother js shizzle
2013-05-16 20:19:51 -07:00
Mark Otto
1983ca03ec
Form validation and horizontal row update
...
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto
55a1416789
remove prettyprint js mention
2013-05-16 20:07:48 -07:00
Mark Otto
af0b9cb41a
Simple responsive utilities test css
2013-05-16 20:07:41 -07:00
Mark Otto
e5d6a40a77
Redo the responsive utilities stuff
...
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto
bdd5022833
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:46:19 -07:00
Mark Otto
c73588b313
Drop .form-actions
2013-05-16 18:46:12 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
fat
e74110bf4a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:35:18 -07:00
fat
c072b6b2fc
remove dumb assets update makefile wassup
2013-05-16 18:34:51 -07:00
Mark Otto
d8b749a4d3
Fix z-index of carousel indicators
2013-05-16 18:29:53 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
Mark Otto
53bc93282f
nuke that docs _site folder
2013-05-16 13:46:12 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
a4c16155a2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
2013-05-16 11:08:46 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Mark Otto
f3d8577734
Run make on previous commit; twerk box shadow back to commented out version
2013-05-15 10:16:11 -07:00
Mark Otto
6307dc40d7
Fixes #7898 : ensure button type
...
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
Mark Otto
31dcb91189
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto
57856e6cfb
Merge pull request #7877 from burnsra/3.0.0-wip-form-inline
...
Cleanup form-inline examples in docs
2013-05-14 23:26:35 -07:00
Mark Otto
fcb7c9da6f
Fixes #7878 : .col-span-* mentions to .col-lg-*
2013-05-14 23:24:29 -07:00
Mark Otto
28a081cb20
Overhaul form control and button sizing, and some type styles
...
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto
a41d566d5e
margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)
2013-05-14 22:08:56 -07:00
Mark Otto
e56c809492
refined navbar styles in docs
2013-05-14 22:08:32 -07:00
Mark Otto
7e674efa22
outdent the file list
2013-05-14 22:00:08 -07:00
Mark Otto
0ac1af13d3
Merge pull request #7882 from juthilo/3.0.0-wip
...
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto
e23f661f3f
Fixes #7885 and #7886 : only right align horizontal form labels when above 768px
2013-05-14 18:59:13 -07:00
Mark Otto
1d8ff36afa
Add .panel-footer
2013-05-14 18:55:37 -07:00
Julian Thilo
cd2d7b5d17
add detail to navbar component alignment section
...
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo
9af88380c4
.navbar docs: update -fixed-* callouts, fix -link
...
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00
Robert Burns
45f62f9589
Cleanup form-inline examples in docs
2013-05-14 08:33:49 -04:00
Robert Burns
da9cf1009b
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 21:40:48 -04:00
Robert Burns
a38a3429fc
Fix caret position
2013-05-13 20:03:53 -04:00
marsuboss
4eeebe7e06
Fix
2013-05-13 15:50:02 +03:00
Mark Otto
37898d5e19
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-13 00:09:35 -07:00
Mark Otto
2c6e854eea
fix broken responsive utilities table
2013-05-12 23:54:10 -07:00
Mark Otto
2093635de1
Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip
2013-05-12 20:57:07 -07:00
Robert Burns
d4546cbcc2
Fix buttons within examples
2013-05-12 22:04:22 -04:00
Robert Burns
046d82f0ef
Fix invalid input within docs
2013-05-12 22:04:01 -04:00
Mark Otto
79a4269430
Fix navbar button docs
2013-05-12 16:34:12 -07:00
Mark Otto
41a76e8e7a
Less specific dropdown styles, change up navbar dropdown styles
2013-05-12 16:30:54 -07:00
Mark Otto
09098a7923
run make on last commit
2013-05-12 16:13:51 -07:00
Mark Otto
da4e7ab15c
fix broke example
2013-05-12 16:13:39 -07:00
Mark Otto
37c1122ded
Consolidate active dropdown toggle styles and comment out the rest
2013-05-12 16:12:13 -07:00
Mark Otto
2d10d61fde
Restore commented out dropdown styles, get open dropdown state working again
2013-05-12 16:03:56 -07:00
Mark Otto
92adcfabb5
Start some nav and dropdown cleanup
...
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place on all
* Use on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
2013-05-12 15:47:18 -07:00
Vinay Raghu
23b32fec65
Recompiled using makefile recess
2013-12-05 01:36:19 +05:30
Blake Embrey
60c24ddd97
Fix the selectors for the .input-group-btn selector.
2013-05-11 09:38:48 -07:00
Vinay Raghu
9880f7c803
Changed Responsive utilities section in docs/css.html
2013-05-11 19:34:59 +05:30
Vinay Raghu
5e13f57870
Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet
2013-05-11 19:28:59 +05:30
Mark Otto
8051695c87
Merge pull request #7838 from blakeembrey/btn-group-radius
...
Remove the overrides and resets from button groups
2013-05-10 16:35:25 -07:00
Mark Otto
76ecfdfdc1
Font-size and line-height tweaks
...
* Use 1.428 for line-height instead of 1.5
* Use function for full pixel values instead of decimals
2013-05-10 10:33:35 -07:00
Mark Otto
8261866ff2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-10 10:31:52 -07:00
Mark Otto
758cb9d186
twerk nested nav links
2013-05-10 10:29:54 -07:00
Robert Burns
3af1dd1dc8
Fix link to examples
2013-05-10 07:37:14 -04:00
Mark Otto
e34abd02cc
redo docs footer a bit
2013-05-09 17:36:02 -07:00
Mark Otto
562483b907
more nav twerks for getting started page
2013-05-09 17:32:39 -07:00
Mark Otto
dbbd48f7bc
remove duplicate text scaling
2013-05-09 17:29:07 -07:00
Mark Otto
90e4ff73d2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
less/forms.less
2013-05-09 17:22:48 -07:00
Mark Otto
a19fda699d
update reference to value of base line-height
2013-05-09 17:21:18 -07:00
Mark Otto
6fba68eb8b
Unitless line-height
...
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Blake Embrey
579d566299
Update button groups to use not selector and remove redundant CSS.
2013-05-09 16:53:28 -07:00
Mark Otto
7b6352d2cf
Fix up navbar forms by using inline form as a mixin; fix docs for those
2013-05-09 16:41:35 -07:00
Mark Otto
3c72b1e9a0
remove the input from an example
2013-05-09 16:31:10 -07:00
Mark Otto
1fdfee8de0
Merge pull request #7837 from blakeembrey/input-group-radius
...
Remove input-group border radius resets
2013-05-09 16:30:48 -07:00
Mark Otto
293a3baca3
More forms overhaul
...
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey
9716b73f67
Make the border-radius on input-groups to be overrides instead of resets on every size.
2013-05-09 14:48:27 -07:00
Mark Otto
7a7971d6db
subnav for icons section
2013-05-09 14:08:06 -07:00
Blake Embrey
4a03d45651
Make icons antialiased on Webkit browsers.
2013-05-09 13:48:02 -07:00
Mark Otto
d5e6bbba27
fix some broke buttons on the js page
2013-05-09 13:28:05 -07:00
Mark Otto
ec39bed94f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-09 13:19:38 -07:00
Mark Otto
88a4712540
fix broken buttons on css docs
2013-05-09 13:12:40 -07:00
Blake Embrey
cc5e6619b4
Remove backface-visibility from progress bars.
2013-05-09 13:09:33 -07:00
Mark Otto
7fa6ae578b
Update getting started page
2013-05-09 11:40:39 -07:00
Mark Otto
25b6df9944
rename welcome to getting started
2013-05-09 11:20:15 -07:00
Mark Otto
7c94f5ef64
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-09 09:22:58 -07:00
Mark Otto
751eb0bdcc
Fixes #7823 : add mention of container to CSS page; build out CSS overview subnav
2013-05-09 09:22:49 -07:00
Robert Burns
3a539abbd2
Fix form in navbar
2013-05-09 07:21:22 -04:00
Mark Otto
766be659c1
.bs-docs-sidenote to .bs-callout
2013-05-08 22:58:54 -07:00
Mark Otto
526dfb7735
.bs-docs-tooltip-examples to .bs-example-tooltips
2013-05-08 22:57:42 -07:00
Mark Otto
09c3a4b3bc
.bs-docs-example to .bs-example
2013-05-08 22:56:29 -07:00
Mark Otto
ac28ad81d0
.bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer
2013-05-08 22:55:17 -07:00
Mark Otto
705063c73a
.bs-docs-social-* to .bs-social-*
2013-05-08 22:54:25 -07:00
Mark Otto
22f212379f
nuke stuff from customizer
2013-05-08 22:53:31 -07:00
Mark Otto
3c3e56ca50
.bs-docs-top to .bs-top
2013-05-08 22:52:48 -07:00
Mark Otto
e5e5f6616c
.bs-docs-header to .bs-header
2013-05-08 22:51:44 -07:00
Mark Otto
67b7a2fc34
docs css reorg
2013-05-08 22:50:41 -07:00
Mark Otto
d7acf4e82d
more work on the sidenav, including small css refactor and new classes
2013-05-08 22:42:42 -07:00
Mark Otto
f09b07dc2a
more navbar and header tweaks
2013-05-08 22:31:49 -07:00
Mark Otto
fa4d4e8d88
new docs page headers
2013-05-08 22:29:53 -07:00
Mark Otto
241d342363
red navbar for docs
2013-05-08 22:24:07 -07:00
Mark Otto
65289bb1ea
make restored top navbar collapsable
2013-05-08 22:17:26 -07:00
Mark Otto
feeaaa6feb
refactor homepage jumbotron masthead doodad
2013-05-08 22:13:56 -07:00
Mark Otto
07aed1abc3
move social buttons to separate include
2013-05-08 22:07:28 -07:00
Mark Otto
edb733ebc7
Super massive docs overhaul
...
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto
88dd9de9ba
Drop typeahead.js--instead try Twitter's typeahead plugin
2013-05-08 20:04:54 -07:00
Mark Otto
54561f1121
hide entire navbar in print views
2013-05-08 19:57:42 -07:00
Mark Otto
1cb880b4f1
Fixes #7816 : revert negative margin on .navbar-nav
2013-05-08 19:55:20 -07:00
Mark Otto
509f2244da
Merge pull request #7809 from twitter/bs3_adding_btn_default
...
BS3: Require .btn-default for all standard buttons
2013-05-08 11:47:43 -07:00
William Ghelfi
9013ff002a
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-08 14:25:37 +02:00
Mark Otto
c459c657f8
Update forms
...
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00
Mark Otto
c0e23ad27b
nuke the unused navbar that was leftover
2013-05-07 20:48:37 -07:00
Mark Otto
d7f84d1220
Require .btn-default for regular buttons
...
* Instead of , use for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto
79dac4b77a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-07 10:33:49 -07:00
Mark Otto
f06294d80f
Outdent nav links a bit more so they line up in navbar
2013-05-07 10:33:41 -07:00
Edgar Schnueriger
240305321f
fixed not working example code for modals
2013-05-06 09:48:05 +02:00
Mark Otto
716c869b89
correct right nav in navbar examples
2013-05-04 15:00:59 -07:00
Mark Otto
49da7d8020
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-04 13:11:31 -07:00
Mark Otto
dcf7cc084d
Fixes #7783 : nuke bottom margin on fixed-bottom-navbar
2013-05-04 13:11:20 -07:00
Mark Otto
c3b9ac4676
Merge pull request #7621 from jeremydenoun/patch-1
...
Fix flickering on progress bar width update
2013-05-03 17:32:54 -07:00
Mark Otto
7d41a38769
Fixes #7511 : add support for nested button groups so you can use dropdowns in your button groups
2013-05-03 16:16:26 -07:00
Mark Otto
ee0789ff8f
Fixes #7721 : change @navbar-text to @navbar-color, along with inverse options
2013-05-03 15:29:32 -07:00
Mark Otto
a6f7f96a93
recompile after last justified nav tweaks
2013-05-03 15:29:10 -07:00
Mark Otto
4357ed72e0
Update justified nav CSS for proper selectors
2013-05-03 15:18:27 -07:00
Mark Otto
747e108e0b
Merge pull request #7670 from DarDar/3.0.0-wip
...
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto
af4a33f8c0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-03 14:57:07 -07:00
Mark Otto
e1d947f53e
Scope .table-bordered styles to immediate children only
2013-05-03 14:56:57 -07:00
Mark Otto
9d9fd5e0d1
remove .fade from static modal example, but include in code snippet
2013-05-03 14:46:09 -07:00
Mark Otto
0959a78ff1
Merge pull request #7769 from holic/3.0.0-sticky-footer
...
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto
7cceaa6956
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
...
Conflicts:
docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto
14861e9cc3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-03 14:11:23 -07:00
Mark Otto
b5d68f59c2
Add cursor: pointer; to .checkbox and .radio and their inline counterparts
2013-05-03 11:56:00 -07:00
Mark Otto
b0bd5899c5
Merge pull request #7762 from sethlilly/3.0.0-wip
...
Corrected typo in carousel.html
2013-05-03 11:21:13 -07:00
Mark Otto
1587b8948f
run make on previous commits
2013-05-03 10:53:26 -07:00
Mark Otto
e1c67b149f
More navbar CSS and docs cleanup
...
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto
94792b9dae
Improve buttons in navbars
...
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto
bec8c90fd7
Cleanup .navbar-form styles
...
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Mark Otto
a4f2c9e156
add customizer link to docs homepage
2013-05-02 22:44:43 -07:00
Kevin Ingersoll
08fea3304a
Fix input border flicker in Chrome from @garoevans, closes #7689
2013-05-03 15:33:12 +12:00
Kevin Ingersoll
07117f97b6
Use padding instead of #push with box-sizing: border-box
2013-05-03 15:23:10 +12:00
Seth Lilly
a62e97091c
Corrected typo in carousel.html
...
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
DarDar
9cd3a92713
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-02 08:05:00 +02:00
Mark Otto
f8fd524def
add the fade class to the default modal docs
2013-04-30 19:55:02 -07:00
Mark Otto
47155e8aa3
outdent the rows for tablets and above
2013-04-30 19:35:52 -07:00
Mark Otto
0780faad45
make that left/right padding, not top/bottom on navbar
2013-04-30 19:20:41 -07:00
Mark Otto
69f5447afa
add back bottom margin to navbars
2013-04-30 19:12:48 -07:00
Mark Otto
e8b7318646
no need for zero padding on navbar top/bottom; better comment
2013-04-30 19:07:28 -07:00
Mark Otto
e67d3818ed
nuke line numbers
2013-04-30 11:32:11 -07:00
Mark Otto
26bc36107e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 22:46:10 -07:00
Mark Otto
e13d05317e
single colon pseudo element for ie8
2013-04-28 22:45:56 -07:00
Mark Otto
0cb1188a9c
Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
...
Cleanup breadcrumb divider last item
2013-04-28 20:14:26 -07:00
Robert Burns
62afdd0176
Update examples after grid changes
2013-04-28 22:22:33 -04:00
Robert Burns
447be1b326
Cleanup breadcrumb divider last item
...
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto
cd06c5baac
Merge pull request #7704 from twitter/bs3_moar_grid_changes
...
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto
5edfdc02f2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 14:27:58 -07:00
Mark Otto
bbee78b30b
derp on navbar toggle and docs positions
2013-04-28 14:27:48 -07:00
Mark Otto
227c4639e4
Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
...
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 14:26:10 -07:00
Robert Burns
3326e1b21e
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 10:09:57 -04:00
Robert Burns
ddc0e98716
Update examples after overhaul of navbar navs
2013-04-28 09:10:01 -04:00
Mark Otto
8b3a1702d4
Overhaul navbar navs
...
* Switch from to to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto
2ffa0e4409
Add maximum bounds variables for so our responsive utilities don't overlap
2013-04-27 11:55:45 -07:00
Kevin
9ce7f22e99
Adding media queries breakpoints variables
2013-04-27 18:47:47 +02:00
Mark Otto
efd3b0c171
Back to two grid classes, .col and .col-lg-*
2013-04-26 23:59:51 -07:00
Mark Otto
8ae9c6ab34
Fixes #7688 : move font-weight for glyphicons to before pseudo element
2013-04-26 23:14:06 -07:00
Mark Otto
aa146582d6
Redo the getting started section to mention BootstrapCDN
2013-04-26 20:51:48 -07:00
Mark Otto
57ba494409
running make
2013-04-26 10:44:44 -07:00
Stephen Edgar
8311ad513f
'docs' folder .editorconfig code guide updates
2013-04-24 14:38:51 +02:00
Artur Kwiatkowski
55bbb9ffd7
Nuked local .a() mixins and simplified the nesting
2013-04-22 15:34:23 +02:00
Artur Kwiatkowski
b7dcefea83
Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip
2013-04-22 15:21:55 +02:00
Mark Otto
e0d60b1325
Fixes #7617 : lowercase and dash gray color vars
2013-04-21 19:35:36 -07:00
Mark Otto
364f8330a1
Fixes #7648 : Thumbnail caption should use @text-color variable. Also adds other thumbnail vars
2013-04-21 18:29:06 -07:00
Mark Otto
30d6e0530e
Fixes #7577 : Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly
2013-04-21 14:50:44 -07:00
Mark Otto
dc4436dbc9
Only use .danger for alerts, no more .error
2013-04-20 15:36:11 -07:00
Mark Otto
0c9b161bb8
Fixes #7093 : more consistent scrollspy docs
2013-04-20 15:32:16 -07:00
Mark Otto
510c9a6ad8
First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic
2013-04-20 12:33:09 -07:00
Mark Otto
04d782efab
correct grid class in example code
2013-04-20 12:29:12 -07:00
Mark Otto
70f8d77012
correct grid class mention in docs
2013-04-20 12:28:36 -07:00
Mark Otto
a956a3258b
Alternate docs mention of breadcrumbs separator, as called out in #7601
2013-04-20 12:23:27 -07:00
Mark Otto
ba7d928c37
Merge pull request #7645 from burnsra/3.0.0-wip-docs
...
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto
afdab35aca
Fixes #7640 : only reset margin on last-child p within blockquotes
2013-04-20 12:09:08 -07:00
Robert Burns
ce719925af
Fix carousel examples within docs
2013-04-20 13:26:18 -04:00
Artur Kwiatkowski
39bb8146f8
more nested labels component
2013-04-19 21:31:55 +02:00
Mark Otto
61ea1ae909
Merge pull request #7598 from wangshishuo/3.0.0-wip
...
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto
5c9bd1a221
Merge pull request #7608 from Fowowski/3.0.0-wip
...
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Fabien
7b5fcc2c9a
Remove dupe css rule of table element
...
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Jeremy Denoun
d3e0d4a7ba
update docs
2013-04-18 17:05:50 +02:00
Artur Kwiatkowski
4bd6abaff2
applied @pagination-bg for .disabled state instead of hardcoded color in hex
2013-04-17 19:47:23 +02:00
wangshishuo
5892cea207
change nav's #tables-hover to #tables-hover-rows
2013-04-17 12:27:30 +08:00
Artur Kwiatkowski
dc97a1967b
more nested navs
2013-04-16 16:45:51 +02:00
Mark Otto
5b38a1a357
Merge branch 'bs3_homepage' into 3.0.0-wip
2013-04-15 00:16:40 -07:00
Mark Otto
5471ce8ea3
Fixes #5256 : Use > selector for better nesting of tables
2013-04-14 20:33:54 -07:00
Mark Otto
ab7070bb49
change var from @table-border to @table-border-color
2013-04-14 19:45:32 -07:00
Mark Otto
02eba5e5fc
center
2013-04-14 16:31:52 -07:00
Mark Otto
7dca242b5e
nuke all the assets
2013-04-14 15:33:48 -07:00
Mark Otto
8d9106f2c5
nuke hidden homepage content
2013-04-14 15:32:52 -07:00
Mark Otto
0b3e9ced54
Merge branch '3.0.0-wip' into bs3_homepage
2013-04-14 13:45:10 -07:00
Mark Otto
526534f337
more copy edits to sidenotes
2013-04-14 13:01:00 -07:00
Mark Otto
ccb6ac570f
lighter .highlight in sidenotes as well
2013-04-14 13:00:53 -07:00
Mark Otto
0a84a7c43d
shorter copy
2013-04-14 12:56:21 -07:00
Mark Otto
32761b3303
use spaces for indenting, not tabs /cc @juthilo
2013-04-14 12:54:56 -07:00
Mark Otto
f78945ccc9
More contrast with code snippets in sidenotes
2013-04-14 12:54:02 -07:00
Mark Otto
5f88887c7e
redo all the things
2013-04-14 12:49:35 -07:00
Julian Thilo
2b228bae60
More work on the sidenotes
...
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto
f226463b05
Restore on links in dropdowns as they are randomly breaking onto new lines
2013-04-13 23:54:51 -07:00
Mark Otto
86bb3b8126
IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1 )
2013-04-13 23:17:39 -07:00
Mark Otto
eefddb1eab
more indenting
2013-04-13 22:49:21 -07:00
Mark Otto
20259e2350
fixes #7191 and cleans up indenting some
2013-04-13 22:48:44 -07:00
Mark Otto
fc8b9fb07d
swap all bold p tags in sidenotes for h4s
2013-04-13 22:10:34 -07:00
Mark Otto
382a86f46e
Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1
2013-04-13 21:50:17 -07:00
Julian Thilo
d7bc89b433
Sidenotes instead of alerts
...
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng
bec5679264
update docs bootstrap.css
2013-04-13 17:13:14 -03:00
Mark Otto
ae98f1803f
add modal variables and tweak padding for min-height on modal title
2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28
Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip
2013-04-12 20:45:10 -07:00
Mark Otto
b3bb89520d
add comma; more accurate code snippet
2013-04-11 20:16:20 -07:00
Mark Otto
5b7596a5b3
Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip
2013-04-11 20:12:53 -07:00
Mark Otto
7acadc09db
Merge pull request #7546 from CoffeeAndCode/3.0.0-wip
...
fixed typo in typography documentation
2013-04-11 19:54:17 -07:00
Jonathan Knapp
0d70b3c54e
fixed typo in typography documentation
2013-04-11 16:02:29 -03:00
Stephen Edgar
3dc8be74fe
Fix docs.html Table Row Danger CSS Class
2013-04-11 20:24:13 +10:00
Julian Thilo
78d64e97e9
Dusting the docs
...
* Fix some typos, grammar, sentence structure
* Fix left-over error tr class
* Remove uneditable inputs section
* Make compatibility sections stand out as sidenotes
* Make modal example scrollable on big screens, too
* Make some examples more self-explanatory
2013-04-10 19:18:04 +02:00
Julian Thilo
ece78ff086
cololol
...
Correct all span, push, pull, offset classes to col- schema
Fix a typo
2013-04-10 00:04:44 +02:00
Mark Otto
24f8d9e137
don't use table for label variatons
2013-04-09 10:43:37 -07:00
Mark Otto
1a546278b9
make back to top and big headings only for tablets and up
2013-04-09 10:20:50 -07:00
Mark Otto
dd533aaaf0
better buttons on mobile
2013-04-09 10:16:37 -07:00
Mark Otto
92977fb13e
fixes #7503 : don't do dat
2013-04-07 22:58:16 -07:00
Jamie Knight
c78c66527d
Update docs.html
...
Added heads up regarding lone icons providing accessibility issues for screen readers.
2013-04-07 16:25:00 +02:00
Phil Freo
06a4bb38c0
Fix typo in docs
2013-04-06 21:02:24 -07:00
Garvin
05710e10f7
Added min-height to modal-header for modals with no header text
2013-04-06 21:48:53 -04:00
Andrew Scofied
c1ab200985
updated docs, changed out span* for col-span-*
2013-04-03 09:48:39 -07:00
Mark Otto
eadfa59d92
Add small grid for phones and tablets
2013-04-02 19:40:43 -07:00
Mark Otto
610eb8fb78
sidenote edit under customization section
2013-04-02 18:02:53 -07:00
Mark Otto
c570ae49ef
fix that sidenav
2013-04-02 16:22:42 -07:00
Mark Otto
0ac711059b
refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first
2013-04-02 16:17:04 -07:00
Mark Otto
0f51a750a8
Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix
2013-04-02 14:49:42 -07:00
Fabien
e56461fbd7
Improve responsiveness for tablet and below of navbar in carousel example
...
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien
8f99692f56
remove unused img from previous commit
2013-04-02 13:31:15 +02:00
Fabien
e0bce6af12
Replace png img by holder.js in carousel example
2013-04-02 13:30:13 +02:00
Fabien
aa51a36686
Fix corss link for sticky footer
2013-04-02 13:26:35 +02:00
Fabien
9ecc43d21a
Fix link to navbar doc
2013-04-02 13:22:31 +02:00
Robert Burns
3233155bb4
Fix responsive view for inverted navbar example
2013-04-01 22:02:35 -04:00
Mark Otto
7e31bea114
run make
2013-04-01 13:25:51 -07:00
Mark Otto
12f043f1bb
Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel
2013-04-01 13:17:31 -07:00
Mark Otto
292734d7f3
Docs examples update
...
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto
eac987c0d2
only negative indent nested grid rows; add new grid example
2013-04-01 12:55:48 -07:00
Mark Otto
a0726e605f
add type attr
2013-04-01 12:10:53 -07:00
Mark Otto
e6d6fcffb0
button for navbar toggle
2013-04-01 12:09:49 -07:00
Mark Otto
93db7c2c74
more link fixing
2013-04-01 11:14:11 -07:00
Mark Otto
c231dba7ee
updated links on homepage
2013-04-01 11:10:56 -07:00
Robert Burns
89bbeec898
Additional cleanup to responsive navbar
2013-04-01 12:58:40 -04:00
Robert Burns
1816483baa
Add carousel indicators to example
2013-04-01 09:29:43 -04:00
Robert Burns
e183dd46a2
Update carousel-caption btn styles
2013-04-01 09:27:49 -04:00
Mark Otto
19d5e61668
clearer separation with section headers; simpler customizing copy
2013-04-01 00:34:58 -07:00
Mark Otto
7bee10a5ef
oops, restore customizer
2013-04-01 00:11:47 -07:00
Mark Otto
9df6dc81b5
bring in customizing bootstrap section from old gist
2013-04-01 00:02:51 -07:00
Mark Otto
d8b3e48e14
add proper markup to list group in panels section
2013-03-31 22:58:01 -07:00
Mark Otto
2f8deea95a
add .panel-primary
2013-03-31 22:22:52 -07:00
Mark Otto
0fbfa167e1
fix text class in docs
2013-03-31 19:55:05 -07:00
Mark Otto
3365d4a06a
Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes
2013-03-31 19:28:27 -07:00
Mark Otto
c69310153e
Fixes #7438 : remove max-height from justified nav tabs with some CSS wankery
2013-03-31 19:26:40 -07:00
Robert Burns
d299ff4fce
Fix image paths and carousel controls for carousel example
2013-03-31 21:47:02 -04:00
Mark Otto
4c49458336
remove text-rendering optimizeLegibility from headings
2013-03-31 18:40:07 -07:00
Mark Otto
db284a97d6
more consistent navbar vars
2013-03-31 17:56:31 -07:00
Mark Otto
d6f37f3c56
@link-color-hover to @link-hover-color
2013-03-31 17:27:22 -07:00
Mark Otto
d5fa1d80bb
use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg
2013-03-31 17:22:12 -07:00
Mark Otto
6b23a66c29
-background to -bg on tooltip and popover vars
2013-03-31 17:19:12 -07:00
Mark Otto
c5042e050e
fix nav divider
2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d
remove lingering rem
2013-03-31 13:20:54 -07:00
Mark Otto
674768b177
restore px unit on @font-size-base
2013-03-31 12:00:04 -07:00
Mark Otto
a2145df7c4
run make after that breadcrumbs tweak
2013-03-31 11:58:25 -07:00
Mark Otto
42b6934930
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-31 11:58:08 -07:00
Mark Otto
b018513aa5
lingering nav-list use
2013-03-31 11:58:00 -07:00
Mark Otto
e62f2901d0
Merge pull request #7431 from burnsra/3.0.0-wip-fixes
...
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00
Mark Otto
fc16e37aaa
Remove the handful of rem font-sizes
2013-03-31 11:26:13 -07:00
Mark Otto
b96ab36d38
add some container padding for examples
2013-03-31 11:24:31 -07:00
Robert Burns
74e06cb279
Add styles for tooltip and popover examples
2013-03-31 09:59:02 -04:00
Mark Otto
6c1ed5638b
actually readd the padding and set it to smaller amount for narrow viewports
2013-03-30 22:54:31 -07:00
Mark Otto
70ba9a880e
remove padding form sign in form example
2013-03-30 22:53:35 -07:00
Mark Otto
40f671a531
add basic back to top link via affix
2013-03-30 18:41:26 -07:00
Mark Otto
e560c41ed1
simpler nav links
2013-03-30 17:06:59 -07:00
Mark Otto
6edd5f291a
not quite #fff on .list-group-item-text
2013-03-30 17:00:11 -07:00
Mark Otto
1683669eaa
Remove .nav-list given new .list-group
2013-03-30 16:56:49 -07:00
Mark Otto
2a9604fdd2
add list group component
2013-03-30 16:07:50 -07:00
Mark Otto
731903a175
panels subnav and links
2013-03-30 14:16:30 -07:00
Mark Otto
9fff2d3fb6
Change error to danger for all classes; add panels component
2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7
fuck everything about .clear_float() -- restore .clearfix() as mixin
2013-03-30 13:23:18 -07:00
Mark Otto
62df38586a
navbar links in sidenav
2013-03-30 13:16:34 -07:00
Mark Otto
171c7feae2
navs nav links
2013-03-30 13:14:04 -07:00
Mark Otto
e9dd1826be
fix brok btn-dropdowns links
2013-03-30 13:12:03 -07:00
Mark Otto
9336a827c6
fix submenu docs height given border-box
2013-03-30 13:11:15 -07:00
Mark Otto
bd69269426
more component nav updates
2013-03-30 13:09:56 -07:00
Mark Otto
906ff98601
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-30 12:12:28 -07:00
Robert Burns
501dfbe8ae
Fix path to examples to account for new layout
2013-03-30 10:10:51 -04:00
Mark Otto
a4901e2da8
mention responsive image and google maps
2013-03-30 01:55:39 -07:00
Mark Otto
1dcadede36
fix broke grid classes
2013-03-30 01:09:30 -07:00
Mark Otto
af470f4c7b
more content and nav twerks
2013-03-30 01:06:50 -07:00
Mark Otto
361c776e2b
whitespace and taglines for main sections
2013-03-30 00:27:50 -07:00
Mark Otto
49ebf542a2
reorder docs
2013-03-30 00:19:05 -07:00
Mark Otto
601013ca04
drop .muted for .text-muted
2013-03-30 00:11:38 -07:00
Mark Otto
3359b8d5f6
nav change to go with that
2013-03-29 23:37:55 -07:00
Mark Otto
21d6a5933a
fix buttons links
2013-03-29 23:37:43 -07:00
Mark Otto
8814125259
Add subnav support to CSS section
2013-03-29 23:33:08 -07:00
Mark Otto
23d7215dbe
Modify scrollspy to add .active to all parent li items /cc @fat
2013-03-29 23:32:47 -07:00
Mark Otto
4dfc4e1022
clarify small docs
2013-03-29 22:40:42 -07:00
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
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
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
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
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
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
ed7fe0e5ba
unfuck misaligned main container
2013-03-14 21:45:31 -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
Addy
0c65a0e1ee
Added bower install to download/install options in getting started guide
2013-03-14 10:58:16 +00:00
Mark Otto
d344ca4475
Merge pull request #7208 from benilovj/3.0.0-wip
...
fix grammatical mistakes in carousel docs
2013-03-10 23:32:13 -07:00
Mark Otto
d219b8b964
Set border-box globally instead
2013-03-10 13:24:07 -05:00
Ufuk Avcu
33913e4586
Fix Typo sucess to success
...
Mini typo fix in the docs...
2013-03-09 21:04:09 +01:00
Jake Benilov
d5c3307ffa
fix grammatical mistakes in carousel docs
2013-03-08 00:13:56 +00:00
Mark Otto
6e8ee02421
tweak icons alignment
2013-03-03 23:41:16 -08:00
Mark Otto
bfdc6f8607
Remove support for .uneditable-input
2013-03-03 23:31:09 -08:00
Mark Otto
6239094ca6
Nuke the gallery, punt it to the new http://expo.getbootstrap.com
2013-03-03 19:40:47 -08:00
Mark Otto
b83fc82aed
fix row change at breakpoint
2013-03-03 18:19:31 -08:00
Mark Otto
e0647e8273
nuke commented out unused var
2013-03-01 12:37:36 -08:00
Mark Otto
a70c50d1f7
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json
2013-03-01 12:37:21 -08:00
Mark Otto
77e8e2aee9
Fix alignment of .navbar-brand
2013-03-01 00:50:08 -08:00
Mark Otto
492c249537
improve navbar toggle and hide code snippets on mobile devices for now
2013-03-01 00:18:10 -08:00
Mark Otto
2e3ba4afe6
redo the buttons examples
2013-03-01 00:04:41 -08:00
Mark Otto
ba633949dc
customize navbar in docs
2013-02-28 23:36:54 -08:00
Mark Otto
38ba057dee
Fixes #6998 : disabled background color properly on pagination
2013-02-28 23:23:05 -08:00
Mark Otto
5a30e52aac
Fixes #6995 : Add disabled navbar nav link support
2013-02-28 23:20:58 -08:00
Mark Otto
4418c82888
Fixes #6954 : properly reset grid classes within tables
2013-02-28 22:47:32 -08:00
Mark Otto
bfc4aaf6e8
Holy fucking shit fix that input group with buttons rounded corner noise
2013-02-28 21:19:02 -08:00
fat
839b0c893f
shiiiit
2013-02-28 21:15:33 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
fat
cec434a4c3
rebuild
2013-02-28 20:48:48 -08:00
fat
2f27d9851c
whitespace
2013-02-28 20:48:02 -08:00
fat
01e0f8c653
only pass unique options through to child nodes in tooltips
2013-02-28 20:39:07 -08:00
fat
cf998040ec
rebuild
2013-02-28 19:49:08 -08:00
Mark Otto
b19eb88b5a
Fixes #6935 : Use standard decimal points for .opacity() mixin
2013-02-28 19:46:49 -08:00
Mark Otto
0dea8b0c74
Fixes #6897 : Print styles get own .less file
2013-02-28 19:42:51 -08:00
fat
40b7a909a6
le sigh
2013-02-28 19:37:30 -08:00
Mark Otto
9d763e805b
Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting
2013-02-28 19:34:02 -08:00
Mark Otto
81a0306cce
add new example thumbnails; update links to point to new windows
2013-02-26 00:56:06 -08:00
Mark Otto
ea01e8bbc4
nuke remaining less/tests/ files and move grid over to examples dir
2013-02-26 00:49:21 -08:00
Mark Otto
e2e5580c0e
nuke glyphicons changes in buttons for now because it's whack
2013-02-26 00:44:15 -08:00
Mark Otto
5b3b11c02a
moved examples added
2013-02-26 00:42:24 -08:00
Mark Otto
91660a0489
Move navbar examples to /examples directory
2013-02-26 00:37:59 -08:00
Mark Otto
e1bb94c383
try out new table-based type example
2013-02-24 01:29:19 -08:00
Tom Pietschker
1780873173
forgot navbar-fixed-bottom in the commit
2013-02-19 14:54:56 -05:00
Tom Pietschker
ba7b1e8234
tweak the position of the fixed to top/bottom navbars to remove double border
2013-02-19 14:50:44 -05:00
Tom Pietschker
ec9b01e691
remove the search-query class and increase the width
2013-02-19 14:40:05 -05:00
Tom Pietschker
62b54605a7
replace navbar-search with navbar-form
2013-02-19 14:35:48 -05:00
Tom Pietschker
3b7e5214e3
remove navbar-inner
2013-02-19 14:32:28 -05:00
Tom Pietschker
722ba5f227
added missing slash in the src for Gather Content
2013-02-18 21:03:52 -05:00
Tom Pietschker
4c00f290f2
fix incorrect section id for labels
2013-02-18 20:57:54 -05:00
Mark Otto
023568fe3d
Navbar realignment:
...
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto
f51862f158
remove unused include
2013-02-18 01:27:08 -08:00
Mark Otto
acdffe696c
Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems
2013-02-17 22:20:49 -08:00
Mark Otto
f6ec2c5dac
Drop the recently added .counter class for .badge
2013-02-17 21:06:20 -08:00
Mark Otto
53091be6d2
remove unnecessary select border reset
2013-02-17 20:26:21 -08:00
Mark Otto
e2d829e511
fix inaccurate text classes code
2013-02-17 20:23:31 -08:00
Mark Otto
82d059de87
fix broken marketing section with updated class
2013-02-17 20:18:29 -08:00
Mark Otto
159167041f
forgot about those quotes
2013-02-17 19:15:09 -08:00
Mark Otto
56e60d0468
fix the docs include logic
2013-02-17 19:12:30 -08:00
Mark Otto
9b3262cb15
more narrow jumbotron example fixes in the mobile first arena
2013-02-17 19:04:38 -08:00
Mark Otto
c6f341bd17
Refactor some common classes from docs css and examples, then prevent examples from using docs.css
2013-02-17 18:58:40 -08:00
Mark Otto
dba9eea98d
revamp narrow jumbotron to avoid conflicts with docs .masthead
2013-02-17 18:48:00 -08:00
Mark Otto
36aec5e484
decrease top/bottom padding a bit in mobile fixed navbars
2013-02-17 18:47:44 -08:00
Mark Otto
ee9a0f4b94
css to go with it
2013-02-17 18:46:49 -08:00
Mark Otto
13ff3aced0
Add class to body for special styles to avoid conflict with examples
2013-02-17 18:46:30 -08:00
Mark Otto
c0ea077fb4
Revert the statis navbar in mobile views--they're back to being fixed all the time
2013-02-17 18:33:55 -08:00
Mark Otto
4cbb663d9d
Update some links and rename #gridsystem to #grid-system
2013-02-17 18:10:29 -08:00
Mark Otto
6ccf588a8e
Restore submenu support
2013-02-17 13:35:14 -08:00
Mark Otto
5fecb4a9f4
add visibility note to docs about captions
2013-02-16 02:49:12 -08:00
Mark Otto
6dce3f63d8
Scrach that: carousel caption is always left aligned, but still hidden for mobile views
2013-02-16 02:47:48 -08:00
Mark Otto
6d048471c4
Re-add carousel captions as optional
...
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
e74fb39080
Nuke the fluid example since it's no longer applicable
2013-02-16 01:43:23 -08:00
Mark Otto
401d4fabd1
Nuke the old_docs.css file
2013-02-16 01:39:09 -08:00
Mark Otto
b6ec72a3a2
Nuke @mdo's photos from the repo since we're using holder.js for carousel demo
2013-02-16 01:38:32 -08:00
Mark Otto
ce21926704
All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star
2013-02-16 01:26:43 -08:00
Mark Otto
d8e2668c1d
Overhaul carousel a bit more:
...
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto
b688d8dcd4
More accurate padding for fixed navbars at >768px
2013-02-16 00:20:20 -08:00
Mark Otto
f38e50cdf1
Don't affix the fixed navbars in mobile views
2013-02-16 00:19:17 -08:00
Mark Otto
d1aae5f82b
twerk gallery examples to stay at 400px or less for proper retinafying
2013-02-15 17:27:05 -08:00
Mark Otto
3d041096ba
Update gallery examples on homepage; make all gallery entries open in new tabs
2013-02-15 17:21:41 -08:00
Mark Otto
866c8d60e9
restore jekyll-based css.html to docs
2013-02-15 12:22:26 -08:00
Can Burak Cilingir
a77cd6cb5d
Fix typo on JavaScript documentation
2013-02-15 18:47:34 +08:00
Mark Otto
e44f8cc560
Fixes #6941 : add alt attribute to images
2013-02-14 23:55:04 -08:00
Mark Otto
bcb6dd5ee6
fix spelling as pointed out by @jodytate that got nuked in the merge
2013-02-14 23:51:35 -08:00
Mark Otto
ae525258af
Merge branch 'bs3_jekyll' into 3.0.0-wip
...
Conflicts:
docs/css.html
docs/templates/pages/css.mustache
2013-02-14 23:42:47 -08:00
Mark Otto
aa5f090371
Make example pages use Jekyll; add sticky footer navbar image to examples
2013-02-14 23:38:00 -08:00
Mark Otto
41ef649aa3
no need for scrollspy in example template
2013-02-14 23:07:36 -08:00
Mark Otto
979ca4ea7a
Convert JS page to pygments; nuke prettify assets
2013-02-14 22:33:26 -08:00
Mark Otto
37becbab8c
convert components code examples to pygments
2013-02-14 21:42:33 -08:00
Mark Otto
0ff7fb0d05
pygmentize the rest of the css page
2013-02-14 16:43:50 -08:00
Mark Otto
6b14de292a
pygmentize grid section; update bs-docs-example corners
2013-02-14 00:43:43 -08:00
Mark Otto
7e6211e244
twerk dat manni pygment style
2013-02-14 00:39:32 -08:00
Mark Otto
5f0ecb740a
Start pygmentizing css.html; add new theme for pygments
2013-02-14 00:23:23 -08:00
Mark Otto
d709dba284
Start using some includes; test out some pygments highlighting
2013-02-13 23:37:08 -08:00
Mark Otto
d3c458c7d8
make same css docs fix from upstream
2013-02-13 12:32:29 -08:00
Mark Otto
96953c2072
update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg
2013-02-13 12:30:56 -08:00
Mark Otto
b57c20a057
Restore gallery page, add active nav class jankitude, auto regenerate docs on file save
2013-02-13 11:48:22 -08:00
Mark Otto
b1e7010bfc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-02-13 11:28:00 -08:00
Mark Otto
e45f12ad42
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
8b9733b288
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
1f5f23f869
nuke dat extend docs page
2013-02-11 21:38:44 -08:00
Gerald Monaco
876a412c90
Fix the Star glyphicon in the CSS docs
2013-02-08 19:52:50 -05:00
Mark Otto
63c1377ee7
Fixes #6852 : add cursor pointer to carousel indicators
2013-02-08 09:56:04 -08:00
Mark Otto
1b2b049ef8
Fixes #6841 : Add new Firefox placeholder, comments
2013-02-08 08:32:29 -08:00
Mark Otto
3eed90c187
Fixes #6837 : Enable text alignment utility classes on tables
...
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
2013-02-08 08:24:10 -08:00
Mark Otto
ab1dc25ffc
clean up responsive docs and global css styles
2013-02-08 00:13:44 -08:00
Mark Otto
2aa1a4dc70
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat
501aabf572
remove prevent default on focus
2013-02-07 21:42:34 -08:00
fat
366e1e0a6d
only fire hidden once backdrop has been removed
2013-02-07 20:13:40 -08:00
fat
1bf070b4ce
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat
d8a7a380bc
if no callback, don't try to call callback ya goof
2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0
fix js from @fat feedback for modal
2013-02-07 19:38:46 -08:00
Mark Otto
9b1520ee60
update example code
2013-02-07 19:34:06 -08:00
Mark Otto
cfa1e39510
nuke that whitespace
2013-02-07 19:32:30 -08:00
Mark Otto
b04acb37e8
finish modal tweaks
2013-02-07 19:31:12 -08:00
Mark Otto
a623b8c10f
update docs modals
2013-02-07 19:21:56 -08:00
Mark Otto
cdb2147b13
add new modal to docs example
2013-02-07 19:00:48 -08:00
Mark Otto
e3f3542d0b
Fixes #6823 : add some docs notes about tooltips in input groups
2013-02-06 17:25:58 -08:00
Mark Otto
8ca70bd83a
Overhaul modal to make it responsive and not super lame
2013-02-06 02:07:40 -08:00
Mark Otto
0b4668368b
Merge branch '2.3.0-wip' into 3.0.0-wip
2013-02-05 22:47:00 -08:00
Mark Otto
2fa77bf197
Update link to changelog
2013-02-05 22:46:45 -08:00
Mark Otto
421f9f67c4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540
clean up styles
2013-02-05 22:29:59 -08:00
Mark Otto
6d21d86007
port docs fix from 2.3.0-wip to new css page
2013-02-05 22:29:01 -08:00
Mark Otto
accfdaafdb
Fixes #6808 : mention IE lame-itude in docs for invalid inputs
2013-02-05 22:28:18 -08:00
Mark Otto
0fe9148b91
Fixes #6190 : Add print utility classes
2013-02-05 22:17:28 -08:00
Mark Otto
1629df8008
screwed up a merge and an old version number crept in
2013-02-05 21:20:29 -08:00
fat
a4b31d39a2
don't hide if already hidden ya n00b
2013-02-05 21:08:56 -08:00
Mark Otto
4270496e8a
add codecademy to gallery
2013-02-05 21:07:30 -08:00
Mark Otto
a920697382
Dat compression
2013-02-05 21:05:24 -08:00
Mark Otto
fb1db88256
Update homepage examples, add hella new sites to gallery
2013-02-05 21:04:46 -08:00
Mark Otto
37a6879ca5
White navbar brand text for inverted navbar
2013-02-05 20:39:09 -08:00
fat
a866a51a2e
clear interval in cycle + rebuild
2013-02-05 20:34:39 -08:00
fat
c25e8182ba
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-05 20:01:25 -08:00
fat
45656fc7fc
update jquery to 1.9
2013-02-05 20:00:50 -08:00
Mark Otto
28e1702052
nuke rogue conflict comment and remake
2013-02-05 19:59:02 -08:00
Mark Otto
43da258bd9
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c
derp, fix broke css and recompile
2013-02-05 19:43:49 -08:00
Mark Otto
15c7e73abd
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
e4a74607b0
simplify media docs
2013-02-05 01:12:39 -08:00
Mark Otto
b65293dec0
reorganize progress bars docs
2013-02-05 01:11:41 -08:00
Mark Otto
3949623eee
simpler alerts docs
2013-02-05 01:07:43 -08:00
Mark Otto
238566b445
mo betta thumbnails docs
2013-02-05 01:01:23 -08:00
Mark Otto
2576e6d1d6
reorder counters docs
2013-02-05 00:59:22 -08:00
Mark Otto
cf78f4b010
pagination docs cleanup
2013-02-05 00:54:48 -08:00
Mark Otto
1f673b77bb
simpler breadcrumbs docs
2013-02-05 00:51:19 -08:00
Mark Otto
74c8a5611d
Increase margins and line-height on h3; overhaul button dropdown docs
2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections
2013-02-05 00:30:03 -08:00
Mark Otto
5c1cc722e7
Forgot to remove base-css.mustache
2013-02-05 00:22:20 -08:00
Mark Otto
2c92b5f6a4
Remove base-css.html after recent merges
2013-02-04 11:12:32 -08:00
Mark Otto
0a3e3a50fe
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto
1f6a988190
Fixes #6794 : incorrect docs mention of th element
2013-02-04 11:11:25 -08:00
Mark Otto
db8a78fae6
Fixes #6794 : incorrect docs mention of th element
2013-02-04 11:11:04 -08:00
Mark Otto
2f7087eae9
Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip
2013-02-02 19:08:59 -08:00
Mark Otto
5638b2559a
Verion number in JS makefile
2013-02-02 18:50:13 -08:00
Mark Otto
3d74c670d3
Rearrange forms content
2013-02-02 18:30:52 -08:00
Mark Otto
6993fadf7e
Simplify input and input group sizing
...
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c
Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip
2013-02-02 17:01:29 -08:00
Mark Otto
c64aa26d06
Add @btn-color variable and use in buttons and carets; fixes dropup caret as well
2013-02-02 13:03:18 -08:00
Mark Otto
dbe8aed76e
Merge pull request #6763 from rjregenold/2.3.0-wip
...
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Mark Otto
94e256c016
Refactor navbar dividers
...
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
dad9889aeb
Fixes #6657 : Upgrade Normalize to 2.1.0
2013-02-01 21:49:54 -08:00
Mark Otto
d53af49afe
Refactor colors and progress bars
...
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Nikhil Dabas
b7b2e4f8a1
Fixing inline lists for IE7
2013-02-02 02:04:30 +05:30
Mark Otto
2553d74b54
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto
7d655c3549
Use button element instead of a for responsive navbar buttons
2013-02-01 10:33:36 -08:00
Mark Otto
725cf7f6ec
start to refactor justified nav example
2013-02-01 10:32:08 -08:00
Mark Otto
7528b6e10a
button element instead of href-less a tag for navbar button
2013-02-01 10:30:48 -08:00
Gil Barbara
24f0505bde
Update input-group-addon for input sizes
2013-02-01 01:39:26 -02:00
Mark Otto
755f1776da
Refactor jumbotron-narrow.html example
...
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto
19b5ebcf24
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes
2013-01-31 18:25:44 -08:00
Mark Otto
dfdf343825
Refactor jumbotron example:
...
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08:00
Mark Otto
52aa67fa1c
only round jumbotron corners at 768px+
2013-01-31 18:11:45 -08:00
Mark Otto
b02a0fe768
Button up navbar form which was adding 2px padding to .navbar
2013-01-31 18:09:49 -08:00
Mark Otto
061d2849a6
Update starter template to include left/right padding on inner container; also include body padding
2013-01-31 18:06:56 -08:00
Mark Otto
5e5670a1b4
Remove gallery link from navbar; add to homepage examples section instead
2013-01-31 18:00:11 -08:00
Mark Otto
83e5c01856
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
2013-01-31 17:57:31 -08:00
RJ Regenold
2f44d8d2da
removes anchor tag definition.
2013-01-31 12:49:53 -06:00
RJ Regenold
6014e63054
lets see how much i can mess this pull request up. :|
2013-01-31 11:10:41 -06:00
RJ Regenold
e38d08d4c0
fixes jankiness with anchor tags in carousel.
2013-01-31 10:03:53 -06:00
Mark Otto
baadc33c88
make on prev commit
2013-01-30 18:22:20 -08:00
Mark Otto
3cc65cb86c
clear up show-grid stuff
2013-01-30 18:16:14 -08:00
Mark Otto
dd4ce35ddc
add meta tag to second example
2013-01-30 17:46:18 -08:00
Mark Otto
a5fc3e0667
make on prev commit
2013-01-30 17:45:02 -08:00
Mark Otto
3b6b8e9f41
Merge branch 'greg-raven-patch-2' into 2.3.0-wip
2013-01-30 17:44:45 -08:00
Mark Otto
f20c3368e4
Update pagination example HTML to match examples
2013-01-30 17:42:03 -08:00
Fred Sauer
d6e3b6b5a4
Fix form-actions documentation
2013-01-28 10:01:59 -08:00
Greg Raven
22f1cc44ca
Update docs/templates/pages/getting-started.mustache
...
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
2013-01-22 06:46:53 -08:00
Mark Otto
d30f47efb2
Tighten up badges docs; less bottom margin on h3
2013-01-19 18:53:41 -08:00
Mark Otto
c21c3f101b
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
2013-01-19 17:06:40 -08:00
Vickash Mahabir
c77a459b35
IE8 compatible fix for disabled button hover
2013-01-19 19:32:55 -04:00
Mark Otto
64bc5dc91f
remove .navbar-inner from sticky footer navbar
2013-01-19 09:40:26 -08:00
Mark Otto
1a88367b72
mo betta links between sticky footer examples
2013-01-19 09:39:56 -08:00
Mark Otto
d7d5069be1
Add sticky footer navbar example to list; fix docs padding
2013-01-19 09:38:49 -08:00
Mark Otto
7c9295d44b
update sticky footer templates
2013-01-19 09:34:08 -08:00
Vickash Mahabir
67ec13a44c
Counters example doesn't need to be a table
2013-01-18 18:03:43 -04:00
Vickash Mahabir
964cb77383
Make the counter example more meaningful
2013-01-18 17:50:58 -04:00
Vickash Mahabir
665de0455c
Change .badge to .counter, make appearance more OSX-ish, and remove colors
2013-01-18 17:35:23 -04:00
Vickash Mahabir
b741c731a2
Fix logic error where a disabled button would change color in an enabled fieldset
2013-01-18 12:12:30 -04:00
Vickash Mahabir
6e96cd1a7c
Forgot to add built docs css file
2013-01-18 11:58:12 -04:00
Mark Otto
411e6b18cb
unified and simplified sign in form example
2013-01-18 01:52:16 -08:00
Mark Otto
82bfa965a7
cleanup more examples
2013-01-18 01:37:31 -08:00
Mark Otto
d4cb7077fe
mo betta justified nav
2013-01-18 01:33:55 -08:00
Mark Otto
604f76dcf8
overhaul justified nav example
2013-01-17 21:05:23 -08:00
Mark Otto
8111e307b9
Remove docs and prettify css from examples thus far; update narrow page
2013-01-17 20:39:38 -08:00
Mark Otto
caed3a9dbb
fix up jumbotron example
2013-01-17 20:35:59 -08:00
Mark Otto
6466fe00a1
Rename hero.html to jumbotron.html
2013-01-17 20:32:07 -08:00
Mark Otto
5075f4973b
Semibold dat .navbar .brand
2013-01-17 20:30:40 -08:00
Mark Otto
ac3c907799
finish updating starter template
2013-01-17 20:30:19 -08:00
Mark Otto
1b128b3431
comment tweaks and updating starter template
2013-01-17 20:28:05 -08:00
Mark Otto
fd89531f6a
Update commenting and structure of layout.mustache
2013-01-17 20:26:17 -08:00
Mark Otto
d9b35c2602
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
f068cdeb63
Combine .thumbnail and .img-thumbnail into simpler selectors
2013-01-17 20:18:03 -08:00
Mark Otto
ca74b9882b
Change .img-polaroid to .img-thumbnail
...
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
2013-01-17 20:16:04 -08:00
Mark Otto
89b6477bdc
Remove .info from table rows
2013-01-17 20:13:11 -08:00
Mark Otto
5663833bfc
Restore .btn-info
2013-01-17 19:51:22 -08:00
Mark Otto
b30b8c2c12
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.
2013-01-17 17:02:35 -08:00
Mark Otto
41ecc2a171
derp, numbers
2013-01-17 16:35:30 -08:00
Mark Otto
2523b91dad
dat min
2013-01-17 16:11:01 -08:00
Mark Otto
8765df47cd
remove global text-shadow from alerts components because it was fucking up buttons in a real way
2013-01-17 15:43:23 -08:00
Mark Otto
e304798194
scrollspy example twerks
2013-01-17 15:42:52 -08:00
Mark Otto
3a1e1167d6
restore scrollspy example
2013-01-17 15:40:43 -08:00
Mark Otto
97975c5fcf
Readd focused example of inputs to docs; clean up alerts section
2013-01-17 15:36:36 -08:00
Mark Otto
32bcbe5671
cleanup example templates
2013-01-17 15:00:49 -08:00
Mark Otto
f6226c9b91
Update Getting Started page to include mention of Respond
2013-01-17 14:49:52 -08:00
Mark Otto
237f5e15d3
Nuke shadows around thumbnails
2013-01-17 14:25:40 -08:00
Mark Otto
bb94de7873
Larger homepage headings
2013-01-17 14:22:41 -08:00
Mark Otto
5c76518f7d
Add respond.js to main docs pages, but only for IE8 and down
2013-01-17 14:00:03 -08:00
Mark Otto
7c23d889bb
Change subheading of alerts page
2013-01-17 12:13:37 -08:00
Mark Otto
26f9f4e3a5
Remove navbar search
2013-01-17 12:02:17 -08:00
Mark Otto
32ebe2efd1
mo betta navbar dropdowns
2013-01-17 11:55:37 -08:00
Mark Otto
597a248d4a
Rearrange navbar.less and improve vertical divider support
2013-01-17 11:34:46 -08:00
Mark Otto
360f0c5359
Fix floats in navbar
2013-01-17 11:20:19 -08:00
Mark Otto
01b32f472d
Simplify and bring back the grid mixin for generating spans and offsets
2013-01-17 10:49:10 -08:00
Mark Otto
7e46b6f636
Update nav and add bounds for tablet container
2013-01-17 00:58:34 -08:00
Mark Otto
267d3e7ed7
streamline css docs
2013-01-17 00:50:19 -08:00
Mark Otto
2398245e17
Remove all old responsive styles since we're motherfucking mobile first son
2013-01-17 00:43:58 -08:00
Mark Otto
687d4a3eeb
Move grid/container styles to grid.less; update docs; add offsetting back
2013-01-17 00:42:31 -08:00
Mark Otto
255cb87734
update getting started to reflect latest changes; pull list of components because fuck that
2013-01-17 00:27:46 -08:00
Mark Otto
a8a60e94e3
padding twerk
2013-01-17 00:24:18 -08:00
Mark Otto
33864b4a3d
dat docs messaging (on the homepage)
2013-01-17 00:23:25 -08:00
Mark Otto
9374965b83
docs css cleanup
2013-01-17 00:20:00 -08:00
Mark Otto
630005687d
Remove ported navbar css that was already commented out
2013-01-17 00:13:12 -08:00
Mark Otto
4129be6ebd
Update sidenav and responsive css
2013-01-17 00:13:04 -08:00
Mark Otto
f535201781
improve navbar vars and fix side nav alignment
2013-01-16 23:33:26 -08:00
Mark Otto
6b193dc22d
More navbar tweaks, including making fixed navbars work in the docs by adding padding to body
2013-01-16 16:20:29 -08:00
Mark Otto
9ba14cfb7c
More navbar derping
2013-01-16 16:14:41 -08:00
Mark Otto
960804cea3
mo betta new navbar styles; hook up some changed vars
2013-01-16 15:35:41 -08:00
Mark Otto
ee9403e2d2
flatten the progress bars
2013-01-16 15:19:55 -08:00
Mark Otto
baa8c3ec9e
restore alerts, and make them suck much less
2013-01-16 15:16:04 -08:00
Mark Otto
0b81dd217f
tuck some margins
2013-01-16 15:11:17 -08:00
Mark Otto
1288304e91
Make jumbotron mo responsive
2013-01-16 15:07:57 -08:00
Mark Otto
cf693b5632
Add in responsive for 1200px+ layout; increase padding for that viewport size
2013-01-16 14:48:25 -08:00
Mark Otto
13a80f33c8
fix up sidenav and components page
2013-01-16 14:10:33 -08:00
Mark Otto
3e40e7dfbf
mo betta sidenav for responsive hotness
2013-01-16 13:20:32 -08:00
Mark Otto
beb2c13f4d
Prevent grids from collapsing, fix affixed side nav for docs
2013-01-16 13:11:45 -08:00
Mark Otto
a7a06a05a4
Remove commented out files; leave responsive stuff commented out for now
2013-01-16 13:08:27 -08:00
Mark Otto
910ca85a70
restore remaining components
2013-01-16 13:07:41 -08:00
Mark Otto
bc7fd582ed
restore pagination and pager
2013-01-16 13:07:08 -08:00
Mark Otto
2127690e73
restore breadcrumbs
2013-01-16 13:06:15 -08:00
Mark Otto
2407217686
restore wells and close
2013-01-16 13:05:20 -08:00
Mark Otto
ab38493e91
Restore button groups
2013-01-16 13:04:29 -08:00
Mark Otto
c18b5b9735
restore glyphicons docs styles and then overhaul the shit out of them
2013-01-16 13:02:15 -08:00
Mark Otto
a4cc704220
Restore dropdowns.less
2013-01-16 12:44:31 -08:00
Mark Otto
eb3cd5d7d2
Restore responsive docs
2013-01-16 12:44:25 -08:00
Mark Otto
c76f1cd97e
restore glyphicons
2013-01-16 12:30:44 -08:00
Mark Otto
992e0d922a
Re-add and update form styles:
...
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto
b6b8633542
twerk docs code examples
2013-01-16 12:02:45 -08:00
Mark Otto
cb99c4b63a
restore table styles
2013-01-16 11:48:20 -08:00
Mark Otto
6ac6be2a5e
more subhead/jumbotron tweaks for docs
2013-01-16 11:45:16 -08:00
Mark Otto
0df7411362
Derp on type styles a bit more; bring back and fix up more more docs styles
2013-01-16 11:38:34 -08:00
Mark Otto
81a22e189a
add back docs footer
2013-01-16 11:03:54 -08:00
Mark Otto
cb0691d92f
mo betta type margins for headings
2013-01-16 10:57:00 -08:00
Mark Otto
8fd26040d8
Port over temp responsive styles to bootstrap.less; readd buttons
2013-01-16 10:52:33 -08:00
Mark Otto
5a3cb0d778
remove extra border-radius props
2013-01-16 10:49:19 -08:00
Mark Otto
b80bf2c138
Merge pull request #6600 from Yohn/patch-12
...
added missing class to doc example
2013-01-16 10:28:02 -08:00
Yohn
598e9e6f13
Update docs/templates/pages/components.mustache
2013-01-16 07:46:42 -05:00
Yohn
60bb95e611
adding class to example code
2013-01-16 07:45:31 -05:00
Quy Ton
1da1994ba4
Add text alignment classes info to docs
2013-01-15 18:16:44 -08:00
Mark Otto
85db846b65
mobile-first navs, navbar, grids, and type
2013-01-15 17:55:14 -08:00
Mark Otto
094767fbfe
code changes
2013-01-15 14:34:04 -08:00
Mark Otto
267690eb1b
docs changes, more type improvements, add grid system basics back
2013-01-15 14:30:00 -08:00
Mark Otto
a67c86e40f
Fixes #6586 : remove top 5px margin from navbar input group button groups
2013-01-15 10:27:30 -08:00
Mark Otto
09696143e0
type and stuff
2013-01-15 10:14:12 -08:00
Patrick H. Lauke
c55329085e
Revert "Leave tabindex=-1 alone"
...
This reverts commit 370fa45fbe
.
2013-01-15 07:22:02 +00:00
Patrick H. Lauke
370fa45fbe
Leave tabindex=-1 alone
...
It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...
2013-01-15 07:16:33 +00:00
Patrick H. Lauke
4503ad7808
Revert "Keyboard accessibility in documentation"
...
This reverts commit a809daf284
.
2013-01-15 07:13:19 +00:00
Mark Otto
25c9b6b59a
nuke and flatten and stuff
2013-01-14 22:05:55 -08:00
Mark Otto
337741fc9a
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-01-14 00:33:16 -08:00
Mark Otto
f9ee99cf6f
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
Yohn
a23eb06536
fix typo
2013-01-13 15:32:51 -05:00
Yohn
ecc24953a5
fix typo
2013-01-13 15:32:03 -05:00
Yohn
98aeb0acf1
added container options to docs for popover
2013-01-13 15:23:22 -05:00
Yohn
fdd1daeae1
added container options to docs for popover
2013-01-13 15:21:31 -05:00
Mark Otto
d247f71217
Reset docs jumbotron button to blue defaults
2013-01-13 04:27:51 -08:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
76ed6b0b2c
Remove comment out code and simplify what's left for button group toggles
2013-01-13 04:05:34 -08:00
Mark Otto
1916eb7c7f
Fix btn link hover and tweak dropdown border/shadows
2013-01-13 04:04:16 -08:00
Mark Otto
0b31cfc90e
Fix up .brand in navbar of docs
2013-01-12 20:10:42 -08:00
Mark Otto
01db5db2f6
white text on buttons on hover for links
2013-01-12 20:08:13 -08:00
Mark Otto
4b34f4947a
Update Holder.js 1.6 to 1.9
2013-01-12 19:49:15 -08:00
Mark Otto
ea1a12593d
Nuke shadow on pagination
2013-01-12 19:46:47 -08:00
Mark Otto
8670021935
fixed navbars fixings
2013-01-12 19:44:51 -08:00
Mark Otto
1ea647ce98
Remove shadows from active links in navbar
2013-01-12 19:02:58 -08:00
Mark Otto
7bcd02c167
Tweak button
2013-01-12 19:02:48 -08:00
Mark Otto
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
Mark Otto
a9a66e9c34
finetune buttons flattened colors
2013-01-12 17:51:57 -08:00
Mark Otto
ff02043bbc
Flatten navbar
2013-01-12 14:31:18 -08:00
Mark Otto
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
Mark Otto
24f7df15e6
Remove mention of Extend page from readme and index page
2013-01-12 13:57:41 -08:00
Mark Otto
b1f0a7e62b
Remove Extend page from the docs entirely
...
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -08:00
Mark Otto
7a3f078fb4
Remove parent div from pagination component
...
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto
6f275c6148
Update extend page to point to readme for compiling.
...
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
Patrick H. Lauke
a809daf284
Keyboard accessibility in documentation
...
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
Patrick H. Lauke
77c68e4bc2
Cleaned up dirty CSS
...
Used recess rather than less
2013-01-12 11:02:13 +00:00
Mark Otto
a7231854c9
Address #6459 and add mention of disabled links in dropdowns to le docs
2013-01-12 00:33:12 -08:00
Mark Otto
8a16746542
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
...
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto
3773b99969
Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
...
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
Mark Otto
aaf80d410a
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
Mark Otto
19e2ad0eb6
Fixes #6538 : Add th support to all the .table-rounded selectors
2013-01-11 23:38:53 -08:00
Mark Otto
6f894c62a5
Fixes #6528 : Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active
2013-01-11 23:35:22 -08:00
Mark Otto
42efd9f730
Address #6545 : clarify initialization of tooltips in docs
2013-01-11 20:58:24 -08:00
Mark Otto
4de3a77a64
Fixes #6547 : Make blockquotes use multiple of @baseFontSize
2013-01-11 20:55:09 -08:00
Mark Otto
88e816956a
Fixes #6552 : example fix for button group
2013-01-11 20:52:39 -08:00
Mark Otto
b242ff7851
Fixes #6553 : example fix for validation states
2013-01-11 20:51:11 -08:00
Mark Otto
767a293b4d
Increase input group margin on bottom and vertically center to match inputs
2013-01-11 20:46:21 -08:00
Mark Otto
56a24027c3
Fixes #6473 : Make .input-prepend and .input-append inline-block to match other form states
2013-01-11 20:42:44 -08:00
Mark Otto
d3b3b4c48f
Fixes #6474 : remove duplicate .btn border colors to make @btn-border work
2013-01-11 20:40:17 -08:00
Mark Otto
d7c93fc647
Fixes #6478 : scope table backgrounds to immediate td/th elements
2013-01-11 20:38:14 -08:00
Mark Otto
53f9e25150
Comment fix
2013-01-11 20:30:56 -08:00
Mark Otto
7626cc629f
Remove overflow: auto; from .tab-content
2013-01-11 20:26:48 -08:00
Mark Otto
b9b5cd786d
Fixes #6555 : remove .controls-row from responsive
2013-01-11 20:23:37 -08:00
Mark Otto
649d8c985e
Remove navbar links from sticky footer navbar example
2013-01-11 11:00:45 -08:00
Mark Otto
839f83c610
Merge branch 'wilfra-patch-2' into 2.3.0-wip
2013-01-11 10:58:17 -08:00
Mark Otto
6e5a2fedaa
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
2013-01-10 18:51:04 -08:00
William Franceschine
cf852c1f62
Update docs/examples/marketing-narrow.html
...
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine
9fdc9887cf
Update docs/examples/marketing-alternate.html
...
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine
edfc0bf8b3
Update docs/examples/hero.html
...
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine
1eb6a1d8c8
Update docs/examples/carousel.html
...
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine
5eff3cdd5d
Update docs/examples/fluid.html
...
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto
976b4ea263
Merge branch 'Justin-John-master' into 2.3.0-wip
2013-01-09 21:35:50 -08:00
Mark Otto
ccf4c2fbe3
add sticky footer with navbar
2013-01-09 19:53:42 -08:00
Mark Otto
91dd77939b
Add text alignment utility classes
2013-01-09 18:56:08 -08:00
Justin John Mathews
2c2a847e75
Corrected carousel arrows to active.#6494, #6489
...
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Chris Rebert
206205a6b2
update docs to reflect #5786
2013-01-05 17:36:20 -08:00
Chris Rebert
684c9d8d05
update docs to reflect #5786
2013-01-05 17:14:22 -08:00
Patrick H. Lauke
848ca6e315
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
3d04d9ba75
Super lame typo on my part, sorry @necolas :)
2012-12-28 19:24:13 -06:00
Mark Otto
5a2dc0b897
Improve documentation for new form validation styles
2012-12-28 14:47:55 -06:00
Mark Otto
1c0e4fc7bb
Popovers are now flexible width:
...
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto
f69d12af3d
Merge pull request #6407 from aurnik/master
...
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Aurnik Islam
aa997e274e
Fix link to File structure anchor
2012-12-27 01:49:09 -08:00
Mark Otto
dc5c6d6be8
Simplify form validation states while enabling them to be applied to one field at a time.
2012-12-26 15:57:52 -06:00
Mark Otto
d0baa99aed
Remove .text-info and .info form validation states
2012-12-26 14:59:58 -06:00
Mark Otto
2ef4fde09f
Drop .input-block-level modifier as inputs are already width: 100%;
2012-12-26 14:19:48 -06:00
Mark Otto
12b738bf30
Add grid column example to form input sizing
2012-12-26 14:13:44 -06:00
Mark Otto
070109abc1
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
2012-12-26 14:09:36 -06:00
Mark Otto
c17673dc61
Restore .form-horizontal
2012-12-26 13:59:09 -06:00
Mark Otto
9921d21969
Run make on previous commits
2012-12-26 13:59:01 -06:00
Mark Otto
b19fd8e4fa
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2012-12-26 10:15:23 -06:00
Mark Otto
330b143b40
Add longer tooltip example to docs, tighten up line-height on tooltip; run make
2012-12-26 09:36:07 -06:00
Mark Otto
9749d6afc2
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134
Merge pull request #6378 from Yohn/patch-7
...
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn
340d90138c
Update docs/templates/pages/javascript.mustache
2012-12-24 19:03:13 -05:00
Yohn
2a5fde272c
Update docs/javascript.html
2012-12-24 19:01:56 -05:00
Mark Otto
c063f7c9c2
Update docs to reflect latest on .clearfix
2012-12-24 02:08:45 -08:00
Mark Otto
d206ec1659
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
2012-12-24 02:06:28 -08:00
Yohn
dfbac13ad1
data-toggle instead of rel for tooltip and popover
2012-12-23 07:04:24 -05:00
Yohn
5da8b315c0
data-toggle instead of rel for tooltip and popover
2012-12-23 07:00:03 -05:00
Yohn
da0217405f
data-toggle instead of rel for tooltip and popover
2012-12-23 06:51:46 -05:00
Yohn
f152dead92
Update docs/javascript.html
2012-12-23 04:25:27 -05:00
Yohn
68ff08cc91
Update docs/templates/pages/javascript.mustache
2012-12-23 04:23:18 -05:00
Jake Spurlock
0834bd51ec
Update docs/templates/pages/javascript.mustache
...
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
2c0ed072b0
shifting focus to parent and adding aria menuitem for dropdown
2012-12-22 13:57:57 -08:00
fat
4d195222d4
remake js
2012-12-22 13:48:28 -08:00
fat
fad0fb683b
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
2012-12-22 13:24:37 -08:00
fat
e2434fefbd
chnage for #6248
2012-12-21 20:27:53 -08:00
fat-kun
356e47efe1
Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify
...
change scrollspy documentation to clarify javascript usage
2012-12-21 20:23:44 -08:00
fat
f59bf47081
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-21 20:20:04 -08:00
fat
ddd59f22c7
update mustace to reflect changes to data-slide-to
2012-12-21 20:19:33 -08:00
fat
24a36df9f6
add support for [data-slide-to] attr on carousel
2012-12-21 19:45:19 -08:00
Mark Otto
7f7039321d
Fixes #6189 : Add holder.js to carousel example
2012-12-21 19:10:05 -08:00
Mark Otto
a55605ca57
add readme image
2012-12-21 19:04:59 -08:00
Mark Otto
558bc52432
Add docs readme icon
2012-12-21 18:54:36 -08:00
fat
818c56f078
rewrite makefile to make a bit more "efficient" + rebuild
2012-12-21 17:42:24 -08:00
fat
e194c3e4f4
rebuild
2012-12-21 17:25:31 -08:00
Mark Otto
dc32555f5b
Fixes #6370 : Add comment to docs on typeahead and autocomplete
2012-12-21 15:46:10 -08:00
Mark Otto
c11f41ba04
flatten buttons and forms
2012-12-21 00:50:28 -08:00
Mark Otto
7c04d573d0
update docs regarding normalize and clearfix
2012-12-20 21:44:45 -08:00
Quy Ton
a27bf30f0d
Miscellaneous changes to docs
2012-12-20 21:38:53 -08:00
Mark Otto
7b7581d44a
Finish migrating to Normalize 2:
...
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
2012-12-20 20:52:20 -08:00
Mark Otto
c1e82732cf
Update new example name and links
2012-12-20 20:27:07 -08:00
Mark Otto
a24e47b5b8
Update the examples index:
...
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto
43d130762b
Fixes #6352 : marketing-alternate broken nav in FF17
2012-12-20 14:40:39 -08:00
Mark Otto
1c33b857a6
Convert normalize comments to // style
2012-12-20 14:08:09 -08:00
Mark Otto
be74ad7e0d
Merge branch '3.0.0-wip' into bs3-normalize
...
Conflicts:
less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto
8eb1549842
remove .hide specificity override from grid classes
2012-12-20 13:57:14 -08:00
Mark Otto
6bd5dc7d9f
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
2012-12-20 13:53:38 -08:00
Mark Otto
a5e04c0799
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto
5e4f663e69
Undo important on hide/show utilties; punt to 3.0
2012-12-20 13:46:07 -08:00
Mark Otto
00ff34b9e6
fix up code snippet
2012-12-20 13:41:45 -08:00
Mark Otto
b6575cc72e
fix up code snippet
2012-12-20 13:41:08 -08:00
Mark Otto
30d8eb3ed5
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
2012-12-20 01:34:19 -08:00
Mark Otto
0a1434b23b
Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors
2012-12-20 01:34:10 -08:00
Mark Otto
f706acb11c
Fixes #6339 : Use important flag on .hide and .show utility classes
2012-12-20 01:30:32 -08:00
Mark Otto
cdb25e11ef
lighter buttons closer to todays versions
2012-12-20 01:21:09 -08:00
Mark Otto
c00f29e4d4
Fixes #6236 : Fix popover font-size in input groups
2012-12-20 00:54:58 -08:00
Mark Otto
4e54e7bb35
Remove dropdown submenu docs
2012-12-20 00:27:46 -08:00
Mark Otto
cc6974b74e
Remove dropdown submenu CSS
2012-12-20 00:27:05 -08:00
Mark Otto
acde2dc1ee
Nuke third lines form carousel examples
2012-12-20 00:20:00 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Mark Otto
9726fded1c
Get on that carousel indicator lifestyle with some new hawtness
2012-12-19 23:52:38 -08:00
Mark Otto
5d776bcfd2
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
2012-12-19 23:39:40 -08:00
fat
bbe4625672
lol we dont' have affix(refresh)
2012-12-19 23:39:26 -08:00
Mark Otto
14844db862
Holy shit, buttons, button states, and input states updated
2012-12-19 23:37:33 -08:00
fat
7f9ff0ba5b
add js support for carousel indicators
2012-12-19 23:25:25 -08:00
Mark Otto
09dde5c84a
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
a27952efd0
Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code
2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4
More button tweaks
2012-12-19 22:54:04 -08:00
fat
e9eff0cbff
wait 100ms before engaging affix (allows for initial browser scroll)
2012-12-19 22:37:41 -08:00
Mark Otto
afef81c0d7
remove commented out buttons css, update docs
2012-12-19 22:30:08 -08:00
fat
96e5fa6143
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
2012-12-19 22:26:36 -08:00
Mark Otto
c38b7206eb
overhaul buttons
2012-12-19 22:25:56 -08:00
Mark Otto
a932476f80
Unfuck the fucked homepage
2012-12-19 22:07:11 -08:00
fat
7c456c8554
fix tooltip doc dumbness
2012-12-19 22:05:33 -08:00
fat
219d275ae6
can't extend bounding box thingy
2012-12-19 22:03:57 -08:00
Mark Otto
7449e2e5a1
Remove @black and just use #000
2012-12-19 22:02:57 -08:00
fat
dc4e80a655
fix ghetto ass timeout shit
2012-12-19 21:55:23 -08:00
Mark Otto
65edc9cd6e
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
2012-12-19 21:42:36 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -08:00
Mark Otto
2011a0d50f
Drop labels from the docs
2012-12-19 21:29:57 -08:00
Mark Otto
c6cc1b1a1d
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
2012-12-19 21:18:32 -08:00
Mark Otto
85971ff3e8
Drop .form-search support
2012-12-19 21:12:37 -08:00
Mark Otto
51b1a027da
Merge branch 'bs3-input-groups' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
26b999b76a
no need for margin-top on .typeahead, it's set on .dropdown-menu
2012-12-19 19:46:44 -08:00
Mark Otto
19a94d08d6
Remove support for multiple buttons in input groups because fuck that shit.
2012-12-19 19:33:14 -08:00
Mark Otto
dc6142751f
Fixes #6337 : scope '.media .pull-left' and '.media .pull-right' to immediate children only
2012-12-19 18:47:34 -08:00
Mark Otto
28c928f010
Use normalize as separate file instead of with other resets; still need to punt other styles
2012-12-19 18:43:55 -08:00
Mark Otto
840e47eabd
Update clearfix mixin and class per @necolas's feedback
2012-12-19 17:49:20 -08:00
Jim Webb
ecfa09decb
* modify scrollspy documentation to clarify javascript usage
...
* add scrollspy 'target' option
2012-12-12 11:48:44 -05:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
cddca18f12
Fixes #6174 : Caret alignment in small and mini buttons
2012-12-10 10:59:57 -08:00
Mark Otto
9d985978a3
Escape HTML of section element
2012-12-10 10:55:42 -08:00
Mark Otto
847b632577
IE10 fix in responsive utilities, not regular utilities
2012-12-10 10:29:16 -08:00
Mark Otto
83a6a55d2c
Move IE10 responsive fix to responsive utilities so Customizer gets it
2012-12-10 10:25:18 -08:00
Mark Otto
ab5d7f863c
move reset after vars and mixins
2012-12-10 09:57:23 -08:00
Chris Rebert
8c8a14ab59
document caveat regarding fieldset legend and #6199
2012-12-10 01:46:16 -08:00
Chris Rebert
48759eee94
document fieldset[disabled] styling added in #6199 ; per @mdo
2012-12-10 01:33:02 -08:00
Chris Rebert
3b5d4f52a3
fixes #5605 : style as disabled all form controls & btns under a disabled fieldset
...
this is a resubmission of #5875 , but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Blake Embrey
c105906780
Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197
2012-12-10 16:42:58 +10:00
Mark Otto
4245e8ebb5
Fix checkbox and radios example
2012-12-09 22:13:40 -08:00
Mark Otto
6e9bbe6232
Nested columns docs tweaks
2012-12-09 22:08:11 -08:00
Mark Otto
4c82dd3645
Refactor input groups
...
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Nathan Bridgewater
18adc44171
lowered carousel beneath the nav
2012-12-09 22:10:38 -06:00
Mark Otto
6649918c7f
Merge conflicts
2012-12-08 22:45:39 -08:00
Mark Otto
070c125cec
Restore print styles
2012-12-08 21:05:05 -08:00
Mark Otto
68d1d7fc83
Test removal of print styles for customized builds
2012-12-08 21:02:37 -08:00
Mark Otto
b5ceca14db
Fix docs typos
2012-12-08 18:46:34 -08:00
Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
Mark Otto
9376a7c221
Fixes #5729 : Nested striped tables
...
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto
cacc213762
Nesting tables
...
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Quy Ton
3bd9a26c01
Apply code tag to data attribute on javascript page
2012-12-08 12:06:46 -08:00
fat
820a3b27b6
get tests passing for typeahead :P
2012-12-07 19:16:48 -05:00
fat
1747caf19d
insert menu of typeahead after input which it suggests on #3529
...
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat
437654030a
focus on escape in typeahead
2012-12-07 18:37:32 -05:00
fat
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
1c5b8e967e
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:51:57 -08:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Mark Otto
1413f976ae
Merge pull request #6151 from tierra/pre-code-white-space-fix
...
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto
cc6fda2262
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:43:32 -08:00
Mark Otto
2c7ab23d7a
Fixes #6136 : Proper scoping of breadcrumbs divider
2012-12-07 09:43:09 -08:00
Bryan Petty
f4466dd9c7
Fix code block white-space breaks within pre tags.
2012-12-06 11:33:00 -07:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
be5f31480b
Nuke all i18n tags from .mustache templates
2012-12-05 11:09:02 -08:00
Mark Otto
306c1b4914
Remove commented out old popover CSS
2012-12-05 11:06:16 -08:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab
add gallery page, fill with a few screenshots to start
2012-12-04 20:30:21 -08:00
Mark Otto
ed74992853
Fixes #4550 : Temporary fix for dropdown taps on mobile
...
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto
12916b06aa
Fix up display of dropdown submenu examples on responsive views
2012-12-04 18:25:16 -08:00
Mark Otto
e31c7fb8a5
correct link on index page to grid system
2012-12-04 09:49:18 -08:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
869b69c66c
Fixes #6115 : scope breadcrumb styles to immediate children only
2012-12-03 13:09:38 -08:00
Mark Otto
06582edb2a
Improve rendering of carousel example for IE10
2012-12-03 13:01:27 -08:00
Andreas Cederström
68cbba347b
Fixing header color for success, error and info alerts
2012-12-03 14:20:14 +01:00
Mark Otto
f514c87d6b
Enable responsive features in IE10 when snapped
2012-12-02 20:57:34 -08:00
Mark Otto
30d6a71ccd
Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10
2012-12-02 20:40:24 -08:00
Mark Otto
139f1be49d
reset text align in popovers given inline insertion
2012-12-02 02:30:00 -08:00
Mark Otto
ea61cdb740
remove overrides on inner html of popover-content
2012-12-02 01:34:58 -08:00
Mark Otto
32d425967a
run make on js changes to popover
2012-12-02 01:32:23 -08:00
Mark Otto
e8b3c36068
run make on modal popover fix
2012-12-02 00:09:45 -08:00
Mark Otto
9c028ea54b
follow button width
2012-12-01 18:51:03 -08:00
Mark Otto
19ee7999f4
remove single corner border-radius mixins
2012-12-01 14:25:28 -08:00
Mark Otto
dd11d0a3fa
move around social buttons
2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
0947105656
section title change
2012-11-30 17:43:20 -08:00
Mark Otto
51b4de8eec
docs content changed
2012-11-30 16:43:31 -08:00
Mark Otto
6961b284b6
remove responsive image from css docs page
2012-11-30 16:42:48 -08:00
Mark Otto
ebd2215e49
remove deleted css files, run make
2012-11-30 16:31:24 -08:00
Mark Otto
10c14e8955
first pass at nuking scaffolding
2012-11-30 16:29:30 -08:00
Mark Otto
0fabca01db
Remove more fluid grid stuff
...
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
adc2c779a0
grid vars updated
2012-11-30 15:43:07 -08:00
Mark Otto
b8b266ca7c
popovers and tooltips vars
2012-11-30 15:40:44 -08:00
Mark Otto
e34b3730b7
form state vars
2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d
hero unit and pagination vars
2012-11-30 15:36:16 -08:00
Mark Otto
62a2220035
navbar vars
2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae
more vars changed
2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62
remove sprites vars, change zindex vars
2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9
remove color variables, swap others were appropro
2012-11-30 15:18:49 -08:00
Mark Otto
0ef347706c
more vars changing
2012-11-30 15:09:57 -08:00
Mark Otto
9239bfbc7b
more vars changed, remove @white var
2012-11-30 15:05:23 -08:00
Mark Otto
b0e2b5813d
more consistent variable naming patterns
2012-11-30 14:45:25 -08:00
Mark Otto
7a3d15eb21
Part 1 of unCamelCasing variables
2012-11-30 14:37:24 -08:00
Mark Otto
fe8061b84e
more tests for form styles; includes lightening help text
2012-11-30 13:35:20 -08:00
Mark Otto
f9a47e3a5f
Refine containers and navbars
...
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
2012-11-30 12:42:37 -08:00
Mark Otto
7313702cf3
Inputs now 100% width by default
...
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -08:00
Mark Otto
4fd164d45b
consolidate font resets into scaffolding
2012-11-30 00:24:17 -08:00
Mark Otto
fca35c0dba
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto
bca3ff4ed6
Fixes #5853 : Maintain 10px margin above help block when following input groups
2012-11-29 23:39:33 -08:00
Mark Otto
f087b3428c
remove element from selector
2012-11-29 23:33:09 -08:00
Mark Otto
fe7b6decb1
Merge pull request #6039 from desheikh/2.2.2-wip
...
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto
322a56354f
run make with nav img fix
2012-11-29 23:27:20 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Zulfiqar Ali
ddd154481b
added compiled css file
2012-11-29 17:40:23 +08:00
Mark Otto
78390d12af
Fix the carousel after we scoped selectors
2012-11-28 15:40:51 -08:00
Mark Otto
f1349a2450
Fixes #5533 : Remove filter gradient from disabled links on dropdowns
2012-11-28 02:22:37 -08:00
Mark Otto
8fb36cb3dd
Fixes #5594 : Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only
2012-11-28 02:21:34 -08:00
Mark Otto
296b838405
Fixes #5616 : scope carousel state classes to immediate children only
2012-11-28 02:17:50 -08:00
Mark Otto
bf3a5df371
Fixes #5930 : redeclare font-size for popoves in btn-groups
2012-11-28 02:10:23 -08:00
Mark Otto
783120dffa
Fixes #5927 : Scope button group 5px button left margin to immediate children
2012-11-28 01:51:04 -08:00
Mark Otto
014d3cedf5
Fixes #5940 : Prevent @headingsColor from changing alert colors
2012-11-28 01:48:34 -08:00
Mark Otto
bfc97fdaf6
Fixes #4852 : IE8 popover carets fixed
...
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Mark Otto
fda5bb135e
Fixes #5963 : Add large button example to icons, fix vertical alignment in large buttons
2012-11-28 00:46:09 -08:00
Mark Otto
74f51105e9
Fixes #6010 : Navbar dropdown caret should match link hover color
2012-11-28 00:42:17 -08:00
Mark Otto
942f9c5df4
Fixes #6012 : Updated docs sidenav media queries and reset width for exactly 980px
2012-11-28 00:37:55 -08:00
Mark Otto
02097700e8
Fixes #6035 : use font-size vars in button groups
2012-11-28 00:31:52 -08:00
Mark Otto
dc10e6bbf8
Fixes #5935 : Updated vertical gradient mixin
2012-11-28 00:19:35 -08:00
Mark Otto
7e56e2265d
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto
e0d0190803
fix image sizes on homepage
2012-11-22 12:26:54 -08:00
Mark Otto
5d1b4206b1
Fixes #5986 : single toggle button html examples
2012-11-22 12:06:36 -08:00
Mark Otto
8df2811d49
Simpler footer for docs
...
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
a367fd4938
Fixes #5925 : Adjust top margin of input group in navbar
2012-11-16 01:19:15 -08:00
Mark Otto
88c2497368
Fixes #5912 : User correct selector for form field states.
...
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto
5702e1be6e
widths on github buttons
2012-11-16 01:13:52 -08:00
Mark Otto
fa1c130552
Change important badges/labels to danger
2012-11-15 09:17:11 -08:00
Mark Otto
a43bf14ea5
Merge branch '2.2.2-wip' into exploratory
2012-11-15 09:15:37 -08:00
Mark Otto
05655ff4ff
fixes #5922 : clicking only button should download custom build
2012-11-15 09:14:54 -08:00
Mark Otto
1700e48e7f
Fixes #5879 : Manual update of Normalize credit
2012-11-14 15:20:38 -08:00
Mark Otto
0df0b5f1f5
run make after latest merges
2012-11-14 15:19:16 -08:00
Drew Goodwin
c8856eeff3
fixes #5873 : @navbarInverseBrandColor not used
2012-11-10 17:58:00 -08:00
Mark Otto
1a4ce9ba18
Merge branch '2.2.2-wip' into exploratory
2012-11-09 10:09:04 -08:00
Mark Otto
54486de88c
run make again
2012-11-09 09:21:14 -08:00
Mark Otto
ddf5ceccce
typo fix
2012-11-08 23:49:04 -08:00
Mark Otto
cf7d7a7b5d
remove ; from customizer
2012-11-08 23:46:40 -08:00
Mark Otto
57eed7867b
merge in latest
2012-11-05 19:00:34 -08:00
Mark Otto
9d1eefa4fb
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-05 18:44:22 -08:00
Mark Otto
23a7ab4b51
icon vertical align in buttons
2012-11-05 18:44:10 -08:00
Mark Otto
33beb93e1b
new docs css for new icons
2012-11-05 18:40:00 -08:00
Mark Otto
b82bc97023
update docs and all classes
2012-11-05 18:38:59 -08:00
Mark Otto
cea2a701f0
adding new fonts and css for glyphicons update
2012-11-05 18:36:16 -08:00
Mark Otto
c0bbe1692c
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
2012-11-05 18:27:25 -08:00
Alexandre Magno
0a1d296e19
insert missing i18n tag at customize and download string
2012-11-05 18:38:59 -02:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
Mark Otto
d38bda1480
Fixes #5471 : Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading
2012-11-04 22:50:07 -08:00
Mark Otto
ee93541421
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto
62c78e46f8
more required input tweaks
2012-11-04 19:53:13 -08:00
Mark Otto
91bcccd9a8
simplify invalid input css
2012-11-04 19:43:09 -08:00
Mark Otto
ebed09ec01
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-04 19:42:13 -08:00
Mark Otto
f3b3814606
Merge pull request #5786 from cvrebert/2.2.2-wip
...
fixes #5494 : style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto
823b5accd3
start documenting html5 invalid form fields
2012-11-04 19:41:41 -08:00
Mark Otto
7e6cc0bf7e
Fixes #5785 : allow for segmented button groups in input groups
2012-11-04 19:08:02 -08:00
Chris Rebert
76f9c9128e
fixes #5494 : style invalid fields as invalid regardless of required-ness
2012-11-04 18:26:25 -08:00
Mark Otto
51f293ba4c
Fixes #5662 : white-space: nowrap; on code element
2012-11-04 13:30:36 -08:00
Mark Otto
075e320a83
remove unnecessary bg declarations in buttons per #5684
2012-11-04 13:26:03 -08:00
Mark Otto
21957a3d9e
set background size for docs jumbotron for retina
2012-11-04 13:24:06 -08:00
Mark Otto
953dc3a6f2
higher res docs illustrations
2012-11-04 13:23:08 -08:00
Mark Otto
fb51efcbd4
Fixes #5113 : increase .typeahead z-index for proper use with modals
2012-11-04 13:01:31 -08:00
Mark Otto
2320a09898
fix modals display in docs on tablet view
2012-11-04 12:58:57 -08:00
Mark Otto
1af0021014
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
2012-11-04 12:42:00 -08:00
Mark Otto
22d1506d23
remove margin on .inline lists
2012-11-04 12:39:27 -08:00
Mark Otto
508cc1fef4
change up list classes to use .list- prefix
2012-11-04 12:38:35 -08:00
Mark Otto
269be76f4a
Merge branch '2.2.2-wip' into exploratory
2012-11-04 12:37:44 -08:00
Mark Otto
28da31218f
Refine new inline list option
2012-11-04 12:36:37 -08:00
Mark Otto
68f26d959f
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
2012-11-04 12:27:30 -08:00
Mark Otto
e4866c4b3c
clarify unstyled lists docs
2012-11-04 12:27:18 -08:00
Mark Otto
83a3789b5e
add justified nav links for tabs and pills
2012-11-04 00:52:10 -07:00