diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index e48a234f9f..e91f255391 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -37,6 +37,9 @@ padding: 10px; margin: -10px; } + .carousel-caption { + position: static; + } } @media (max-width: 768px) { .container { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cd0d620bf4..7a55680417 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { diff --git a/docs/javascript.html b/docs/javascript.html index 4acd844c11..2d31f0aa4a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -743,7 +743,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { number | object 0 -

delay showing/hiding the tooltip (ms)

+

delay showing and hiding the tooltip (ms)

If a number is supplied, delay is applied to both hide/show

Object structure is: delay: { show: 500, hide: 100 }

@@ -855,7 +855,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { number | object 0 -

delay showing/hiding the popover (ms)

+

delay showing and hiding the popover (ms)

If a number is supplied, delay is applied to both hide/show

Object structure is: delay: { show: 500, hide: 100 }

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index edafbbf0f4..01b14b6765 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -678,7 +678,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

{{_i}}delay showing/hiding the tooltip (ms){{/i}}

+

{{_i}}delay showing and hiding the tooltip (ms){{/i}}

{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

{{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

@@ -790,7 +790,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

{{_i}}delay showing/hiding the popover (ms){{/i}}

+

{{_i}}delay showing and hiding the popover (ms){{/i}}

{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

{{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

diff --git a/less/responsive.less b/less/responsive.less index fe5e0a7eb2..24b58d2ab7 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -68,6 +68,11 @@ margin: -10px; } + // Carousel + .carousel-caption { + position: static; + } + }