root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10,739 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

771 Commits

Author SHA1 Message Date
soundarapandian 250e021ff1 Integrate ZeroClipboard to easily copy code snippets 2014-06-10 08:30:16 +03:00
XhmikosR 41b92b967a Run `grunt`. 
[ci skip]
 2014-06-09 11:10:09 +03:00
XhmikosR 8cdc34f6e3 Update filesaver.js to v2014-05-27. 
[ci skip]
 2014-06-09 11:10:08 +03:00
XhmikosR 91bed93d55 Update Blob.js to v2014-05-31. 
[ci skip]
 2014-06-09 11:10:08 +03:00
Mark Otto 34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto 1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR 03a8949d7c Run `grunt`. 2014-06-06 01:23:07 +03:00
XhmikosR e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
XhmikosR 7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
Chris Rebert a8641b4db7 Merge pull request #10632 from stuartpb/patch-1 
Customizer: Alert on successful save to Gist
 2014-06-05 13:58:22 -07:00
Mark Otto 12b5d46f17 move it to the sidebar 2014-05-22 18:38:43 -07:00
Mark Otto 707b362b80 Merge branch 'master' into docs-theme-toggler 
Conflicts:
	docs/assets/css/docs.min.css
 2014-05-20 23:27:40 -07:00
Stuart P. Bentley d5d64c2e4e Update showSuccess to use new classes 2014-05-17 13:22:57 -04:00
Stuart P. Bentley b5f9e2eb60 Customizer: Alert on successful save to Gist 2014-05-13 00:52:44 -04:00
Mark Otto 8ee6a6be80 grunt 2014-05-12 21:28:14 -07:00
Mark Otto f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto d03fd289d9 grunt for raw js 2014-05-12 21:17:42 -07:00
Mark Otto 0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert bdd822a94c regenerate minified docs JS & CSS 2014-05-07 20:19:40 -07:00
Chris Rebert 7d0f7e8441 add button to toggle the optional theme when viewing the docs; fixes #9764 2014-05-07 16:12:42 -07:00
XhmikosR 06fae12023 Update JSZip to v2.2.2. 2014-05-06 12:43:41 +03:00
XhmikosR 2c1fe5374e Merge pull request #13424 from twbs/docs-libs 
Update docs libs
 2014-04-30 08:00:21 +03: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
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
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
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 e9f0bed44d quote data-* attribute value in docs JS per best-practices 2014-04-18 18:53:05 -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 bfb99413ee grunt dist 2014-04-06 20:49:22 -07:00
Chris Rebert 8ca182876d customizer: squelch error when can't save Gist 2014-04-03 17:02:10 -07:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
XhmikosR 8c95ff748f Run `grunt`. 2014-04-01 08:26:47 +03: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
XhmikosR 10586bf040 Run `grunt`. 2014-03-27 08:02:51 +02:00
Mark Otto 488c6b43ed grunt 2014-03-24 21:16:07 -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 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 4fb1fdbf74 Update JSZip to v2.2.0. 2014-03-23 08:10:00 +02: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
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 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
XhmikosR d4a4bbb729 Update dependencies. 2014-03-12 20:22:22 +02:00
XhmikosR f750f7e448 Run usebanner before cssmin. 2014-03-11 19:49:11 +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 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 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 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 27da9728bc grunt 2014-03-09 13:50:55 -07:00
XhmikosR 9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02: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
Zlatan Vasović d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01: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 5bd2799978 G R U N T 2014-03-07 00:26:38 -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 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
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
XhmikosR d7dc8a7bd3 Merge pull request #12853 from twbs/jscs 
Switch to JSCS
 2014-03-05 08:42:50 +02: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 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 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
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
XhmikosR 537e10033e Switch to using JSCS for the indentation check. 2014-02-28 17:30:08 +02: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
Mark Otto 4b622c60c1 grunt 2014-02-21 17:42:25 -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 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Zlatan Vasović fe2222e733 Fix multistr errors in customizer.js 2014-02-12 20:54:43 +01: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 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
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 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 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
XhmikosR c3cb63b69f Update holder.js to v2.3.1. 
Fix #12653.
 2014-02-08 18:19:39 +02:00
Zlatan Vasović bdf9ce4c45 Omit semicolons consistently in docs 2014-02-07 19:31:08 +01:00
Zlatan Vasović aead10fafa Avoid setting `jshint node: true` in every Grunt JS file 2014-02-07 13:34:17 +01:00
Mark Otto 3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00
Mark Otto 228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
XhmikosR aae64a9eba Update jzip to v2.1.0. 2014-02-06 23:10:37 +02:00
XhmikosR ec050fa0ab Update less.js to v1.6.2. 2014-02-04 11:11:40 +02:00
XhmikosR 2576fecf95 Update jszip to the latest git (202003821d). 2014-02-04 11:08:12 +02:00
XhmikosR 389e574aaa Update Filesaver.js to the latest git (2014-01-24). 2014-02-04 11:08:12 +02:00
Mark Otto ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto 58bf3f9432 grunt after last commits 2014-01-31 13:40:32 -08:00
XhmikosR 7b9c0a38a7 Downgrade holder.js to v2.2.0. 
Fixes #12440.
 2014-01-31 09:32:55 +02:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto 9a6b7ab375 grunt 2014-01-30 08:14:18 -08:00
