rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
9,681 Commits 108 Branches 89 Tags 552 MiB
6ed9912209
Commit Graph

4331 Commits

Author SHA1 Message Date
Chris Rebert
42c8daea75 Not Less' fault per se 2014-05-01 11:45:48 -07:00
Chris Rebert
99f22d97ba Merge pull request #13434 from twbs/fix-13247 
document grid column wrapping behavior; fixes #13247
 2014-04-30 20:16:30 -07:00
Chris Rebert
f793853609 document grid column wrapping behavior; fixes #13247 2014-04-30 20:15:46 -07:00
Mark Otto
4c3ef52fc1 Merge branch 'pr/13320' 
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-04-30 19:48:22 -07:00
Mark Otto
108b7c390e grunt dist 2014-04-30 19:47:56 -07:00
Mark Otto
a80eb1eb50 explain 2014-04-30 19:47:50 -07:00
Mark Otto
b217357252 grunt dist 2014-04-30 19:35:47 -07:00
Mark Otto
abc797696d Merge pull request #13437 from saas786/master 
fixes #13367
 2014-04-30 17:26:37 -07:00
XhmikosR
2c1fe5374e Merge pull request #13424 from twbs/docs-libs 
Update docs libs
 2014-04-30 08:00:21 +03:00
Patrick H. Lauke
7026c9626a Remove sr-only from components/dropdowns example 
Assuming sr-only is used in the actual live code so that the menu can be
shown open already ... but having sr-only in the highlighted example
code itself is confusing/misleading.

Also, change the text for the button from "Dropdown" to "Dropdown
trigger" for clarity (and it then matches
http://getbootstrap.com/javascript/#dropdowns)
 2014-04-29 20:52:35 +01:00
Chris Rebert
bde5f1fe9f Merge pull request #13422 from twbs/ie-emulation-modes-warning 
Warn about IE emulation modes in docs+examples
 2014-04-27 22:29:14 -07:00
Chris Rebert
a84a3693b1 add ie-emulation-modes-warning.js to docs & examples 2014-04-27 22:08:44 -07:00
Chris Rebert
686a45a84b Merge pull request #13435 from twbs/doc-less-import-glyphicons 
Document that @import-ing Bootstrap can break the icon font path
 2014-04-27 20:45:35 -07:00
XhmikosR
30b07b942e Run grunt. 2014-04-26 08:35:48 +03:00
XhmikosR
ab1087f6e5 Update holder.js to v2.3.2. 2014-04-26 08:35:48 +03:00
XhmikosR
f2eff55064 Update JSZip to v2.2.1. 2014-04-26 08:35:47 +03:00
syed
43b6d6c2f8 fixes https://github.com/twbs/bootstrap/issues/13367 
Second color stop value should be percentage instead of decimal value.
 2014-04-26 09:44:14 +05:00
Chris Rebert
05d4932cad Merge pull request #13396 from twbs/carousel-events 
Carousel event properties
 2014-04-25 19:35:38 -07:00
Chris Rebert
31f01c1abb Document that @import-ing Bootstrap can break the icon font path 
Addresses part of #13429.
 2014-04-25 12:02:16 -07:00
Chris Rebert
d42b1a2d2d fix #13427 2014-04-25 10:43:59 -07:00
Daijiro Wachi
485b7d0940 Fixed navbar radius of example at docs 2014-04-26 02:04:07 +09:00
Chris Rebert
e0d1e406d3 Merge pull request #13423 from twbs/fix-13362 
document that show-ing a tooltip/popover on a hidden element doesn't work
 2014-04-24 19:16:09 -07:00
Chris Rebert
937ef4824e remove semicolons :'-( 2014-04-24 19:14:06 -07:00
Chris Rebert
d4728b8c6d add script to warn folks trying to test old IE using IE's unreliable emulation modes 2014-04-24 19:14:06 -07:00
Chris Rebert
6617d8bcd1 Document .direction & .relatedTarget properties of Carousel events. 
Fixes #13395
 2014-04-24 19:02:47 -07:00
