Merge branch '3.0.0-wip' into bs3_homepage

Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html

2 files changed, 15 insertions, 9 deletions

diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
index e6c186462..e9c905bd2 100644
--- a/examples/offcanvas/index.html
+++ b/examples/offcanvas/index.html
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
+    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
 
     <title>Off Canvas Template for Bootstrap</title>
 
@@ -81,7 +82,7 @@
           </div><!--/row-->
         </div><!--/span-->
 
-        <div class="col-xs-12 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
+        <div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
           <div class="well sidebar-nav">
             <ul class="nav">
               <li>Sidebar</li>
@@ -108,9 +109,14 @@
 
     </div><!--/.container-->
 
-    <!-- jQuery and plugin -->
+
+
+    <!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
     <script src="../../assets/js/jquery.js"></script>
+    <script src="../../assets/js/respond.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="offcanvas.js"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/examples/offcanvas/offcanvas.css b/examples/offcanvas/offcanvas.css
index e83e71824..df60d6af6 100644
--- a/examples/offcanvas/offcanvas.css
+++ b/examples/offcanvas/offcanvas.css
@@ -17,7 +17,6 @@ footer {
 @media screen and (max-width: 768px) {
   .row-offcanvas {
     position: relative;
-    overflow: hidden; /* Needed for Internet Explorer */
     -webkit-transition: all 0.25s ease-out;
     -moz-transition: all 0.25s ease-out;
     transition: all 0.25s ease-out;
@@ -25,24 +24,25 @@ footer {
 
   .row-offcanvas-right
   .sidebar-offcanvas {
-    right: -58.333333333333336%; /* 6 columns */
+    right: -50%; /* 6 columns */
   }
 
   .row-offcanvas-left
   .sidebar-offcanvas {
-    left: -58.333333333333336%; /* 6 columns */
+    left: -50%; /* 6 columns */
   }
 
   .row-offcanvas-right.active {
-    right: 58.333333333333336%; /* 6 columns */
+    right: 50%; /* 6 columns */
   }
 
   .row-offcanvas-left.active {
-    left: 58.333333333333336%; /* 6 columns */
+    left: 50%; /* 6 columns */
   }
 
   .sidebar-offcanvas {
     position: absolute;
-    width: 58.333333333333336%; /* 6 columns */
+    top: 0;
+    width: 50%; /* 6 columns */
   }
 }
\ No newline at end of file