root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12,004 Commits 105 Branches 92 Tags 675 MiB
Commit Graph

865 Commits

Author SHA1 Message Date
Mark Otto 47a3c6d60b Merge pull request #13241 from twbs/address-13240 
explicitly doc that icon classes should only be used on empty elements
 2014-03-31 21:12:38 -07:00
Chris Rebert 11ffc7346b explicitly doc that icon classes should only be used on empty elements; closes #13240 2014-03-31 20:23:14 -07:00
Chris Rebert e59da02230 add document ready jQuery wrapper in Android Browser workaround 2014-03-31 00:00:05 -07:00
Chris Rebert 28e6c34268 Merge pull request #13190 from twbs/fix-13175 
doc that popover content() is given the element as an arg
 2014-03-28 11:57:07 -07:00
Julian Thilo b2a67ffe55 Revert upgrade to Universal Analytics 
The Google Analytics account we use cannot currently be upgraded to Universal Analytics. In order to keep using Analytics, we have to stick with Classic for now.
 2014-03-27 23:03:42 +01:00
Chris Rebert b57396944a Add equal-height grid columns as an experimental example. 
Based on @pete-otaqui's work from #11851
 2014-03-27 13:57:50 -07:00
Julian Thilo a696d47592 Change GA events to Universal Analytics 2014-03-27 21:26:21 +01:00
Chris Rebert 98bddd8904 Add TOC entry for "Third-party libraries" callout section to JS docs 2014-03-27 12:49:53 -07:00
XhmikosR c97e6d5cad Docs: switch to the Universal Analytics code. 2014-03-27 07:09:56 +02:00
Chris Rebert 361f452ed4 doc that popover content() is given the element as an arg; fix #13175 2014-03-26 12:49:15 -07:00
Chris Rebert 7c50859e93 Document `template` option of tooltip & popover; fixes #13088 
Also capitalize column titles and descriptions.
 2014-03-26 12:40:23 -07:00
Mark Otto 1d6187956f Document #13186 2014-03-25 23:00:47 -07:00
XhmikosR 4f9270cc20 Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests. 2014-03-24 09:28:40 +02:00
Mark Otto 2b27006c71 Merge pull request #12328 from benogle/bo-tooltip-adjust 
Add tooltip `viewport` option, respect bounds of the viewport
 2014-03-23 11:41:28 -07:00
Ben Ogle 8534e12523 Add tooltip `viewport` option, respect bounds of the viewport 2014-03-21 11:28:13 -07:00
Mark Otto dc2b24e626 Merge pull request #13095 from twbs/translation_data 
Generate Translations list from YAML
 2014-03-18 15:55:09 -07:00
Julian Thilo 1b15cefa5c Generate Translations list from YAML 2014-03-17 21:55:39 +01:00
Julian Thilo d52ad3ee3b Separate JS includes for alerts and popovers 
/cc @mdo
 2014-03-17 15:58:03 +01:00
Chris Rebert 4df96c768f fix description of <mark> 
#12956 errata
 2014-03-17 03:15:27 -07:00
Chris Rebert eea9eabb83 fix <mark> raw source to match live example 
#12956 errata
 2014-03-17 03:12:03 -07:00
Chris Rebert 4d859d177a copyedit responsive-embed.html 2014-03-17 03:04:37 -07:00
Mark Otto b004c9ac39 Rename and organize nav partials for cleaner file structure 2014-03-16 19:32:08 -07:00
Mark Otto 2a43e7e78a Break up docs into includes 2014-03-16 19:03:53 -07:00
Zlatan Vasović 1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Mark Otto 7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto 03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
mrmrs d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto 6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
Mark Otto 705ff7f227 Moving the embed to it's own CSS file, moving the docs to the Components page with an example, fixing a Glyhpicons list problem in the docs 2014-03-06 23:18:13 -08:00
Mark Otto 12c619f5b9 Merge branch 'master' into boulox-responsive-embed 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-03-06 22:40:25 -08:00
Mark Otto df3eb66ede Merge branch 'master' into popovers-use-radii-var 
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
 2014-03-06 21:44:46 -08:00
Mark Otto 0c9308a3b2 Rewrite the disabled list group items to simplify styles 2014-03-06 21:40:22 -08:00
Mark Otto c8614c0f15 Merge branch 'master' into pr/12490 
Conflicts:
	less/list-group.less
 2014-03-06 21:32:52 -08:00