Mark Otto
fe11ac77a2 Merge pull request #13390 from twbs/ie10-viewport-bug 
add IE10 viewport bug workaround to examples
 2014-04-24 18:50:30 -07:00
Mark Otto
0e48cb2f93 Merge pull request #13374 from Jakobovski/fix-issue-#13355 
FIX: #13355. Added .navbar-nav to migration change list.
 2014-04-24 18:41:23 -07:00
Chris Rebert
9c25f5c06e document that show-ing a tooltip/popover on a hidden element doesn't work; fixes #13362 2014-04-24 18:06:59 -07:00
Chris Rebert
aca859a13f Merge pull request #13397 from twbs/fix-13394 
document that non-:visible scrollspy targets are ignored
 2014-04-23 14:44:22 -07:00
Quy Ton
f6f74b5445 Add missing word. 2014-04-23 07:10:38 -07:00
Chris Rebert
6161c98238 document that non-:visible scrollspy targets are ignored; fixes #13394 2014-04-21 16:42:22 -07:00
XhmikosR
52b6a32145 Use the new respond.js URL. 2014-04-21 19:12:43 +03:00
XhmikosR
a549e8c332 Update html5shiv to v3.7.1. 2014-04-21 19:11:23 +03:00
Chris Rebert
eaddbd92bb grunt dist 2014-04-20 16:19:13 -07:00
Chris Rebert
448086f95a add IE10 viewport bug workaround to examples 
Closes #13379.
 2014-04-20 16:09:49 -07:00
XhmikosR
e0c3ae6133 Merge pull request #13151 from twbs/customizer-uglifyjs2 
Customizer: switch to UglifyJS2
 2014-04-21 01:35:17 +03:00
Chris Rebert
a6214273b9 quote attribute value in selector in JS docs example 2014-04-19 17:42:06 -07:00
Chris Rebert
96e2f9332b quote attribute value in selector in offcanvas.js 2014-04-19 17:38:00 -07:00
Chris Rebert
ad1e1eb026 Merge pull request #13373 from twbs/fix-13360 
Make variable deprecation notices visible in customizer
 2014-04-18 18:56:31 -07:00
Chris Rebert
e9f0bed44d quote data-* attribute value in docs JS per best-practices 2014-04-18 18:53:05 -07:00
jackson
042f9e6e9a FIX: #13355. Added .navbar-nav to migration change list. 2014-04-17 21:35:55 -05:00
Chris Rebert
573ad10a9d fix #13337 by mentioning removal of .progress-* contextual classes 2014-04-17 19:08:46 -07:00
Chris Rebert
98acc69219 fix #13360 by making deprecation notices visible in customizer 2014-04-17 18:43:05 -07:00
Chris Rebert
99b5405c7f Merge pull request #13358 from Jakobovski/docs-improvements-#13332 
Added specificity note to docs per issue #13332
 2014-04-17 18:29:14 -07:00
Mark Otto
c8a8e76851 fixes #13365: remove dupe css in grid example 2014-04-17 01:08:54 -07:00
Mark Otto
06fb9406bd grunt dist 2014-04-17 00:56:22 -07:00
jackson
ca45998fc9 Fixed typo and added leading space 2014-04-16 12:39:29 -04:00
jackson
1d77660c62 Added specificity note to docs per issue #13332 2014-04-16 11:29:36 -04:00
Chris Rebert
aec366c591 fix #13340 by documenting @icon-font-path & @icon-font-name more 2014-04-15 20:03:44 -07:00
Cecchi MacNaughton
f18bff0a7c Add nested kbd element styles for actual keys or inputs 2014-04-15 14:12:39 -07:00
Sean Dwyer
458cb6944b Add documentation for using optional icons with sr-only labels 2014-04-11 15:30:51 -07:00
Chris Rebert
ee7498a693 grunt dist 2014-04-09 12:07:27 -07:00
XhmikosR
1267a9a02b Run grunt. 2014-04-09 10:16:56 +03:00
XhmikosR
2c16b3151c Add the license header in the non minified build too. 2014-04-09 10:15:02 +03:00
XhmikosR
7950c0ff0a Add the jquery check in customizer's output. 2014-04-09 10:15:02 +03:00
XhmikosR
3f90763995 Customizer: switch to UglifyJS2 (v2.4.13). 
The uglify build is generated with `uglifyjs --self -o uglify.min.js`.
 2014-04-09 10:15:02 +03:00
