Merge branch 'master' of github.com:twbs/bootstrap

5 files changed, 16 insertions, 14 deletions

diff --git a/less/forms.less b/less/forms.less
index 530257499..aefa5a462 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -265,7 +265,7 @@ input[type="checkbox"],
   // Feedback icon (requires .glyphicon classes)
   .form-control-feedback {
     position: absolute;
-    top: (@line-height-computed + 5); // Height of the `label` and it's margin
+    top: (@line-height-computed + 5); // Height of the `label` and its margin
     right: 0;
     display: block;
     width: @input-height-base;
diff --git a/less/navbar.less b/less/navbar.less
index d96f85e30..621772fbb 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -212,7 +212,7 @@
 
 // Navbar nav links
 //
-// Builds on top of the `.nav` components with it's own modifier class to make
+// Builds on top of the `.nav` components with its own modifier class to make
 // the nav the full height of the horizontal nav (above 768px).
 
 .navbar-nav {
diff --git a/less/navs.less b/less/navs.less
index e4ac14459..9e729b39f 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -91,7 +91,7 @@
       }
     }
 
-    // Active state, and it's :hover to override normal :hover
+    // Active state, and its :hover to override normal :hover
     &.active > a {
       &,
       &:hover,
diff --git a/less/panels.less b/less/panels.less
index 1b72cebd1..ef8786867 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -95,15 +95,17 @@
     border: 0;
     margin-bottom: 0;
   }
-  > .table-striped > tbody > tr:last-child,
-  > .table-responsive > .table-striped > tbody > tr:last-child {
-    td:first-child,
-    th:first-child {
-      border-bottom-left-radius: (@panel-border-radius - 1);
-    }
-    td:last-child,
-    th:last-child {
-      border-bottom-left-radius: (@panel-border-radius - 1);
+  > .table-striped,
+  > .table-responsive > .table-striped {
+    > tbody > tr:last-child {
+      td:first-child,
+      th:first-child {
+        border-bottom-left-radius: (@panel-border-radius - 1);
+      }
+      td:last-child,
+      th:last-child {
+        border-bottom-left-radius: (@panel-border-radius - 1);
+      }
     }
   }
 }
@@ -120,7 +122,7 @@
   }
 }
 
-// Within heading, strip any `h*` tag of it's default margins for spacing.
+// Within heading, strip any `h*` tag of its default margins for spacing.
 .panel-title {
   margin-top: 0;
   margin-bottom: 0;
diff --git a/less/type.less b/less/type.less
index 9d032b268..5373975d2 100644
--- a/less/type.less
+++ b/less/type.less
@@ -126,7 +126,7 @@ cite    { font-style: normal; }
 // For now we'll leave these alongside the text classes until v4 when we can
 // safely shift things around (per SemVer rules).
 .bg-primary {
-  // Given the contrast here, this is the only class to have it's color inverted
+  // Given the contrast here, this is the only class to have its color inverted
   // automatically.
   color: #fff;
   background-color: @brand-primary;