change text on js docs page to improve rendering on iphone, update responsive for...

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index e48a234f9f2aecfea10adbc7dad0121f686d85e5..e91f2553915a3421549e83233e2382e08894fd0a 100644 (file)
--- 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 cd0d620bf4216dff0c46ceafcd6bcf7f06da81a4..7a556804174017497d76de4610210bbd601dab4e 100644 (file)
--- 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 4acd844c11e08b005784014491f2ccf8eb619344..2d31f0aa4aba53082cffca09dc760ad0cd0775ad 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -743,7 +743,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing/hiding the tooltip (ms)</p>
+                <p>delay showing and hiding the tooltip (ms)</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>
@@ -855,7 +855,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>number | object</td>
                <td>0</td>
                <td>
-                <p>delay showing/hiding the popover (ms)</p>
+                <p>delay showing and hiding the popover (ms)</p>
                 <p>If a number is supplied, delay is applied to both hide/show</p>
                 <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
                </td>

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index edafbbf0f4441ef32b031f95570789101acab08d..01b14b67650c42b5859bc2814f4d1887936d8a5c 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -678,7 +678,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing/hiding the tooltip (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the tooltip (ms){{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>
@@ -790,7 +790,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
                <td>{{_i}}number | object{{/i}}</td>
                <td>0</td>
                <td>
-                <p>{{_i}}delay showing/hiding the popover (ms){{/i}}</p>
+                <p>{{_i}}delay showing and hiding the popover (ms){{/i}}</p>
                 <p>{{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}</p>
                 <p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
                </td>

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