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

4018 Commits

Author SHA1 Message Date
Mark Otto
11a835f566 Merge branch 'master' into equal-height-experiment 2014-04-08 20:51:56 -07:00
Mark Otto
f159ce8b9e Fixes #13208: Drop <b> for <span> in code snippets and examples 2014-04-07 22:59:37 -07:00
Mark Otto
bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
Mark Otto
818a50e2ea Merge pull request #13284 from chasingtheflow/master
Fixed typo in Responsive Tables CSS docs
2014-04-06 20:16:56 -07:00
Julian Thilo
58e6af3988 #12790: Add link to unofficial Italian translation 2014-04-06 02:21:44 +02:00
Billy Matthews
fce0254b2a Fixed typo in Responsive Tables CSS docs 2014-04-05 18:33:57 -04:00
Chris Rebert
d56026d489 fix grammar in "Underlined text" example 2014-04-04 10:25:22 -07:00
Julian Thilo
fa9e541f5e Re-implement Universal Analytics
X-Refs:
b2a67ffe55
c97e6d5cad
2014-04-04 10:28:45 +02:00
Heinrich Fenkart
b94306d29b Replace $.fn.bind with $.fn.on in alert docs 2014-04-04 02:46:19 +02:00
Chris Rebert
8ca182876d customizer: squelch error when can't save Gist 2014-04-03 17:02:10 -07:00
Chris Rebert
4c049e3600 Merge pull request #13260 from twbs/doc-12651
document that label.active on preselected inputs in btn-groups is manual
2014-04-03 14:45:31 -07:00
Chris Rebert
1c19284a38 doc how to change the collapsed mobile navbar breakpoint; fixes #13126 2014-04-03 13:31:55 -07:00
XhmikosR
4c2626fecb Run grunt. 2014-04-03 10:53:44 +03:00
Chris Rebert
2d1d5754f7 document that you have to add .active yourself on prechecked btn-ized checkboxes+radios; fixes #12651 2014-04-02 20:00:52 -07:00
Chris Rebert
640923eb36 help avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252 2014-04-01 13:04:43 -07:00
XhmikosR
8c95ff748f Run grunt. 2014-04-01 08:26:47 +03:00
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
Tyler Cipriani
0907244256 Modal body shift fix for IE10/11
Closes #13103 by merging it.
2014-03-28 23:45:22 -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
Chris Rebert
b5ae8f9722 grunt update-shrinkwrap build-customizer dist 2014-03-28 11:19:22 -07:00
Chris Rebert
07314b5475 enhance customizer to handle transitive Less @import-s 2014-03-28 11:12:28 -07:00
Chris Rebert
1853e31a10 rename generateCustomCSS to generateCustomLess for accuracy 2014-03-28 11:12:28 -07:00
Chris Rebert
e8551d4f50 grunt dist 2014-03-28 11:00:39 -07:00
Chris Rebert
5458134f5e Add Gist & Customizer URLs to customized files & config.json
Fixes #9951
Fixes #12865
2014-03-28 10:58:32 -07:00
Julian Thilo
440cedeed3 Fix HTML errors 2014-03-28 13:03:22 +01:00
Julian Thilo
90902db50c Fix tooltip viewport example
- Move example to correct location docs/examples/
- Move custom JS and CSS into stand-alone files
- Update headers and footers
- Copy-editing
2014-03-28 12:48:19 +01:00
XhmikosR
8d3e987420 Merge pull request #13194 from twbs/normalize.css-3.0.1
Update normalize.css to v3.0.1
2014-03-28 07:18:10 +02: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
10586bf040 Run grunt. 2014-03-27 08:02:51 +02: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
Mark Otto
ff0a33ab8c cleanup svg 2014-03-24 23:57:38 -07:00
Mark Otto
e5c2531a16 fixes #13026: Document more Bootstrap components in the Theme and RTL examples 2014-03-24 23:29:11 -07:00
Mark Otto
488c6b43ed grunt 2014-03-24 21:16:07 -07:00
Mark Otto
acf5707323 Fixes #13066: Add z-index to the form control feedback icons so input groups don't render on top of them 2014-03-24 20:07:54 -07:00
Mark Otto
b4f4c7b16f Fixes #13037: add text-align: left; to prevent alignment change in dropdowns 2014-03-24 20:02:56 -07:00
Mark Otto
6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto
bc250fb1e7 grunt 2014-03-24 19:41:20 -07:00
Mark Otto
ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto
6f6bce5944 Fixes #13141: Add a max-width: 100%; to label elements so IE8 wraps text 2014-03-24 19:26:41 -07:00
Mark Otto
5c2a9fc9c3 Fixes #13158: add link to nonresponsive docs in the example 2014-03-24 19:13:29 -07:00
Mark Otto
c6648d58f0 grunt 2014-03-24 19:09:30 -07:00
Mark Otto
8198bbad2a Merge branch 'master' of github.com:twbs/bootstrap 2014-03-24 19:08:17 -07:00
Mark Otto
21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Zlatan Vasović
8ae48183b2 Fix #13138: use underscore prefix to ignore directories 2014-03-24 21:47:59 +01: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
XhmikosR
4fb1fdbf74 Update JSZip to v2.2.0. 2014-03-23 08:10:00 +02:00
Ben Ogle
8534e12523 Add tooltip viewport option, respect bounds of the viewport 2014-03-21 11:28:13 -07:00
Chris Rebert
a7bc66fc20 Merge pull request #13101 from twbs/ie8-responsive-file-warning
Move ie8-responsive-file-warning.js one dir up.
2014-03-20 01:22:53 -07:00
Chris Rebert
0dc88edeb9 grunt dist 2014-03-20 01:16:01 -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
Lewis Cowper
4e2b92f310 [trivial] Updated dates 2014-03-18 00:18:01 +00:00
Julian Thilo
1b15cefa5c Generate Translations list from YAML 2014-03-17 21:55:39 +01:00
XhmikosR
1e41df6b69 Move ie8-responsive-file-warning.js one dir up.
This is a regression of d08bbdc6ec.
2014-03-17 17:49:27 +02: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
Chris Rebert
cb3f3926d7 Mozilla is trying to fix the <input> line-height bug; Yay!
See https://bugzilla.mozilla.org/show_bug.cgi?id=697451#c43
2014-03-17 01:53:20 -07:00
Chris Rebert
e87c272ab4 more precise description of browser bug 2014-03-17 01:49:32 -07:00
Chris Rebert
910ff24b4b regenerate customize.min.js 2014-03-16 22:37:32 -07:00
Chris Rebert
1ff6d33aa8 use @ssorallen's blob support test in customizer; fixes #12617 2014-03-16 22:37:31 -07:00
Mark Otto
b3f30bb70e grunt 2014-03-16 20:46:00 -07:00
Mark Otto
43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
Mark Otto
b004c9ac39 Rename and organize nav partials for cleaner file structure 2014-03-16 19:32:08 -07:00
Mark Otto
b7ab799824 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/js/bootstrap.min.js
	docs/dist/js/bootstrap.min.js
