rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Code Issues Actions Packages Releases Activity
8,309 Commits 108 Branches 89 Tags 547 MiB
3a89fbc9a3
Commit Graph

2192 Commits

Author SHA1 Message Date
fat
2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat
102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat
eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto
f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples 
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
 2013-07-17 20:44:27 -07:00
fat
392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat
5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto
542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
 2013-07-17 19:33:30 -07:00
fat
f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
Mark Otto
5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto
522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
liuyl
0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto
1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup 
code.less: cleanup styles that get immediately overriden later in the file
 2013-07-08 06:57:37 -07:00
Mark Otto
e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting 
use nesting more in pagination.less
 2013-07-08 06:55:50 -07:00
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
Francis Brunelle
6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04: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
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
Mark Otto
879d517cb3 delete icons in assets 2013-06-27 18:49:59 -07:00
fat
94761c2216 use collapse in dropdown js example 2013-06-27 18:47:35 -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
Julian Thilo
f00c885d4c Docs: create new callout classes 2013-06-25 23:12:36 +02:00
Luis Hdez
9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02: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
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
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
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
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
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
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
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
Mark Otto
567b8b5631 fix docs highlighting of grid 2013-06-03 21:58:58 -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
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
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
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
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
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
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
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
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
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
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