0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

141 Commits

Author SHA1 Message Date
Mark Otto
5b02dbd97a Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
2013-12-26 21:40:15 -08:00
XhmikosR
3d65fc2b65 Update Respond.js to v1.4.2. 2013-12-24 09:22:53 +02:00
Mark Otto
0bd5bca695 Fixes #11975: Change from png to .ico for favicon 2013-12-23 15:16:25 -08:00
Mark Otto
176e35d33d rework downloads to simplify and add sass 2013-12-21 13:40:42 -08:00
Mark Otto
16ff01f629 remove dat 2013-12-21 11:17:39 -08:00
Mark Otto
02c40ab991 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
	components.html
2013-12-21 11:17:29 -08:00
Mark Otto
c66924cc1b add section for contents 2013-12-21 10:36:20 -08:00
Mark Otto
bb644eede6 Team members on About page 2013-12-21 10:08:04 -08:00
Mark Otto
033476ccc7 more Less 2013-12-20 21:19:45 -08:00
Mark Otto
66c280c855 Sass docs; LESS to Less because fuck caps 2013-12-20 21:02:25 -08:00
Mark Otto
07705673b6 Merge branch 'master' into docs_derp
Conflicts:
	_layouts/default.html
2013-12-18 16:19:46 -08:00
Mark Otto
1d0aa6e45c more docs 2013-12-18 13:40:29 -08:00
Mark Otto
6315043b1c Merge branch 'master' into docs_derp 2013-12-18 11:41:48 -08:00
wangsai
98ef4284f0 fix href of "Browser and device support" 2013-12-18 16:57:55 +08:00
Mark Otto
b6b2c90a7d Merge branch 'master' into docs_derp 2013-12-16 00:39:50 -08:00
Mark Otto
2979e4bcea Add new form feedback states, clean up existing form styles
New stuff:

* Adds `.has-feedback` and `.form-control-feedback` to show icon-based
form feedback to users. Fixes #11836.
* Removes the `width: 1em` on `.glyphicon` because it makes it
impractical to resize the width of all icons, even if they’re not
“empty” (e.g., a simple `.glyphicon { width: 30px; }` wouldn’t work,
nor would a class preceeded by a parent class.

Clean up:

* Sets `width: auto;` on all `.form-control`s within inline forms.
* Removes all the inline `select` menu `width` styles because all
inputs are now `auto`.
* Update form states docs to separate out sections better.
2013-12-15 17:15:09 -08:00
Mark Otto
a925a0b985 Browser/device support docs update
* Fixes #11055: add mention of select menu styling on Android stock
browsers with included optional fix
* Update IDs and docs nav to include bookmark links to each section
* Add callout to navbar docs about fixed position, inputs, and virtual
keyboard
2013-12-15 12:27:46 -08:00
Mark Otto
072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto
d79431ca02 Document new modal sizes 2013-12-14 16:29:55 -08:00
Mark Otto
f1869771bc Fixes #10505: Document more of LESS vars and mixins 2013-12-14 14:18:43 -08:00
Mark Otto
885d14b042 move icons to partial 2013-12-12 15:21:34 -08:00
Mark Otto
da24a3e118 typo 2013-12-12 10:28:37 -08:00
Mark Otto
4fc2907723 Merge branch 'master' into docs_derp
Conflicts:
	docs-assets/css/docs.css
	docs-assets/js/application.js
2013-12-11 22:39:03 -08:00
Mark Otto
0e8baab34a more homepage and sidenav overhaul 2013-12-11 22:37:59 -08:00
Julian Thilo
bab736c7d7 Fix typo in new author meta tag 2013-12-08 22:39:29 +01:00
Mark Otto
6273604601 Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
2013-12-07 20:52:51 -08:00
Mark Otto
a9b86cbfde Merge branch 'pr/11138'
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
2013-12-07 14:10:41 -08:00
Mark Otto
07de53c644 Contextual list group cleanup
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
2013-12-07 14:09:03 -08:00
Mark Otto
b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto
cc1f95652b Merge branch 'master' of github.com:twbs/bootstrap 2013-12-07 11:41:02 -08:00
Mark Otto
775c29fef6 Fixes #11764: Add meta data to docs for description, keywords, and authors 2013-12-07 11:40:08 -08:00
Zlatan Vasović
8087f95ca4 Load minified Bootstrap JS code 2013-12-07 10:27:28 +01:00
XhmikosR
3de4f23ea2 Minify docs-assets too. 2013-12-06 11:25:29 +02:00
Mark Otto
a127f3921e Fixes #10716: Update what's included docs to add info on both download options 2013-11-30 21:05:39 -08:00
Mark Otto
37f3944bd9 finish up moving content, tweaking styles 2013-11-22 18:45:38 -05:00
Mark Otto
b593df1830 docs derp 2013-11-06 11:00:39 -08:00
Ross Allen
18318b81b0 Add async attribute to Twitter widget script 2013-11-05 07:39:50 -10:00
Ross Allen
68fc2f2515 Add protocol for jQuery to work when accessed as file
URLs without protocols get "file:" prepended when their document is
loaded as a file. Make sure the docs can always be opened by
specifying a protocol.
2013-11-05 07:23:58 -10:00
Ross Allen
4f5a865684 Load Twitter widget async, prevent SPOF
Twitter's widget library[1] provides an async snippet to inject the
script tag later. Since widgets.js came before the local JS, if
twitter.com took long to respond it would prevent subsequent
synchronous script tags.

[1] https://dev.twitter.com/docs/tfw-javascript
2013-11-04 22:17:05 -10:00
Ross Allen
38d6894910 Serve jQuery from cookie-free Google APIs
jQuery.com uses Google Analytics and so sets a cookie when you visit
the site. When you request jquery.js from its CDN, code.jquery.com,
you take a hit from sending your previous GA cookie in the request.

Google Hosted Libraries[1] and googleapis.com never set cookies.

[1] https://developers.google.com/speed/libraries/devguide
2013-11-04 22:11:57 -10:00
Chris Rebert
c23d6a2766 Warn about IE8 + Respond.js + file:// problem in examples; fix #11019 2013-10-17 18:39:03 -07:00
Chris Rebert
cf95fe20ba upgrade to html5shiv v 3.7.0 2013-10-16 15:36:37 -07:00
Mark Otto
6307d2c94d Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	getting-started.html
2013-10-14 11:06:25 -07:00
Mark Otto
1f5c754d57 remove dupe content 2013-10-14 11:05:49 -07:00
Chris Rebert
3abe86b7ed Merge pull request #11076 from twbs/respond-js-cdn
use CDN for respond.js
2013-10-13 23:26:28 -07:00
Mark Otto
202f395b2f Merge branch 'docs_welcome' 2013-10-13 23:19:17 -07:00
Mark Otto
25607c2683 add translations, copy edit a few things, and fix alignment of ads 2013-10-13 23:19:11 -07:00
Chris Rebert
c5da0597bc use CDN for respond.js 2013-10-13 23:18:30 -07:00
Mark Otto
265fda7903 Merge branch 'master' into restore_grid_mixins
Conflicts:
	dist/css/bootstrap.min.css
2013-10-13 18:32:34 -07:00
Mark Otto
49f177fe60 finish grid docs intro for now; needs work though 2013-10-13 17:12:04 -07:00