0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-28 10:24:19 +01:00
Commit Graph

13037 Commits

Author SHA1 Message Date
Mark Otto
918d0c7122 Merge pull request #17589 from vsn4ik/use_scss_if_not
v4 - Use "@if not $bool" expression
2015-09-22 15:26:28 -07:00
Chris Rebert
c21679ceeb Merge pull request #17670 from petetnt/petetnt/docs-fix-2
Rename placeholders in forms.md according to the classes specified
2015-09-22 02:30:30 -07:00
petetnt
c0b5aba3fc Rename placeholders according to the classes specified 2015-09-22 11:31:04 +03:00
Chris Rebert
81435adff8 Merge pull request #17655 from zalog/patch-10
_alert.scss: add missing space between arguments
2015-09-20 16:38:26 -07:00
Catalin Zalog
c72a76e1fd Just some spaces... 2015-09-21 01:07:48 +03:00
XhmikosR
a503474645 Remove unneeded trailing whitespace.
[ci skip]
2015-09-20 19:04:54 +03:00
Mark Otto
64cdb791df Merge pull request #17522 from twbs/v4-dev-xmr-ie9-gradient
docs: IE9 gradient.
2015-09-19 12:07:01 -07:00
XhmikosR
7399607a03 Specify a filter gradient for IE 9. 2015-09-19 09:41:25 +03:00
XhmikosR
2c7e65a680 Use the individual background properties instead of the shorthand.
[ci skip]
2015-09-19 09:41:25 +03:00
Chris Rebert
62199b96dc Merge pull request #17613 from Johann-S/fixTooltipDestroy
Fix #17544: Update doc for tooltips and popover about dispose method
2015-09-16 11:41:28 -07:00
Johann-S
c9597b1c54 Fix doc for tooltips and popover method dispose 2015-09-16 09:40:26 +02:00
Mark Otto
c34fdd415e grunt 2015-09-15 21:11:19 -07:00
Mark Otto
85f08df3b0 fixes border-width issues when customizing font-size by using 1px instead of .0625rem as default -width 2015-09-15 21:11:15 -07:00
Chris Rebert
3c4b61583f Merge pull request #17608 from rtack/patch-1
grammar. you're your way --> you're on your way
2015-09-15 13:50:16 -07:00
Raphael Ackermann
cf965734cd grammar. you're your way --> you're on your way 2015-09-15 22:41:08 +02:00
vsn4ik
d73d79a7a0 Use "@if not $bool" selector 2015-09-13 16:02:58 +03:00
Mark Otto
87308ba2f6 Merge pull request #17576 from zacechola/install_docs
Adds current version to packages.
2015-09-12 12:41:22 -07:00
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
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
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