From f2d37ccc230a71f993d88239395d7990c449b219 Mon Sep 17 00:00:00 2001
From: Quy Ton <quy@fluxbb.org>
Date: Sun, 19 Jan 2014 07:41:14 -0800
Subject: Additional changes to #12275 and #12292

---
 docs/examples/non-responsive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/non-responsive')

diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index 0d86565a2..b948f9bd4 100644
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -77,7 +77,7 @@
       </div>
 
       <h3>What changes</h3>
-      <p>Note the lack of the <code>&lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;</code>, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are basically good to go.</p>
+      <p>Note the lack of the <code>&lt;meta name="viewport" content="width=device-width, initial-scale=1"&gt;</code>, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are basically good to go.</p>
 
       <h3>Regarding navbars</h3>
       <p>As a heads up, the navbar component is rather tricky here in that the styles for displaying it are rather specific and detailed. Overrides to ensure desktop styles display are not as performant or sleek as one would like. Just be aware there may be potential gotchas as you build on top of this example when using the navbar.</p>
-- 
cgit v1.2.3


From 8939268a33957c3a8599881f6312ccbe00b5c5dd Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Thu, 30 Jan 2014 19:55:11 +0200
Subject: Update jQuery to v1.11.0.

Also, use Google's CDN per #11369.
---
 docs/examples/non-responsive/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/non-responsive')

diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index b948f9bd4..3d202d579 100644
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -99,7 +99,7 @@
     <!-- 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="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
-- 
cgit v1.2.3


From 48118576f1cc22b0dc72e897139fd0724e97af9d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Fri, 31 Jan 2014 14:03:42 +0200
Subject: Examples: fix csslint errors.

---
 docs/examples/non-responsive/non-responsive.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/examples/non-responsive')

diff --git a/docs/examples/non-responsive/non-responsive.css b/docs/examples/non-responsive/non-responsive.css
index 9813bb9fe..a74e3cbb8 100644
--- a/docs/examples/non-responsive/non-responsive.css
+++ b/docs/examples/non-responsive/non-responsive.css
@@ -37,8 +37,8 @@ body {
   padding-top: 15px;
   padding-bottom: 15px;
   background-color: #eee;
-  border: 1px solid #ddd;
   background-color: rgba(86,61,124,.15);
+  border: 1px solid #ddd;
   border: 1px solid rgba(86,61,124,.2);
 }
 
-- 
cgit v1.2.3


From 9f668a557336f271f3c1bf701cc6a472e59aeedf Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Fri, 31 Jan 2014 14:20:33 +0200
Subject: Add examples/**/*.css in csscomb task.

---
 docs/examples/non-responsive/non-responsive.css | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/examples/non-responsive')

diff --git a/docs/examples/non-responsive/non-responsive.css b/docs/examples/non-responsive/non-responsive.css
index a74e3cbb8..b0e1920b4 100644
--- a/docs/examples/non-responsive/non-responsive.css
+++ b/docs/examples/non-responsive/non-responsive.css
@@ -6,9 +6,9 @@
 
 /* Account for fixed navbar */
 body {
+  min-width: 970px;
   padding-top: 70px;
   padding-bottom: 30px;
-  min-width: 970px;
 }
 
 /* Finesse the page header spacing */
@@ -28,8 +28,8 @@ body {
 
 /* Reset the container */
 .container {
-  max-width: none !important;
   width: 970px;
+  max-width: none !important;
 }
 
 /* Demonstrate the grids */
@@ -94,12 +94,12 @@ body {
   position: absolute;
   float: left;
   background-color: #fff;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, .15);
   border-width: 0 1px 1px;
   border-radius: 0 0 4px 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
 }
 .navbar-default .navbar-nav .open .dropdown-menu > li > a {
   color: #333;
-- 
cgit v1.2.3