bump assets

kmadac · Jul 13, 2013 · e857fb1 · e857fb1
1 parent 09258e4
commit e857fb1
Show file tree

Hide file tree

Showing 37 changed files with 718 additions and 678 deletions.
diff --git a/_assets/bootstrap/accordion.less b/_assets/bootstrap/accordion.less
@@ -16,15 +16,12 @@
 }
 .accordion-heading {
   border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
 
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
+  .accordion-toggle {
+    display: block;
+    padding: 8px 15px;
+    cursor: pointer;
+  }
 }
 
 // Inner needs the styles because you can't animate properly with any styles on the element

diff --git a/_assets/bootstrap/alerts.less b/_assets/bootstrap/alerts.less
@@ -43,37 +43,13 @@
 // -------------------------
 
 .alert-success {
-  background-color: @alert-success-bg;
-  border-color: @alert-success-border;
-  color: @alert-success-text;
-  hr {
-    border-top-color: darken(@alert-success-border, 5%);
-  }
-  .alert-link {
-    color: darken(@alert-success-text, 10%);
-  }
+  .alert-variant(@alert-success-bg, @alert-success-border, @alert-success-text);
 }
 .alert-danger {
-  background-color: @alert-danger-bg;
-  border-color: @alert-danger-border;
-  color: @alert-danger-text;
-  hr {
-    border-top-color: darken(@alert-danger-border, 5%);
-  }
-  .alert-link {
-    color: darken(@alert-danger-text, 10%);
-  }
+  .alert-variant(@alert-danger-bg, @alert-danger-border, @alert-danger-text);
 }
 .alert-info {
-  background-color: @alert-info-bg;
-  border-color: @alert-info-border;
-  color: @alert-info-text;
-  hr {
-    border-top-color: darken(@alert-info-border, 5%);
-  }
-  .alert-link {
-    color: darken(@alert-info-text, 10%);
-  }
+  .alert-variant(@alert-info-bg, @alert-info-border, @alert-info-text);
 }
 
 // Block alerts
@@ -82,11 +58,12 @@
 .alert-block {
   padding-top: 15px;
   padding-bottom: 15px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
+
+  > p,
+  > ul {
+    margin-bottom: 0;
+  }
+  p + p {
+    margin-top: 5px;
+  }
 }
diff --git a/_assets/bootstrap/badges.less b/_assets/bootstrap/badges.less
@@ -35,16 +35,9 @@ a.badge {
 }
 
 // Quick fix for labels/badges in buttons
-.btn {
-  .badge {
-    position: relative;
-    top: -1px;
-  }
-}
-.btn-mini {
-  .badge {
-    top: 0;
-  }
+.btn .badge {
+  position: relative;
+  top: -1px;
 }
 
 // Account for counters in navs

diff --git a/_assets/bootstrap/bootstrap.less b/_assets/bootstrap/bootstrap.less
@@ -28,7 +28,6 @@
 
 // Components: common
 @import "component-animations.less";
-@import "glyphicons.less";
 @import "dropdowns.less";
 @import "list-group.less";
 @import "panels.less";

diff --git a/_assets/bootstrap/breadcrumbs.less b/_assets/bootstrap/breadcrumbs.less
@@ -12,15 +12,12 @@
   > li {
     display: inline-block;
     text-shadow: 0 1px 0 #fff;
-    &:after {
+    &+li:before {
       display: inline-block;
-      content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space
+      content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: #ccc;
     }
-    &:last-child:after {
-      display: none; // No divider after last element
-    }
   }
   > .active {
     color: @gray-light;

diff --git a/_assets/bootstrap/button-groups.less b/_assets/bootstrap/button-groups.less
@@ -72,9 +72,11 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group > .btn-group:first-child > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
-  .border-right-radius(0);
+.btn-group > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    .border-right-radius(0);
+  }
 }
 .btn-group > .btn-group:last-child > .btn:first-child {
   .border-left-radius(0);
@@ -96,10 +98,6 @@
   padding-left: 8px;
   padding-right: 8px;
 }
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
 .btn-group > .btn-large + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
@@ -138,14 +136,16 @@
     margin-top: -1px;
   }
 }
