Merge branch 'master' into bg-variant

Conflicts:
	less/mixins.less

5 files changed, 55 insertions, 28 deletions

diff --git a/less/mixins.less b/less/mixins.less
index 0cd060751..104590730 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -586,6 +586,15 @@
   }
 }
 
+// Typography
+// -------------------------
+.text-emphasis-variant(@color) {
+  color: @color;
+  a&:hover {
+    color: darken(@color, 10%);
+  }
+}
+
 // Navbar vertical align
 // -------------------------
 // Vertically center elements in the navbar.
diff --git a/less/modals.less b/less/modals.less
index f6ab34769..e7f3d726e 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -124,7 +124,7 @@
 
   // Automatically set modal's width for larger viewports
   .modal-dialog {
-    width: 600px;
+    width: @modal-md;
     margin: 30px auto;
   }
   .modal-content {
diff --git a/less/panels.less b/less/panels.less
index a19fa3788..e004d1715 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -27,19 +27,28 @@
 .panel {
   > .list-group {
     margin-bottom: 0;
-
     .list-group-item {
       border-width: 1px 0;
-
-      // Remove border radius for top one
+      border-radius: 0;
       &:first-child {
-        .border-top-radius(0);
+        border-top: 0;
       }
-      // But keep it for the last one
       &:last-child {
         border-bottom: 0;
       }
     }
+    // Add border top radius for first one
+    &:first-child {
+      .list-group-item:first-child {
+        .border-top-radius((@panel-border-radius - 1));
+      }
+    }
+    // Add border bottom radius for last one
+    &:last-child {
+      .list-group-item:last-child {
+        .border-bottom-radius((@panel-border-radius - 1));
+      }
+    }
   }
 }
 // Collapse space between when there's no additional content.
@@ -59,7 +68,27 @@
   > .table,
   > .table-responsive > .table {
     margin-bottom: 0;
-
+  }
+  // Add border top radius for first one
+  > .table:first-child,
+  > .table-responsive:first-child > .table:first-child {
+    > thead:first-child,
+    > tbody:first-child {
+      > tr:first-child {
+        td:first-child,
+        th:first-child {
+          border-top-left-radius: (@panel-border-radius - 1);
+        }
+        td:last-child,
+        th:last-child {
+          border-top-right-radius: (@panel-border-radius - 1);
+        }
+      }
+    }
+  }
+  // Add border bottom radius for last one
+  > .table:last-child,
+  > .table-responsive:last-child > .table:last-child {
     > tbody:last-child,
     > tfoot:last-child {
       > tr:last-child {
@@ -97,7 +126,10 @@
         > td:last-child {
           border-right: 0;
         }
-
+        &:first-child > th,
+        &:first-child > td {
+          border-top: 0;
+        }
         &:last-child > th,
         &:last-child > td {
           border-bottom: 0;
diff --git a/less/type.less b/less/type.less
index 3e037ae96..315e7eade 100644
--- a/less/type.less
+++ b/less/type.less
@@ -92,34 +92,19 @@ cite    { font-style: normal; }
   color: @text-muted;
 }
 .text-primary {
-  color: @brand-primary;
-  &:hover {
-    color: darken(@brand-primary, 10%);
-  }
+  .text-emphasis-variant(@brand-primary);
 }
 .text-success {
-  color: @state-success-text;
-  &:hover {
-    color: darken(@state-success-text, 10%);
-  }
+  .text-emphasis-variant(@state-success-text);
 }
 .text-info {
-  color: @state-info-text;
-  &:hover {
-    color: darken(@state-info-text, 10%);
-  }
+  .text-emphasis-variant(@state-info-text);
 }
 .text-warning {
-  color: @state-warning-text;
-  &:hover {
-    color: darken(@state-warning-text, 10%);
-  }
+  .text-emphasis-variant(@state-warning-text);
 }
 .text-danger {
-  color: @state-danger-text;
-  &:hover {
-    color: darken(@state-danger-text, 10%);
-  }
+  .text-emphasis-variant(@state-danger-text);
 }
 
 // Contextual backgrounds
diff --git a/less/variables.less b/less/variables.less
index d9147eb59..e431f47b3 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -561,6 +561,7 @@
 @modal-footer-border-color:   @modal-header-border-color;
 
 @modal-lg:                    900px;
+@modal-md:                    600px;
 @modal-sm:                    300px;