XhmikosR
2f0f8ec6d1 Run grunt dist. 2014-04-09 10:02:34 +03:00
XhmikosR
45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Mark Otto
de86b36b50 grunt dist 2014-04-08 23:59:17 -07:00
Mark Otto
5d78200a66 the space between spaces 2014-04-08 21:07:05 -07:00
Mark Otto
3424195e64 add screenshot 2014-04-08 21:04:02 -07:00
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
Mark Otto
fed2b0f7eb nav cleanup and responsiveness 2014-03-18 13:01:50 -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
Mark Otto
35ddc8427e revamp all the things 2014-03-17 02:03:16 -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
mrmrs
348b7de7f7 Break mixins.less up into smaller modules. 
Move all deprecated vendor prefix mixins to less/mixins/vendor-prefixes.less
Create mixins directory and move partials to that directory.

FIXES #12994
 2014-03-09 23:18:48 -07:00
Mark Otto
e727973d8c Merge pull request #12204 from twbs/fix-8869 
replace .visible-{size} with .visible-{size}-{display}
 2014-03-09 22:48:57 -07:00
Mark Otto
309ef72ef4 Replace some images on the Carousel example with some base64 encoded 1x1 gifs 2014-03-09 22:38:13 -07:00
Mark Otto
a7b0fa7ebf ugh grunt 2014-03-09 22:28:29 -07:00
Mark Otto
213860408e moar grunt 2014-03-09 22:19:02 -07:00
Mark Otto
72837b11e3 mo copy 2014-03-09 22:10:58 -07:00
Mark Otto
7bef778c48 http://www.youtube.com/watch?v=AJWtLf4-WWs 2014-03-09 22:06:51 -07:00
Mark Otto
30deb5697c grunt 2014-03-09 22:06:14 -07:00
Mark Otto
76883ff9b4 Copy change 2014-03-09 22:06:12 -07:00
Mark Otto
ccb17f110d Merge branch 'master' into fix-8869 2014-03-09 22:01:38 -07:00
Mark Otto
a15c24410b Fixes #12759 
Ensures proper sizing and alignment of input groups within inline and
navbar forms.

* Uses `inline-table` on the input group
* Nukes the widths to `width: auto`—without this, the parent input
group doesn’t size correctly and functions as `display: table;` or
`block`
 2014-03-09 21:25:51 -07:00
Mark Otto
b4d66b7f6b Fixes #12738 
* Removes default max-height from .navbar-collapse (so not every navbar
will get a max-height collapse section)
* Scopes regular 340px max-height to fixed top and bottom navbars only
(those are the only ones that really need a max-height to enable
scrolling)
* Adds a landscape media query for phones to cap the max-height at
200px for fixed navbars"
 2014-03-09 20:45:32 -07:00
Mark Otto
1a5fb4ef24 Fixes #12843: Scope label styles for horizontal forms to a media query so their narrow viewport display looks just like a normal form 2014-03-09 17:22:52 -07:00
Mark Otto
2f955907f9 Fixes #12669: Properly reset line-height on date inputs for all sizes; Fix IE8+'s misaslignment of text within date inputs 2014-03-09 17:12:39 -07:00
Mark Otto
b69e4d636a Reorganize mixins and G R U N T 2014-03-09 16:50:30 -07:00
mrmrs
0b415c6099 Merge branch 'master' into mixin-table-of-contents 
* master:
  Fix bad grunt merge and then G R U N T
  Reorder the Gruntfile a bit
  Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube
  Remove unneeded quotes.
  Rename generateRawFilesJs to generateRawFiles
  Remove redundant parens