Mark Otto fdbeefff59 nav 2014-03-04 16:56:35 -08:00
Mark Otto e418377b11 Fixes #12697: Document readonly inputs 2014-03-04 15:16:38 -08:00
Mark Otto d6e07f045c Merge branch 'master' into rtl_via_css_flip 
Conflicts:
	docs/assets/js/raw-files.min.js
 2014-03-04 00:41:57 -08:00
Mark Otto 1399497a02 grunt 2014-03-04 00:30:40 -08:00
Mark Otto 477dc99ffa fix nav 2014-03-03 23:50:28 -08:00
Mark Otto 559b90f944 Rename RTL files and add some basic docs 2014-03-03 23:50:04 -08:00
Chris Rebert f27b864f7b grunt build-customizer-html 2014-02-25 17:28:16 -08:00
Mark Otto 5517f9907e Fixes #12744: Document ability to remove animation on modals 2014-02-21 14:52:15 -08:00
Mark Otto 3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto 0d49920e0d Fixes #12610: Better and more consistent prefixing of docs CSS with .bs-docs- 2014-02-08 23:24:38 -08:00
Mark Otto b683433f67 grunt 2014-02-08 15:44:13 -08:00
Julian Thilo b61d12ff17 Fix wrong id 2014-02-07 23:21:32 +01:00
Mark Otto 4f9cdefab7 consistency 2014-02-07 01:31:42 -08:00
Mark Otto 228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto 3b4b9a7fe5 Fixes #12614: Add progress bar example with visible label 2014-02-07 01:16:34 -08:00
Mark Otto 91595d38f3 property order because @zdroid <3 2014-02-06 19:34:46 -08:00
Mark Otto f16a2376c1 add basic back to top link to docs sidenavs, fixes #12589 2014-02-05 13:46:24 -08:00
Chris Rebert d6f25e13ec mv .img-responsive docs from Overview to Images section 2014-02-01 00:26:46 -08:00
XhmikosR 8939268a33 Update jQuery to v1.11.0. 
Also, use Google's CDN per #11369.
 2014-01-30 20:50:17 +02:00
Mark Otto d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Mark Otto 7ba2eede4e fix css url 2014-01-29 21:44:36 -08:00
Quy Ton da86f6fbbb Remove Twitter from tweet button 2014-01-24 10:37:12 -08:00
Chris Rebert 6d08763136 add docs note to address #12078 2014-01-22 17:28:00 -08:00
Quy Ton e5c7c2acc1 Reorder nav of About docs page 2014-01-21 22:02:54 -08:00
Chris Rebert 3de48d29f5 fix #12280 by templating the customizer's nav sidebar too 
The customizer is such a PITA.
 2014-01-20 18:06:16 -08:00
Chris Rebert f59573db0d docs: use relative URLs instead of site.baseurl 2014-01-19 22:50:09 -08:00
Chris Rebert 937e067a27 grunt build-customizer-vars-form 2014-01-19 15:28:30 -08:00
Quy Ton f2d37ccc23 Additional changes to #12275 and #12292 2014-01-19 07:41:14 -08:00
Zlatan Vasović cf8f1ec0cd Improve <meta> tags 2014-01-19 13:27:17 +01:00
Mark Otto c322612218 move migration docs to new separate page, leave callout on getting started page; fixes #12244 2014-01-18 14:09:09 -08:00
Julian Thilo a56cf753ce Make spelling of Less uniform throughout the docs 2014-01-18 18:40:47 +01:00
Chris Rebert d8c87ddc28 fix #12277 
Thanks to @Quy for pointing these out.
 2014-01-17 14:28:01 -08:00
Chris Rebert 47ff60426d add Issues & Releases links back to footer 2014-01-15 17:29:54 -08:00
Julian Thilo fa052c9659 Fix footer links 2014-01-16 00:58:13 +01:00
Chris Rebert 53bcb829bb move Community & Translations docs sections from About to Getting Started 2014-01-15 15:34:10 -08:00
Mark Otto edd0b97be5 Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md. 2014-01-14 15:52:40 -08:00
Mark Otto f4dd6221d4 Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-01-13 20:01:54 -08:00
Mark Otto bacfd65cb2 Merge branch 'master' into docs_derp 
Conflicts:
	docs/getting-started.html
 2014-01-11 19:13:10 -08:00
