root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9,883 Commits 107 Branches 92 Tags 660 MiB
Commit Graph

646 Commits

Author SHA1 Message Date
Mark Otto 719ebd8239 grunt 2014-06-26 02:49:21 -07:00
Mark Otto 4dcdc08d89 grunt 2014-06-25 23:03:40 -07:00
Mark Otto 4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
XhmikosR 4abb095783 Run `grunt`. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
Chris Rebert a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Mark Otto 8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto 1482947405 grunt 2014-06-19 15:25:50 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
Heinrich Fenkart 587451ad9a Update a few source files to comply to new JSCS rules 2014-06-19 21:08:05 +02:00
XhmikosR abe7afd87a Run `grunt`. 2014-06-19 12:58:34 +03:00
XhmikosR 0418c7678d Update JSZip to v2.3.0. 2014-06-19 12:03:10 +03:00
Mark Otto 162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto 99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto 74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto 11cf54f9df grunt 2014-06-18 18:22:11 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
Chris Rebert f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Mark Otto 82bd8b6dfd twerk copy 2014-06-09 23:29:44 -07:00
XhmikosR 1b8935ee95 Run `grunt dist`. 2014-06-10 08:30:17 +03:00
XhmikosR 89c0e4d2ab Update ZeroClipboard to v1.3.5. 
Also use the official filenames.
 2014-06-10 08:30:17 +03:00
XhmikosR 5057e7c7b8 Remove unused variables and make tests pass. 2014-06-10 08:30:17 +03:00
Mark Otto 7d1365ce1c Refactor and restyle. 2014-06-10 08:30:16 +03:00
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