Conflicts:
	docs/assets/js/raw-files.min.js
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-09 16:40:40 -07:00
mrmrs
71e9902d9a Adjusts some section titles to be more explicit. 
FIXES #12992
 2014-03-09 16:25:27 -07:00
Mark Otto
4883605624 Fix bad grunt merge and then G R U N T 2014-03-09 16:15:53 -07:00
mrmrs
fc74ee5f67 Changes compiled assets after changing mixins.less 2014-03-09 16:15:35 -07:00
XhmikosR
68b3e3f3be Merge pull request #12986 from twbs/unneeded-quotes 
Remove unneeded quotes.
 2014-03-10 01:07:14 +02:00
Mark Otto
aacafb2d5c Fixes #12892: Link to one of the SO articles on Bootstrap modals and YouTube 2014-03-09 16:03:46 -07:00
Mark Otto
15d4494038 Moves IE8 justified button border mention to docs section, not the browser bugs page /cc @cvrebert 2014-03-09 15:32:36 -07:00
Mark Otto
4d870af2aa Fixes #12487: Document required use of position relative for scrollspy 2014-03-09 15:19:26 -07:00
Mark Otto
ce634a0ba7 Document shitty situation of multiple .navbar-right classes in #12951 2014-03-09 14:49:52 -07:00
Mark Otto
9920251ca8 Document #12476 bug in the wall of bugs 2014-03-09 14:17:18 -07:00
Mark Otto
27da9728bc grunt 2014-03-09 13:50:55 -07:00
Mark Otto
d8bc65b9d0 Merge branch 'master' into sr-only-focusable 2014-03-09 12:32:13 -07:00
XhmikosR
9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
Mark Otto
54b35d00a4 document position relative firefox bug; cleanup some stuff in the browser bugs page 2014-03-08 20:53:16 -08:00
Mark Otto
ef5d8e98e2 Merge branch 'master' into sr-only-focusable 
Conflicts:
	dist/css/bootstrap.css
 2014-03-08 20:34:29 -08:00
Mark Otto
b8ab0c66ac grunt 2014-03-08 20:03:31 -08:00
fat
4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
Mark Otto
74aab91671 grunt 2014-03-08 19:32:40 -08:00
fat
e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto
4b6e1b6754 grunt dist 2014-03-08 17:40:58 -08:00
Mark Otto
7c3881086f Fix comment 2014-03-08 17:11:48 -08:00
Mark Otto
bcfb27b962 grunt 2014-03-08 16:11:24 -08:00
Mark Otto
03701b8d4b Fixes #12966: Ensure icon font vars are loaded into Customizer 2014-03-08 15:32:24 -08:00
Mark Otto
67c747a109 grunt 2014-03-08 15:30:18 -08:00
Mark Otto
30bbab06d8 Merge pull request #12962 from BBosman/transitions-count 
Add transition-timing-function mixin to docs
 2014-03-07 14:52:41 -08:00
Chris Rebert
0d0cbb87ee rm #1969 from browser bugs list per outcome of investigation 2014-03-07 11:08:05 -08:00
Zlatan Vasović
d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
Bas Bosman
acdc053ee3 Add transition-timing-function mixin to docs 2014-03-07 11:28:48 +01:00
Mark Otto
0b8d27a125 fix derped html 2014-03-07 01:30:38 -08:00
Mark Otto
0143e38a67 Merge branch 'master' into document_popover_focus 
Conflicts:
	docs/assets/js/docs.min.js
 2014-03-07 01:30:28 -08:00
Mark Otto
e25dacba14 Merge branch 'master' into typography-example-updates 
Conflicts:
	docs/assets/js/customize.min.js
 2014-03-07 01:10:16 -08:00
