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

14237 Commits

Author SHA1 Message Date
Mark Otto
339130c040 fixes #17583: only include clearfix on make-container mixin when not in flex mode 2015-09-12 12:30:57 -07:00
Zac Echola
2c81a2eb0f Adds current version to packages. 2015-09-11 14:15:31 -05:00
Alexandr Kondrashov
c9725926b2 Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
	scss/_custom-forms.scss
	scss/_variables.scss
2015-09-11 16:43:00 +03:00
Gleb Mazovetskiy
b811f8cf96 Merge pull request #17549 from davidjb/v4-dev-bundle-ignore
Add `vendor/bundle` to gitignore
2015-09-10 19:52:30 +01:00
Mark Otto
9f594cfe59 Merge pull request #17553 from rbrs/form-inline
v4 - fixed incorrect inline form class in docs
2015-09-10 08:49:29 -07:00
Mark Otto
c9dc0b9228 Merge pull request #17558 from gjsduarte/v4-dev
Border width variable in list group items
2015-09-10 08:48:45 -07:00
Guilherme Duarte
df040671bb Border width variable in list group items
Added usage of $border-width variable in all _list-group.scss references
2015-09-10 14:16:23 +02:00
Rolandas Barysas
99aadb92f8 v4 - fixed incorrect inline form class in docs 2015-09-10 10:46:26 +03:00
Chris Rebert
4ee6d99c9d Merge pull request #17551 from twbs/env-vars
Remove Travis env vars used for defunct custom caching system
2015-09-09 23:04:40 -07:00
Chris Rebert
b14eef054c rm Travis env vars used for defunct custom caching system
Reverts part of 42697a4ecb
2015-09-09 22:48:29 -07:00
Chris Rebert
67852107d9 rm Travis env vars for giving Savage access to defunct custom caching system
Reverts a1c170ed37
2015-09-09 22:40:48 -07:00
David\ Beitey
c000d1f053 Add vendor/bundle to gitignore
Ensure this directory is ignored so that any installed resources from
Bundler aren't handled by Git.
2015-09-10 15:20:36 +10:00
Rolandas Barysas
253740eab5 disabled browser autocomplete on search input in docs 2015-09-09 21:52:16 +03:00
David Leuliette
61067304cd Drop cursor pointer for button role 2015-09-09 17:14:34 +02:00
XhmikosR
a91d267a21 Merge pull request #17519 from twbs/v4-dev-xmr-jekyll-sitemap
Use jekyll-sitemap instead of our custom solution.
2015-09-09 09:44:40 +03:00
XhmikosR
d84c15f1d0 Merge pull request #17520 from davidjb/v4-dev-relative-grunt
Specify configBridge as relative path to source for Jekyll
2015-09-09 09:44:09 +03:00
Jesse Mandel
f5ab82c7eb Added NuGet install instructions to docs
Closes #17214.
2015-09-08 16:44:21 -07:00
Chris Rebert
64301a1e4c README: Update version number in download link
[ci skip]
2015-09-08 01:57:19 -07:00
Chris Rebert
21dadc870a Merge pull request #17521 from vsn4ik/rm_v3_theme
v4 - Remove dropped v3 bootstrap-theme
2015-09-07 23:20:16 -07:00
vsn4ik
d99bc3fe62 Remove dropped v3 bootstrap-theme
[ci skip]
2015-09-08 08:58:03 +03:00
XhmikosR
0113ecc6c4 Use jekyll-sitemap instead of our custom solution. 2015-09-08 08:18:52 +03:00
XhmikosR
36e4c9bffc Add missing end of file newlines.
[ci skip]
2015-09-08 08:16:54 +03:00
David\ Beitey
7a2fa5e60a Specify configBridge as relative path to source
This adjusts the load path for the ``configBridge.json`` file from one
that's relative to the user running the command (eg ``jekyll serve``),
to one that's relative to the ``source`` configuration setting for
Jekyll.

The result is that the user can now have a (customised) ``_config.yml``
for Jekyll anywhere on her filesystem and point to Bootstrap's
``docs`` directory to use as the ``source``.  Previously, in order to
customise it, the original ``_config.yml`` needed to be modified inside
(a forked) Bootstrap, and the ``jekyll`` command could only be run at
the root of the Bootstrap package as the original file path to
``configBridge.json`` was only valid there.

