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

10222 Commits

Author SHA1 Message Date
Joshua Anderson
325defb63f Remove time from .travis.yml.
Travis CI now does this automatically.
2014-08-15 11:37:32 -07:00
Chris Rebert
8194668c52 Merge pull request #14316 from hnrch02/use-closest-alert
Use closest `.alert` for alert dismissal; closes #14306
2014-08-15 11:30:35 -07:00
Chris Rebert
a9b7ba419a Merge pull request #14394 from twbs/gruntfile-bower
Fix `grunt dist` under Bower by separating docs into separate task
2014-08-15 10:52:28 -07:00
Chris Rebert
c8f1dd7e97 Merge pull request #14396 from twbs/retry-npm
Add retries to uncached-npm-install.sh
2014-08-15 10:43:40 -07:00
Julian Thilo
32aa9b24a1 Merge pull request #14339 from budnik/patch-3
fix typo in ukrainian doc description
2014-08-15 11:48:29 +02:00
Chris Rebert
ff18f380d5 Add retries to uncached-npm-install.sh
Pull requests are frequently failing on Travis due to npm flakiness
(I think) travis_retry isn't available in indirect subshells like this
2014-08-14 17:59:55 -07:00
Mark Otto
7d9f55c3d5 missing nav link 2014-08-14 14:16:55 -07:00
Mark Otto
a243c16068 unfuck homepage nav links 2014-08-14 13:50:55 -07:00
Chris Rebert
06c4002019 Gruntfile: Fix #13949 by separating docs into separate task & refactoring 2014-08-14 11:42:13 -07:00
vsn4ik
b6fe7c43e3 README.md: Аmendment links to use HTTPS. 2014-08-14 14:26:47 +04:00
Chris Rebert
559f16572f Gruntfile: switch cssmin & jade tasks from files over to src & dest
Refs #14388.
2014-08-13 17:36:13 -07:00
vsn4ik
da8daa667c Gruntfile.js: Use user-friendly properties. 2014-08-13 23:12:09 +04:00
Chris Rebert
a8437f0d23 Merge pull request #14325 from hnrch02/cleanup-buttons-docs
Clean up buttons documentation
2014-08-08 12:23:55 -07:00
Heinrich Fenkart
436015c191 Collapse: count .collapsing elements as actives; closes #13447 2014-08-08 01:23:50 +02:00
Дмитро Будник
8c3f095fa4 fix typo in ukrainian doc description 2014-08-06 15:56:56 +03:00
Heinrich Fenkart
2c625c7d1a Clean up buttons documentation 2014-08-06 06:10:51 +02:00
Chris Rebert
b4895a0d6d Merge pull request #14336 from michaeljayt/patch-2
Make grunt concat js files when watching
2014-08-05 19:28:22 -07:00
Michael J.
d80be40d04 Make grunt concat js files when watching 2014-08-06 10:22:16 +08:00
Heinrich Fenkart
d9f1ea8252 Small wording tweak in alert docs 2014-08-06 03:50:10 +02:00
Chris Rebert
ae20895fd0 Merge pull request #14334 from twbs/update-autoprefixer
bump grunt-autoprefixer to ~1.0.0
2014-08-05 18:46:02 -07:00
Chris Rebert
c3b6de2d44 Merge pull request #14332 from hnrch02/clarify-alert-removal
Document that alerts are removed from the DOM when closed; fixes #14318
2014-08-05 18:42:01 -07:00
Chris Rebert
b3e8001be2 bump grunt-autoprefixer to ~1.0.0 2014-08-05 18:38:29 -07:00
Mark Otto
1582138d3c change value 2014-08-05 17:50:59 -07:00
Mark Otto
e3b23439ba spacing 2014-08-05 17:50:22 -07:00
Mark Otto
3d5fd6f00d remove that 2014-08-05 17:49:22 -07:00
Mark Otto
d4e58c755e fuck around with responsive reflow table idea 2014-08-05 17:45:24 -07:00
Heinrich Fenkart
ddadb2cf65 Document that alerts are removed from the DOM when closed; fixes #14318 2014-08-06 02:42:03 +02:00
Mark Otto
668dc448a7 bigger images 2014-08-05 17:23:25 -07:00
Mark Otto
60e64015de fix broke code block 2014-08-05 17:21:54 -07:00
Mark Otto
d71f6470c1 copy and remove rogue p tag 2014-08-05 17:21:13 -07:00
Mark Otto
dceeb641ed fix nav link 2014-08-05 17:19:43 -07:00
Mark Otto
0181d3c643 move license and translations to about section 2014-08-05 17:19:12 -07:00
Mark Otto
7629e08d2b space out consecutive navs better 2014-08-05 17:17:00 -07:00
Mark Otto
adefbf6ebe copy on badges 2014-08-05 17:16:28 -07:00
Mark Otto
25d6824e6c cards 2014-08-05 17:12:24 -07:00
Mark Otto
af0921062f rename imported files to preface with underscore; rerun grunt dist 2014-08-04 15:36:41 -07:00
Mark Otto
ef9e76c2c5 comment out firefox specific code for linter to parse fully 2014-08-04 15:17:43 -07:00
Mark Otto
724240fe4f Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/customizer-variables.html
	docs/_includes/js/overview.html
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/carousel.less
2014-08-04 15:09:23 -07:00
Mark Otto
9096c20021 grunt 2014-08-04 14:05:12 -07:00
Heinrich Fenkart
75bffd84ae Use closest .alert for alert dismissal; closes #14306 2014-08-04 19:33:42 +02:00
Heinrich Fenkart
dca8afa333 Remove aria-describedby attribute later
Fixes #14241
2014-08-04 19:21:49 +02:00
Mark Otto
14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Mark Otto
6c87895eec fixes #14310: reset .active as well for button links 2014-08-04 10:01:20 -07:00
Julian Thilo
fd6c00d141 Merge pull request #14315 from twbs/browser_bug_applet
Add Wall of Browser Bugs entry for #14124
2014-08-04 18:48:04 +02:00
Julian Thilo
f7acc1c77c Add Wall of Browser Bugs entry for #14124
[skip sauce]
2014-08-04 18:46:27 +02:00
Chris Rebert
fb2e9fe30c Merge branch 'KyleMit/add-default-settings-documentation' 2014-08-04 09:08:07 -07:00
Kyle
333af7d371 Add docs for how to change default JS plugin settings
Closes #14250.
2014-08-04 09:07:19 -07:00
Mark Otto
77b0dc69eb Merge pull request #14311 from hnrch02/autoprefixer-for-13074
Follow-up to #13074: use spec syntax instead of deprecated mixins
2014-08-03 22:12:52 -07:00
Heinrich Fenkart
b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto
9e92b74aa3 fix ads text 2014-08-03 16:58:59 -07:00