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

9882 Commits

Author SHA1 Message Date
James Friend
2bc417732c code style fixes 2014-08-28 09:54:51 +08:00
James Friend
015ee2ed74 pulled output path out to gruntfile 2014-08-28 09:39:41 +08:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
	Gruntfile.js
2014-08-28 09:32:08 +08:00
James Friend
e7991a9a1e generate commonjs/npm entrypoint module via grunt task 2014-08-28 09:24:23 +08:00
XhmikosR
35f09315ed Merge pull request #14453 from vsn4ik/less_empty_lines
Less: Remove empty lines and blanks.
2014-08-26 19:07:00 +03:00
XhmikosR
4372d49911 Merge pull request #14458 from twbs/npm-deps
Update dev dependencies.
2014-08-26 19:04:46 +03:00
XhmikosR
ac132da789 Update Ruby dependencies. 2014-08-26 13:54:22 +03:00
XhmikosR
701c27e22e Update dev dependencies. 2014-08-26 13:51:05 +03:00
XhmikosR
b1bb57360c Specify cursor: pointer for #import-manual-trigger. 2014-08-26 13:12:54 +03:00
vsn4ik
a03d269287 Less: Remove empty lines and blanks. 2014-08-26 02:24:09 +04:00
Chris Rebert
55dd964690 Merge pull request #14451 from Siecje/patch-1
Updating IRC channel
2014-08-25 12:38:53 -07:00
Siecje
22edcc8d50 Updating IRC channel 2014-08-25 12:14:11 -04:00
Julian Thilo
1517bea4e2 Update link to Run Jekyll on Windows guide 2014-08-25 02:18:58 +02:00
Mark Otto
0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto
a9cd2ce4c9 Merge branch 'master' of github.com:twbs/bootstrap 2014-08-23 13:44:41 -07:00
Mark Otto
32a6d9b404 Full grunt 2014-08-23 13:43:41 -07:00
Mark Otto
56bb92ac4f Fixes #14386: Reset font, text, and line-height properties in popovers 2014-08-23 13:42:45 -07:00
Mark Otto
7e8f10fd1a Merge pull request #14408 from vsn4ik/dropdown_menu_disabled_style
Refactor dropdown.less. Optimize ".dropdown-menu > .disabled" selector.
2014-08-23 13:39:10 -07:00
Mark Otto
3c0e2e28f8 fixes #14425: remove invalid css property 2014-08-23 13:37:29 -07:00
Mark Otto
28c907f635 fixes #14441 2014-08-23 13:35:39 -07:00
Mark Otto
4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto
f36e1c467c Merge branch 'master' of github.com:twbs/bootstrap 2014-08-23 13:31:56 -07:00
Mark Otto
9a39ee90b4 Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. 2014-08-23 13:26:37 -07:00
Mark Otto
e3c2640782 Merge pull request #14382 from vsn4ik/https_links_in_readme
README.md: Change links to use HTTPS
2014-08-23 13:12:47 -07:00
Mark Otto
875006d08c Merge pull request #14417 from twbs/fat-14282
fixes #14282 - Already Visible collapse gets closed when …
2014-08-23 12:58:24 -07:00
Mark Otto
f265137c05 Fixes #14440: Remove unused nav variable 2014-08-23 12:21:17 -07:00
Mark Otto
6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Julian Thilo
70a5b849e8 Merge pull request #14433 from KostyaTretyak/patch-1
Ukrainian site migrates on twbs.docs.org.ua
2014-08-21 16:06:45 +02:00
KostyaTretyak
c954ba4545 Ukrainian site migrates to twbs.docs.org.ua 2014-08-21 13:42:30 +03:00
Chris Rebert
9efedf8f7b Merge pull request #14406 from twbs/nav-tag-for-navbar
consistently use <nav> instead of <div> for .navbar in docs
2014-08-20 21:48:59 -07:00
Jacob
c95aa97c03 Merge pull request #14244 from programcsharp/master
Remove popover content with .children().detach() instead of .empty()
2014-08-18 20:06:02 -07:00
fat
9c2e54bfec fixes #14282 - Already Visible collapse gets closed when .collapse('show') is called 2014-08-18 19:58:19 -07:00
Chris Rebert
ea0e1606dc Assume Element.getBoundingClientRect() exists; Fixes #14093
[skip validator]
2014-08-17 16:08:49 -07:00
Chris Rebert
e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
Chris Rebert
71c2c372f6 Fix #14411 by setting JSON Content-Type for Gist API request 2014-08-17 15:41:53 -07:00
vsn4ik
8d7700b2b6 Use single .dropdown-menu 2014-08-16 19:20:13 +04:00
Chris Rebert
6b7142212f consistently use <nav> instead of <div> for .navbar in docs 2014-08-15 18:09:05 -07:00
Chris Rebert
31f7cb152e Merge pull request #14402 from Joshua-Anderson/travis-time
Remove `time` from `.travis.yml`.
2014-08-15 11:52:50 -07:00
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
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
Дмитро Будник
8c3f095fa4 fix typo in ukrainian doc description 2014-08-06 15:56:56 +03:00