The existing behaviour is not affected.
2015-09-08 14:36:00 +10:00
XhmikosR
8cea452e12 Merge pull request #17518 from twbs/v4-dev-xmr-rm-test-infra
Remove the now unused test-infra files.
2015-09-08 07:24:50 +03:00
XhmikosR
fd00c178c3 Remove the now unused test-infra files. 2015-09-08 07:14:14 +03:00
Corbzilla
2dce4740cf Add JS to fix indeterminate checkbox example in docs
Fixes #17196
Closes #17510
2015-09-07 13:41:45 -07:00
Patrick H. Lauke
9a61cfb3d1 Merge pull request #17509 from Zearin/v4-dev-DOCS
Fix usage of “its” and “it’s” (v4 docs)
2015-09-07 16:57:59 +02:00
Zearin
8e29c43c46 Fix usage of “its” and “it’s” 2015-09-07 10:07:35 -04:00
Mark Otto
ec5b8eaa90 Merge pull request #17500 from mauricew/v4-dev-examplefixes
v4 Fixes to examples
2015-09-06 16:25:38 -07:00
Maurice Wahba
5c4fa4f0f6 Fixes to examples 2015-09-06 18:01:41 -04:00
Chris Rebert
efac54c2a4 Merge pull request #17495 from vsn4ik/mv_text_hide
v4 - Rename file with text-hide mixin
2015-09-06 14:03:10 -07:00
XhmikosR
85ab83136e Add missing jQuery local fallback.
[ci skip]
2015-09-06 20:34:35 +03:00
XhmikosR
55258e9923 Use jQuery 1.11.3 everywhere.
[ci skip]
2015-09-06 20:32:40 +03:00
Mark Otto
dee38e33b5 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-09-06 09:36:40 -07:00
Mark Otto
0d0edebea6 grunt 2015-09-06 09:36:24 -07:00
Mark Otto
741f7d4b5a Fixes #17486: start work on responsive cards for decks, groups, and columns 2015-09-06 09:36:19 -07:00
Thomas McDonald
1ebf852236 Merge pull request #17491 from twbs/v4-dev-xmr-travis-no-gem-install
Remove `gem install scss_lint` from Travis.
2015-09-06 09:09:43 -07:00
vsn4ik
de44d2a3dd Rename file with text-hide mixin 2015-09-06 14:40:19 +03:00
XhmikosR
dde20e9345 Merge pull request #17492 from twbs/v4-dev-xmr-docs-js
Clean up inclusion of IE-specific JS files.
2015-09-06 14:31:07 +03:00
XhmikosR
87a3fdd1b7 Clean up inclusion of IE-specific JS files.
Move them to footer, and remove duplicate ones.

[ci skip]
2015-09-06 13:33:52 +03:00
XhmikosR
f14113133d Remove gem install scss_lint from Travis.
Instead, use `bundleExec: true` for grunt-scss-lint.
2015-09-06 12:28:35 +03:00
Mark Otto
8f16abb669 grunt 2015-09-05 20:58:31 -07:00
Mark Otto
584cfdd72b Fixes #17230: Renames .navbar-static-top to .navbar-full and adds docs for it 2015-09-05 20:58:28 -07:00
Mark Otto
180f97d7b2 grunt 2015-09-05 20:56:46 -07:00
Mark Otto
c0b5f71874 remoe comment /cc @cvrebert 2015-09-05 20:54:25 -07:00
Patrick H. Lauke
e859b4b216 Merge pull request #17477 from patrickhlauke/v4-skippy
Port skiplink styling from v3 to v4
2015-09-05 18:37:27 +02:00
XhmikosR
fec2cedfd4 Merge pull request #17369 from twbs/v4-dev-xmr-docs-img
Compress images.
2015-09-05 17:17:00 +03:00
Gleb Mazovetskiy
79aebf6c1d Merge pull request #17364 from twbs/avoid-parent-selector-suffix2
Remove all uses of `selector &` to support nested import
2015-09-05 10:14:59 +01:00
Patrick H. Lauke
6a37ec3767 Port skiplink styling from v3 to v4 2015-09-05 08:56:47 +01:00
Mark Otto
336bfa41e6 Merge pull request #17404 from vincent4j/patch-1
add Chinese translations website boot4.com
2015-09-04 23:39:45 -07:00