Mark Otto e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets 
Conflicts:
	package.json
 2014-01-11 14:48:04 -08:00
Mark Otto ea20f44815 Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/css/docs.css
 2014-01-09 20:33:55 -08:00
Mark Otto 04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Chris Rebert db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert 39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
XhmikosR f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
Chris Rebert c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Mark Otto 9421f0af82 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
 2014-01-05 23:23:55 -08:00
Mark Otto 70459c1454 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_includes/footer.html
	docs/assets/css/docs.css
 2014-01-01 12:27:09 -08:00
Mark Otto 83d26de6d5 Fix broken JS 2013-12-31 17:47:16 -08:00
Mark Otto b253cb2c1e Merge branch 'master' into docs_derp 
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
 2013-12-31 13:53:33 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
Mark Otto a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto 9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto cc63096118 clarify IE support and rearrange getting started docs a bit 2013-07-18 13:05:53 -07:00
Mark Otto e57758cbb4 Drop `.nav-header` for `.dropdown-header` 
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
 2013-07-17 23:54:09 -07:00
Mark Otto d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -07:00
Mark Otto 3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -07:00
Mark Otto 6be1f9d00f remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
Mark Otto 97cdb4215a link order 2013-07-17 20:44:55 -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
Mark Otto f4b9938d8c Move license FAQs to the docs, add link to side nav 2013-07-17 19:20:08 -07:00
Julian Thilo 88d76e386f Dustin the docs again 
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
 2013-07-09 15:32:28 +02:00
Mark Otto 817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05: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 8cd5d0be71 add docs callout for glyphicons on homepage and CSS page 2013-06-27 19:22:11 -07:00
Mark Otto e5a9a1f5ff remove icons from sidenav 2013-06-27 18:49:37 -07: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
Tom Pietschker 9d43fbb57e Remove the offcanvas js from the footer 
This was moved inline in 65ad52060e
 2013-06-21 10:03:28 -04: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 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 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 eb21410cc8 add new grid subnav link 2013-06-08 18:36:29 -02:30
Mark Otto 3160bd872e rearrange customizer content 2013-05-23 21:34:32 -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
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 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 c072b6b2fc remove dumb assets update makefile wassup 2013-05-16 18:34:51 -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
marsuboss 4eeebe7e06 Fix 2013-05-13 15:50:02 +03:00
Mark Otto 562483b907 more nav twerks for getting started page 2013-05-09 17:32:39 -07:00
Mark Otto 7a7971d6db subnav for icons section 2013-05-09 14:08:06 -07:00
Mark Otto 7fa6ae578b Update getting started page 2013-05-09 11:40:39 -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
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 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 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
William Ghelfi 9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
Mark Otto c0e23ad27b nuke the unused navbar that was leftover 2013-05-07 20:48:37 -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
Stephen Edgar 1a6dbc371e 'docs' folder .editorconfig code guide updates 2013-04-23 17:40:41 +10:00
wangshishuo 5892cea207 change nav's #tables-hover to #tables-hover-rows 2013-04-17 12:27:30 +08:00
Mark Otto 5f88887c7e redo all the things 2013-04-14 12:49:35 -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 93db7c2c74 more link fixing 2013-04-01 11:14:11 -07:00
Mark Otto 9df6dc81b5 bring in customizing bootstrap section from old gist 2013-04-01 00:02:51 -07:00
Mark Otto e560c41ed1 simpler nav links 2013-03-30 17:06:59 -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 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 bd69269426 more component nav updates 2013-03-30 13:09:56 -07:00
Mark Otto af470f4c7b more content and nav twerks 2013-03-30 01:06:50 -07:00
Mark Otto 49ebf542a2 reorder docs 2013-03-30 00:19:05 -07:00
Mark Otto 3359b8d5f6 nav change to go with that 2013-03-29 23:37:55 -07:00
Mark Otto 8814125259 Add subnav support to CSS section 2013-03-29 23:33:08 -07:00
Mark Otto 3278c40631 move nav into partial; rejigger content some more 2013-03-28 03:06:00 -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 fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -07:00
Mark Otto 2a0fb08fad getting started as navbar link label 2013-03-15 21:23:59 -07: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 ba633949dc customize navbar in docs 2013-02-28 23:36:54 -08: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 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 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 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 979ca4ea7a Convert JS page to pygments; nuke prettify assets 2013-02-14 22:33:26 -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