Mark Otto
ac4dd30460 G R U N T G R U N T 2014-03-07 01:08:29 -08:00
mrmrs
d1d5d90413 Fixes #12748 2014-03-07 00:59:22 -08:00
Mark Otto
d44e98b34d G R U N T 2014-03-07 00:50:28 -08:00
Mark Otto
fe0d5959d2 Merge branch 'master' of github.com:twbs/bootstrap 2014-03-07 00:28:29 -08:00
Mark Otto
5bd2799978 G R U N T 2014-03-07 00:26:38 -08:00
XhmikosR
24ec60e6e5 Merge pull request #12931 from twbs/line-endings 2014-03-07 10:24:32 +02:00
Mark Otto
c03b8f1f0f Merge branch 'master' into pr/12670 2014-03-07 00:23:52 -08:00
Mark Otto
6452b409aa grunt for days 2014-03-07 00:23:22 -08:00
XhmikosR
6a3faa6ab3 Normalize line endings 2014-03-07 10:22:57 +02:00
Mark Otto
164b41b28d Fixes #12937: Darken active button states just a smidge more 2014-03-07 00:19:26 -08:00
Bas Bosman
cb7eb674ac Add autoprefixer 2014-03-07 09:01:54 +01:00
Mark Otto
84a7431dfd add responsive embed to customizer 2014-03-06 23:19:16 -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
7e299c6a49 Fixes #12683: Remove the overflow: hidden; from the .panel-group > .panel because it apparently serves no purpose and cuts off nested dropdown menus. 2014-03-06 22:32:21 -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
fab10b643e Merge branch 'master' of github.com:twbs/bootstrap 2014-03-06 21:26:48 -08:00
Mark Otto
9dc796155c Fixes #12722: Fixes up responsive tables in print 
Safari renders this fine for one reason or another, but Chrome still renders the media query styles to make tables responsive. This change scopes them to screen devices only, so printing looks boss everywhere.
 2014-03-06 21:25:34 -08:00
Mark Otto
645eebba61 Merge pull request #12894 from lipis/patch-2 
Removed margin-bottom from last p of .blog-footer
 2014-03-06 21:11:00 -08:00
mrmrs
4868096dbd Fixes #12934 2014-03-06 21:05:29 -08:00
Mark Otto
17e41098c8 Fixes #12824: Remove white-space: nowrap from code elements 2014-03-06 20:39:19 -08:00
Mark Otto
8526adf69c grunt 2014-03-06 20:33:10 -08:00
Chris Rebert
421e7af137 add link from Getting Started page to Wall of Browser Bugs page 2014-03-06 15:19:27 -08:00
Chris Rebert
39f8bbac37 add docs page listing relevant outstanding browser bugs 2014-03-06 15:19:27 -08:00
Chris Rebert
af5a219718 fix #12936 2014-03-05 14:17:20 -08:00
XhmikosR
d7dc8a7bd3 Merge pull request #12853 from twbs/jscs 
Switch to JSCS
 2014-03-05 08:42:50 +02:00
Mark Otto
10eb167e35 Fixes #12901: Refactors list group active state for use on non-anchors 2014-03-04 22:42:13 -08:00
Mark Otto
fdbeefff59 nav 2014-03-04 16:56:35 -08:00
Mark Otto
24de9b0994 Fixes #12848: Account for and document progress bars at 0-3% 2014-03-04 16:55:15 -08:00
Mark Otto
e418377b11 Fixes #12697: Document readonly inputs 2014-03-04 15:16:38 -08:00
Mark Otto
a0ac99efbf docs for #12873 2014-03-04 14:48:52 -08:00
Mark Otto
a4df363174 grunt after merging #12917 2014-03-04 14:35:23 -08:00
Mark Otto
026e2f8d30 Grunt after merging #12863 2014-03-04 14:24:09 -08:00
Mark Otto
8f2a787c36 grunt 2014-03-04 14:20:48 -08:00
Mark Otto
7733f24373 Fixes #12868: Enables icon feedback on validation states for large/small inputs. 
Also reorders the CSS to place Glyhpicons as a dependency before other components for fewer overrides and less specific CSS.
 2014-03-04 14:12:57 -08:00