2014-03-16 19:06:17 -07:00
Mark Otto
2a43e7e78a Break up docs into includes 2014-03-16 19:03:53 -07:00
fat
dd7cab84f6 build 2014-03-16 18:44:58 -07:00
Mark Otto
bdb70fa471 Fixes #13055: Mention outdenting more 2014-03-16 15:54:28 -07:00
Mark Otto
96344acb31 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-16 15:42:25 -07:00
Zlatan Vasović
17812b450c Add missing blank line 2014-03-15 22:40:51 +01:00
Mark Otto
d787cffc5a relative not absolute 2014-03-15 14:39:56 -07:00
Mark Otto
acd8ba5816 Merge pull request #13039 from twbs/dropdown-pull-right-deprec
comply with .dropdown-menu.pull-right deprecation in docs
2014-03-12 15:58:19 -07:00
XhmikosR
d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
Chris Rebert
4c76c79213 comply with .dropdown-menu.pull-right deprecation in docs 2014-03-12 10:19:52 -07:00
Mark Otto
b136d42ba5 Merge pull request #13024 from twbs/role-alert
add role="alert" to Alert examples, to improve accessibility
2014-03-12 10:18:07 -07:00
Chris Rebert
08f470ea68 rework docs copy: inputs-without-labels are likely the more common case 2014-03-12 10:11:02 -07:00
Chris Rebert
4277ba62d3 add role="alert" to Alert examples, to improve accessibility
Per d8fcbcd3fe/README.md (alert)
2014-03-11 19:41:54 -07:00
XhmikosR
f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +02:00
ORiON-
3ea69a16f9 Fixed typo at docs/examples/rtl/index.php
The filename generated at dist/css/ called 'bootstrap-rtl.min.css'.
2014-03-11 18:42:49 +02:00
Mark Otto
6f13a14e4b moar grunt 2014-03-10 16:51:53 -07:00
Mark Otto
74c391b9ad Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 16:43:01 -07:00
Mark Otto
a83ca38713 Fixes #13003: Move padding on radio and checkbox options from the surrounding div to the label to remove the no-click deadzone caused by negative margin 2014-03-10 16:41:56 -07:00
Mark Otto
552f170e3c even more grunt 2014-03-10 13:31:34 -07:00
Mark Otto
3fb5d0bbac Merge branch 'master' into modular-the-mixins 2014-03-10 13:21:56 -07:00
Julian Thilo
6234ba561a Merge pull request #13002 from ZDroid/hash
Add missing customizer comment
2014-03-10 11:08:56 +01:00
Zlatan Vasović
1a417357ad Add missing customizer comment 2014-03-10 08:35:50 +01:00
Mark Otto
a36643dd33 Merge branch 'master' into modular-the-mixins
Conflicts:
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
2014-03-10 00:08:29 -07:00
Mark Otto
564b79ca87 grunt 2014-03-09 23:58:29 -07:00
mrmrs
38d0908aff Add recompiled assets after nuking toc in mixins.less. 2014-03-09 23:51:38 -07:00
mrmrs
b0bc9ef815 Add consistent newline at end of files in less/mixins 2014-03-09 23:44:11 -07:00
mrmrs
2f380a9683 Merge branch 'master' into modular-the-mixins
* master:
  Replace some images on the Carousel example with some base64 encoded 1x1 gifs
  ugh grunt
  moar grunt
  mo copy
  http://www.youtube.com/watch?v=AJWtLf4-WWs
  grunt
  Copy change
  fix grammar in comment in forms.less
  Fixes #12759
  Fixes #12738
  replace .visible-{size} with .visible-{size}-{display} ; fixes #8869

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/mixins.less
2014-03-09 23:28:08 -07:00