Mark Otto d4b1bfd667 grunt 2014-01-29 22:44:06 -08:00
Mark Otto 6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto 08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06: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
Chris Rebert b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -08:00
Chris Rebert 80bed836e0 grunt dist build-customizer 2014-01-12 14:53:21 -08:00
XhmikosR f972331a10 update to FileSaver.js version 2013-12-27 / 0055d054ac 
Refs #12196
 2014-01-12 14:47:54 -08:00
Chris Rebert 4b5e73b842 add Blob.js separate from filesaver.js 
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
 2014-01-12 14:41:30 -08:00
XhmikosR ef22ab5aed update less.js to v1.6.1 & use accurate filename; refs #12196 2014-01-12 14:32:58 -08:00
XhmikosR 77ff3871fd update holder.js to v2.3; refs #12196 2014-01-12 14:23:41 -08:00
Mark Otto 1127cd6287 grunt dist 2014-01-11 14:48:47 -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
Chris Rebert 8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
XhmikosR d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR 016d573a80 Use the docs banner for all the docs generated files. 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
Chris Rebert ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert 07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Gregory HOULLIER a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
Mark Otto 50cf0b1a9d Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030: navbar toggle focus state 2013-12-31 18:23:10 -08:00
Mark Otto 0df96d8c32 Merge branch 'master' into docs_dir 2013-12-31 10:38:31 -08:00
Mark Otto a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Chris Rebert 336f5f1dce rename raw-files.js to raw-files.min.js 
it's not /technically/ minified, but close enough
it's autogenerated, not terribly human-readable, and not meant to be directly modified
 2014-01-19 22:29:51 -08:00
Chris Rebert 06a7bdd0b0 grunt build-raw-files dist 2014-01-19 22:27:01 -08:00
Chris Rebert b67cba2b4d make WP8 device-width hack code fully consistent between docs HTML & docs JS 2014-01-18 18:35:47 -08:00
XhmikosR 4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
Mark Otto a633fc042d Merge branch 'master' into docs_derp 
Conflicts:
	docs/components.html
	docs/css.html
 2014-01-15 13:08:35 -08:00
Chris Rebert 5ead87d519 revert unnecessary customizations of Blob.js & FileSaver.js 
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748ed
 2014-01-14 20:46:25 -08:00
Mark Otto cae63200d8 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_includes/old-bs-docs.html
 2014-01-14 15:53:06 -08:00
Chris Rebert 46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Zlatan Vasović c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Mark Otto eca81939cc Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
 2014-01-13 22:43:18 -08:00
Chris Rebert ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert 2d038186e3 add a title/description to customizer.js's attribution comment 2014-01-13 21:08:04 -08:00
Mark Otto b17dca240e Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/js/docs.min.js
 2014-01-12 16:10:57 -08:00
Mark Otto 79c18da452 homepage improvements 2014-01-11 19:35:40 -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 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
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -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 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 a8005b3d0b flatten docs dir back into root 2013-07-18 17:41:30 -07:00
fat 4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
fat 37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
fat f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
Mark Otto 817972724a Remove further mentions of Glyphicons 2013-07-05 14:11:12 -05:00
Mu-An Chiou 55fa1acbd6 Tooltip: apply position class before positioning 2013-06-28 11:05:38 +01:00
Mark Otto 1a09eada35 Run make on JS 2013-06-28 00:08:19 -07:00
Mark Otto 6a2858f7bf make on js i guess? /cc @fat 2013-06-27 19:36:35 -07:00
Mark Otto 2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers 
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
 2013-06-20 16:02:05 -07:00
Mark Otto 65ad52060e Offcanvas example update 
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
 2013-06-19 20:31:03 -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
Ivan Malopinsky c1655e6cbd upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 2013-06-16 23:16:56 -04:00
Mark Otto 949c7cca00 Merge pull request #8156 from baer/toggle-button-fix 
Docs Customize toggle button used incorrect selectors
 2013-06-12 16:59:40 -07:00
Mark Otto 47f8ba98f3 Merge pull request #8158 from baer/download-button-fix-proper 
Docs "Customize and Download" button didn't send the correct parameters
 2013-06-12 16:59:22 -07:00
Eric Baer 6771be1ced Docs Customize "Customize and Download" button not working properly 2013-06-12 14:01:59 -06:00
Eric Baer 7f8703ef86 Docs Customize toggle button used incorrect selectors 2013-06-12 12:51:10 -06:00
Mark Otto 9fac2c0467 Update docs JS to prevent clicks on links with hash hrefs 2013-06-09 23:45:14 -07:00
Mark Otto 9ba11ba60a No more need for grid column highlighting, so nuke that 2013-06-09 23:44:14 -07:00
Robert Burns cc684750e5 Fix for carousel indicators 2013-06-01 08:15:40 -04:00
fat f5ce66177b fix event binding in modal.js 2013-05-29 11:24:00 -04:00
fat a7a87c8e8c rebuild 2013-05-27 12:48:16 -07:00
fat 9257bdc097 fixes #7163 2013-05-27 12:45:13 -07:00
Jacob Thornton e424b3879c fixes #4781 2013-05-24 23:53:44 -07:00
Jacob Thornton f3e45c3778 add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things 2013-05-24 23:15:04 -07:00
Mark Otto 3160bd872e rearrange customizer content 2013-05-23 21:34:32 -07:00
Mark Otto acc0875259 fix up customizer js and classes; turn buttons into real buttons 2013-05-22 23:34:28 -07:00
fat e7b4fedee8 remove 3rd arg from $.each call 2013-05-22 15:18:30 -07:00