Mark Otto
f45df64670 Fixes #12914: Darken immediate children hr elements in jumbotrons 2014-03-04 13:54:09 -08:00
Mark Otto
64579505d2 Fixes #12916: Don't let .lead resize on viewport change 2014-03-04 13:52:13 -08:00
Mark Otto
5193f9f607 add svg logos to brand guidelines 2014-03-04 13:32:02 -08:00
Mark Otto
caf332080e Merge pull request #12897 from avindra/patch-1 
Fix for stray 1px line under top navigation in Dashboard example
 2014-03-04 11:35:32 -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
Mark Otto
587814f16e Simplify gruntfile more to remove theme RTL 2014-03-03 22:49:43 -08:00
Mark Otto
7e764a29fa grunt 2014-03-03 21:56:40 -08:00
Mark Otto
4dd7b4bd87 Don't RTL the theme file--no need 2014-03-03 21:54:07 -08:00
Mark Otto
af39290a9d Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip 
Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
 2014-03-03 21:52:56 -08:00
Mark Otto
2ece8dd336 Merge branch 'master' into rtl_via_css_flip 2014-03-03 21:50:03 -08:00
Mark Otto
e381635b1f Fixes #12593: Add support for table bodies and table rows to the collapse plugin 2014-03-03 21:39:53 -08:00
Chris Rebert
bd37ea3076 add data-toggle button.js change to migration docs 2014-03-03 14:42:39 -08:00
avindra
80ce694b24 Fix for stray 1px line under top navigation 
If you add an "active" class to one of the <li> elements in the top navigation, and style it so that active tabs have a different color, it becomes clear that there is a 1 pixel stray line under the navigation. This style fixes that.
 2014-03-02 16:19:44 -05:00
Lipis
e872955737 Removed margin-bottom from last p of .blog-footer 2014-03-02 11:03:09 +01:00
XhmikosR
cd134f1ed6 Merge pull request #12864 from twbs/csslint-fix 
Csslint fix
 2014-03-02 09:50:21 +02:00
XhmikosR
e5affbfa0a Run grunt. 2014-03-01 20:58:53 +02:00
XhmikosR
dfb4917493 Update less.js to v1.7.0. 2014-03-01 20:14:49 +02:00
Heinrich Fenkart
7d1fd44b9a Fix small typo in JavaScript docs 2014-02-28 20:11:02 +01:00
XhmikosR
537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02:00
XhmikosR
17722e5ef2 Add sitemap.xml and robots.txt files. 2014-02-27 17:05:52 +02:00
XhmikosR
a7339a0f4c Move csslint overrides in Gruntfile.js. 
This works around https://github.com/gruntjs/grunt-contrib-csslint/issues/26
 2014-02-27 11:39:30 +02:00
XhmikosR
ef49635ae2 Fix csslint errors. 2014-02-27 11:15:53 +02:00
XhmikosR
2ef9f9b213 Run csscomb before cssmin. 2014-02-27 10:52:30 +02:00
XhmikosR
8ff7e64359 Add docs.css in the CSSComb task. 2014-02-27 10:12:52 +02:00
Chris Rebert
f27b864f7b grunt build-customizer-html 2014-02-25 17:28:16 -08:00
XhmikosR
c48042f440 Run grunt dist. 2014-02-26 01:23:52 +02:00
Chris Rebert
e40c1e5e6d add Grunt task for css-flip-ing & add RTL to Gruntfile configs 2014-02-25 10:31:02 -08:00
Mark Otto
b22f064c2e Use CSS Flip to generate RTL variation 2014-02-24 19:22:41 -08:00
Mark Otto
429fc9331e grunt dist 2014-02-24 19:10:23 -08:00
Chris Rebert
a6fb770ebe move grid classes cascade explanation into main grid docs section 2014-02-24 15:10:46 -08:00
Mark Otto
66a229bdbf Fixes #12822: Scope panel collapse styles to immediate panel bodies only 2014-02-22 22:46:03 -08:00
Mark Otto
a083f0deb7 Fixes #12808: Correct grid column values listed in Grid Options 2014-02-22 14:19:00 -08:00
Mark Otto
5791a48db3 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-22 14:16:53 -08:00
Mark Otto
7b60470e9b Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls 2014-02-22 14:16:11 -08:00
hebbet
983265b08a Remove second tbody from Supported browsers 
Removed the second tbody from "Internet Explorer 8 and 9" Table
 2014-02-22 21:49:58 +01:00
