rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity
4,613 Commits 108 Branches 89 Tags 547 MiB
441bbe1998
Commit Graph

3173 Commits

Author SHA1 Message Date
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
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