-.btn-group-vertical .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.btn-group-vertical .btn:first-child {
-  .border-bottom-radius(0);
-}
-.btn-group-vertical .btn:last-child {
-  .border-top-radius(0);
+.btn-group-vertical .btn {
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  &:first-child {
+    .border-bottom-radius(0);
+  }
+  &:last-child {
+    .border-top-radius(0);
+  }
 }
 
 

diff --git a/_assets/bootstrap/buttons.less b/_assets/bootstrap/buttons.less
@@ -81,33 +81,32 @@
 // -------------------------
 
 // Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
 .btn-link {
   color: @link-color;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: @link-hover-color;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link {
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    background-image: none;
+    .box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: @link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
   &[disabled],
   fieldset[disabled] & {
     &:hover,

diff --git a/_assets/bootstrap/carousel.less b/_assets/bootstrap/carousel.less
@@ -8,15 +8,10 @@
   position: relative;
 }
 
-// Wrap all slides, but only show the active one
 .carousel-inner {
   position: relative;
   overflow: hidden;
   width: 100%;
-}
-
-// Immediate parent of all slides
-.carousel-inner {
 
   > .item {
     display: none;
@@ -26,7 +21,7 @@
     // Account for jankitude on images
     > img,
     > a > img {
-      display: block;
+      .img-responsive();
       line-height: 1;
     }
   }
@@ -80,13 +75,8 @@
   color: #fff;
   text-align: center;
   text-shadow: 0 1px 2px rgba(0,0,0,.6);
-
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
+  // We can't have this transition here because webkit cancels the carousel
+  // animation if you trip this while in the middle of another animation.
 
   // Set gradients for backgrounds
   &.left {
@@ -130,22 +120,25 @@
   left: 50%;
   z-index: 15;
   width: 100px;
-  margin: 0 0 0 -50px;
+  margin-left: -50px;
+  padding-left: 0;
   list-style: none;
   text-align: center;
 
   li {
     display: inline-block;
-    width: 8px;
-    height: 8px;
-    margin-left: 0;
-    margin-right: 0;
+    width:  10px;
+    height: 10px;
+    margin: 1px;
     text-indent: -999px;
     border: 1px solid #fff;
-    border-radius: 5px;
+    border-radius: 10px;
     cursor: pointer;
   }
   .active {
+    margin: 0;
+    width:  12px;
+    height: 12px;
     background-color: #fff;
   }
 }

diff --git a/_assets/bootstrap/close.less b/_assets/bootstrap/close.less
@@ -19,15 +19,15 @@
     cursor: pointer;
     .opacity(.5);
   }
-}
 
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
+  // Additional properties for button version
+  // iOS requires the button element instead of an anchor tag.
+  // If you want the anchor version, it requires `href="#"`.
+  button& {
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+    -webkit-appearance: none;
+  }
 }
diff --git a/_assets/bootstrap/code.less b/_assets/bootstrap/code.less
@@ -6,11 +6,7 @@
 // Inline and block code styles
 code,
 pre {
-  padding: 0 3px 2px;
   font-family: @font-family-monospace;
-  font-size: (@font-size-base - 2);
-  color: @gray-dark;
-  border-radius: 4px;
 }
 
 // Inline code
@@ -20,6 +16,7 @@ code {
   color: #c7254e;
   background-color: #f9f2f4;
   white-space: nowrap;
+  border-radius: 4px;
 }
 
 // Blocks of code
@@ -31,8 +28,7 @@ pre {
   line-height: @line-height-base;
   word-break: break-all;
   word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
+  color: @gray-dark;
   background-color: #f5f5f5;
   border: 1px solid #ccc; // IE8 fallback
   border: 1px solid rgba(0,0,0,.15);
@@ -47,7 +43,6 @@ pre {
   code {
     padding: 0;
     color: inherit;
-    white-space: pre;
     white-space: pre-wrap;
     background-color: transparent;
     border: 0;