Fix tooltip viewport example

- Move example to correct location docs/examples/ - Move custom JS and CSS into stand-alone files - Update headers and footers - Copy-editing
author: Julian Thilo <[email protected]> 2014-03-28 12:48:19 +0100
committer: Julian Thilo <[email protected]> 2014-03-28 12:48:19 +0100
commit: 90902db50cd9545639bb79ae30d1d81e84c12b6c (patch)
tree: 3a5087119169d8ff89b3e305bd9301cdfef69ef5
parent: 8d3e9874202347eb9df0e7ca7e9679580c636756 (diff)
download: bootstrap-90902db50cd9545639bb79ae30d1d81e84c12b6c.tar.xz
bootstrap-90902db50cd9545639bb79ae30d1d81e84c12b6c.zip
3 files changed, 61 insertions, 62 deletions
diff --git a/examples/tooltips/viewport.html b/docs/examples/tooltip-viewport/index.html
index 6efcd0495..2f6d0dd38 100644
--- a/examples/tooltips/viewport.html
+++ b/docs/examples/tooltip-viewport/index.html
@@ -3,55 +3,27 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
+    <link rel="icon" href="../../assets/ico/favicon.ico">
 
     <title>Tooltip Viewport Example for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="tooltip-viewport.css" rel="stylesheet">
 
     <!-- Just for debugging purposes. Don't actually copy this line! -->
-    <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+    <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-
-    <style>
-    body {
-      height: 1200px;
-    }
-    .tooltip {
-      min-width: 250px;
-      max-width: 500px;
-    }
-    .tooltip .tooltip-inner {
-      min-height: 200px;
-      min-width: 250px;
-      max-width: 500px;
-    }
-    .placeholder {
-      height: 900px;
-    }
-    .container-viewport {
-      position: absolute;
-      left: 200px;
-      top: 600px;
-      width: 600px;
-      height: 400px;
-      background: #c00;
-    }
-    .btn-bottom {
-      position: absolute;
-      left: 0;
-      bottom: 0;
-    }
-    </style>
   </head>
 
   <body>
@@ -65,39 +37,20 @@
     <button class="btn tooltip-right", title="This should be shifted up">Shift Up</button>
 
     <div class="container-viewport">
-      <button class="btn tooltip-viewport-bottom", title="This should be shifted Left">Shift Left</button>
-      <button class="btn tooltip-viewport-right", title="This should be shifted Down">Shift Down</button>
+      <button class="btn tooltip-viewport-bottom", title="This should be shifted to the left">Shift Left</button>
+      <button class="btn tooltip-viewport-right", title="This should be shifted down">Shift Down</button>
 
-      <button class="btn pull-right tooltip-viewport-bottom", title="This should be shifted Right">Shift Right</button>
+      <button class="btn pull-right tooltip-viewport-bottom", title="This should be shifted to the right">Shift Right</button>
 
       <button class="btn tooltip-viewport-right btn-bottom", title="This should be shifted up">Shift Up</button>
     </div>
 
+
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
-    <script src="../../js/tooltip.js"></script>
-
-    <script>
-    $(function(){
-      $('.tooltip-right').tooltip({
-        placement: 'right',
-        viewport: {selector: 'body', padding: 2}
-      });
-      $('.tooltip-bottom').tooltip({
-        placement: 'bottom',
-        viewport: {selector: 'body', padding: 2}
-      });
-      $('.tooltip-viewport-right').tooltip({
-        placement: 'right',
-        viewport: {selector: '.container-viewport', padding: 2}
-      });
-      $('.tooltip-viewport-bottom').tooltip({
-        placement: 'bottom',
-        viewport: {selector: '.container-viewport', padding: 2}
-      });
-    });
-    </script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <script src="tooltip-viewport.js"></script>
   </body>
 </html>
diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.css b/docs/examples/tooltip-viewport/tooltip-viewport.css
new file mode 100644
index 000000000..2d82e9b42
--- /dev/null
+++ b/docs/examples/tooltip-viewport/tooltip-viewport.css
@@ -0,0 +1,28 @@
+body {
+  height: 1200px;
+}
+.tooltip {
+  min-width: 250px;
+  max-width: 500px;
+}
+.tooltip .tooltip-inner {
+  min-height: 200px;
+  min-width: 250px;
+  max-width: 500px;
+}
+.placeholder {
+  height: 900px;
+}
+.container-viewport {
+  position: absolute;
+  left: 200px;
+  top: 600px;
+  width: 600px;
+  height: 400px;
+  background: #c00;
+}
+.btn-bottom {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.js b/docs/examples/tooltip-viewport/tooltip-viewport.js
new file mode 100644
index 000000000..e87f4eec7
--- /dev/null
+++ b/docs/examples/tooltip-viewport/tooltip-viewport.js
@@ -0,0 +1,18 @@
+$(document).ready(function () {
+  $('.tooltip-right').tooltip({
+    placement: 'right',
+    viewport: {selector: 'body', padding: 2}
+  })
+  $('.tooltip-bottom').tooltip({
+    placement: 'bottom',
+    viewport: {selector: 'body', padding: 2}
+  })
+  $('.tooltip-viewport-right').tooltip({
+    placement: 'right',
+    viewport: {selector: '.container-viewport', padding: 2}
+  })
+  $('.tooltip-viewport-bottom').tooltip({
+    placement: 'bottom',
+    viewport: {selector: '.container-viewport', padding: 2}
+  })
+})
author	Julian Thilo <[email protected]>	2014-03-28 12:48:19 +0100
committer	Julian Thilo <[email protected]>	2014-03-28 12:48:19 +0100
commit	90902db50cd9545639bb79ae30d1d81e84c12b6c (patch)
tree	3a5087119169d8ff89b3e305bd9301cdfef69ef5
parent	8d3e9874202347eb9df0e7ca7e9679580c636756 (diff)
download	bootstrap-90902db50cd9545639bb79ae30d1d81e84c12b6c.tar.xz bootstrap-90902db50cd9545639bb79ae30d1d81e84c12b6c.zip