Mark Otto
7e551ecaf7 Update modals to use more consistent padding—modal body and footer now match modal header 2014-02-22 12:38:56 -08:00
Mark Otto
4ccf088a24 Merge branch 'master' into pr/12813 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-22 12:20:53 -08:00
Mark Otto
b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs
49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
Chris Rebert
bdd7651e32 replace .visible-{size} with .visible-{size}-{display} ; fixes #8869 2014-02-21 17:44:40 -08:00
Mark Otto
4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
Mark Otto
e7a337a8f1 Merge pull request #12809 from Borkason/patch-1 
Clarify the use of .has-feedback
 2014-02-21 17:18:50 -08:00
Mark Otto
449dd83ec3 Fixes #12735: Fix sidebar hover state in Dashboard example 2014-02-21 15:06:21 -08:00
Mark Otto
f542fcc627 Fixes #12810: Document .container-fluid in the CSS overview docs 2014-02-21 15:03:16 -08:00
Mark Otto
5517f9907e Fixes #12744: Document ability to remove animation on modals 2014-02-21 14:52:15 -08:00
Daniel Niccoli
72565b69c2 Clarify the use of .has-feedback 2014-02-21 16:32:24 +01:00
Chris Rebert
8af1673ab7 change translation docs in light of #11342 & its many dupes 2014-02-19 11:27:16 -08:00
Mark Otto
00b3b8b0b8 Merge pull request #12749 from twbs/pointer-events-note 
Document caveats of `pointer-events: none` usage in btn.disabled
 2014-02-16 20:37:50 -08:00
Chris Rebert
ca02f49013 Safari rounding problem still present as of v7.0.1 for OS X 2014-02-16 12:26:09 -08:00
Chris Rebert
dabb5041a4 Document caveats of pointer-events: none usage in btn.disabled 
Refs #10049
Source for compatibility info: http://caniuse.com/#feat=pointer-events
 2014-02-14 17:14:52 -08:00
XhmikosR
65ffe69bdf Fix customizer.js indentation warnings. 2014-02-14 11:02:03 +02:00
XhmikosR
ff2c506d2b Update less.js to v1.6.3. 2014-02-13 20:54:21 +02:00
Mark Otto
a365d8689c grunt 2014-02-13 09:24:59 -08:00
Mark Otto
385fb68981 grunt 2014-02-13 08:59:03 -08:00
Mark Otto
461404f6be update homepage showcase with three new posts 2014-02-13 01:21:35 -08:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
XhmikosR
d8cfcad7c7 Merge pull request #12710 from ZDroid/customize-multistr 
Fix multistr errors in customizer.js
 2014-02-13 08:53:47 +02:00
Zlatan Vasović
f3735d5b12 Fix scrollspy typo in docs.css 2014-02-12 21:01:37 +01:00
Zlatan Vasović
fe2222e733 Fix multistr errors in customizer.js 2014-02-12 20:54:43 +01:00
Chris Rebert
32a8716d5c Merge pull request #12709 from twbs/bs-to-example-prefix 
Use .bs-example-* instead of .bs-* in examples in docs
 2014-02-12 11:29:42 -08:00
XhmikosR
55e6d4b9b5 Remove trailing space. 2014-02-12 21:27:31 +02:00
Chris Rebert
f6d029f6ab Use .bs-example-* instead of .bs-* in examples in docs 
Refs #12610
 2014-02-12 11:13:54 -08:00
Chris Rebert
dff122f7f0 avoid using .bs-* in example, & improve style 2014-02-12 11:07:04 -08:00
Chris Rebert
40142bdc51 fix #12708 by updating class names in the docs JS 2014-02-12 11:02:56 -08:00
XhmikosR
5796b56d96 Switch to the minified JSZip. 2014-02-12 20:50:47 +02:00
Mark Otto
eb20d6f132 Fixes #11659, #12698, and #12349: Always apply position and z-index form controls in input groups for proper borders 2014-02-11 14:20:01 -08:00
Mark Otto
e49c7758aa Merge pull request #12695 from martikaljuve/offcanvas-transition 
Fixed transitions on offcanvas example by adding initial left and right properties
 2014-02-11 09:57:15 -08:00
Mark Otto
8551f42ae2 Merge branch 'master' into pr/12412 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	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
	docs/dist/css/bootstrap.min.css
	test-infra/npm-shrinkwrap.canonical.json
 2014-02-11 09:50:40 -08:00
Marti Kaljuve
6d232c2b9b Add initial right and left properties to offcanvas example for transitions. 2014-02-11 18:18:21 +02:00
Mark Otto
6f0059c527 add version to getting started page 2014-02-10 22:12:28 -08:00
Mark Otto
38ebf57af5 grunt 2014-02-10 21:41:14 -08:00
Mark Otto
784a95d945 Documents #10140 2014-02-10 21:34:05 -08:00
Mark Otto
728067b586 Update Glyphicons 2014-02-10 21:28:05 -08:00
Mark Otto
3350c73666 http://www.youtube.com/watch?v=YQwYNca4iog 2014-02-10 20:52:20 -08:00
Mark Otto
9427310a09 Fixes #12674 
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
 2014-02-10 20:49:17 -08:00
Mark Otto
4973bfd5d7 Fixes #12685: Display current version under download button on homepage 2014-02-10 20:23:29 -08:00
Mark Otto
67c4deb584 Merge pull request #12665 from twbs/docs_teams 
Update teams
 2014-02-10 19:19:52 -08:00
Chris Rebert
dc5917bedf update docs to include+use .sr-only-focusable 2014-02-10 10:46:17 -08:00
Chris Rebert
77eaa808db tweak phrasing for hopefully greater clarity 2014-02-10 10:12:28 -08:00
Quy Ton
477cf1396d Update docs prefixing 2014-02-09 12:41:47 -08:00
Quy Ton
8dab75d408 Reorder links 2014-02-09 09:18:11 -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
95308509b3 i'm an idiot 2014-02-08 22:46:25 -08:00
Mark Otto
bcf5d88844 Update teams to remove two Sass folks and add new Core member 2014-02-08 22:13:29 -08:00
Mark Otto
769339ed18 grunt dist 2014-02-08 17:30:40 -08:00
Mark Otto
44bb7b20c7 Fixes #12625: Only remove first list group item's top and last list group item's bottom borders when the list group is first or last 2014-02-08 17:29:10 -08:00
Mark Otto
13b4e7a1a8 Mention limitation of form validation feedback icons with input groups 2014-02-08 17:19:45 -08:00
Mark Otto
e9199718d6 Merge branch 'master' into fix-12154 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:52:22 -08:00
Mark Otto
b36d19c3c6 grunt 2014-02-08 16:46:12 -08:00
Mark Otto
7f88009394 grunt 2014-02-08 16:43:58 -08:00
Mark Otto
3fc7a4cffa grunt with new mixins 2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9 grunt 2014-02-08 16:13:30 -08:00
Mark Otto
e3cfd5821d Merge branch 'master' into pr/12462 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 16:01:56 -08:00
Mark Otto
842af44fcc Merge branch 'pr/12579' 2014-02-08 15:53:18 -08:00
Mark Otto
866c52b928 grunt 2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f Merge pull request #12655 from twbs/holder.js 
Update holder.js to v2.3.1.
 2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a Merge pull request #12645 from ZDroid/docs-js-semicolons 
Omit semicolons consistently in docs
 2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67 grunt 2014-02-08 15:44:13 -08:00
Mark Otto
c8315edd73 Merge branch 'master' into pr/12639 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-02-08 15:37:35 -08:00
Zlatan Vasović
938779ca93 Move jade files to docs/jade/ 2014-02-08 22:29:06 +01:00
XhmikosR
c3cb63b69f Update holder.js to v2.3.1. 
Fix #12653.
 2014-02-08 18:19:39 +02:00