upgrading everything

kmadac · Jun 22, 2013 · cbd3371 · cbd3371
1 parent 4d669b5
commit cbd3371
Show file tree

Hide file tree

Showing 38 changed files with 3,716 additions and 1,259 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ build:
 	@echo "Compiling and Compressing Less and CSS files with Recess... ${CHECK} Done"
 	@cat _assets/bootstrapjs/* > js/up.js.tmp
 	@cat _assets/up.js >> js/up.js.tmp
-	@uglifyjs -nc  js/up.js.tmp > js/up.js
+	@uglifyjs js/up.js.tmp > js/up.js
 	@rm -rf js/up.js.tmp
 	@echo "Compiling and Compressing JS files with uglify-js... ${CHECK} Done"
 	@echo "${HR}"

diff --git a/_assets/bootstrap/alerts.less b/_assets/bootstrap/alerts.less
@@ -24,9 +24,8 @@
   hr {
     border-top-color: darken(@alert-border, 5%);
   }
-  // Inherit color for immediate links and bolden them some
-  > a,
-  > p > a {
+  // Provide class for links that match alerts
+  .alert-link {
     font-weight: 500;
     color: darken(@alert-text, 10%);
   }
@@ -50,8 +49,7 @@
   hr {
     border-top-color: darken(@alert-success-border, 5%);
   }
-  > a,
-  > p > a {
+  .alert-link {
     color: darken(@alert-success-text, 10%);
   }
 }
@@ -62,8 +60,7 @@
   hr {
     border-top-color: darken(@alert-danger-border, 5%);
   }
-  > a,
-  > p > a {
+  .alert-link {
     color: darken(@alert-danger-text, 10%);
   }
 }
@@ -74,8 +71,7 @@
   hr {
     border-top-color: darken(@alert-info-border, 5%);
   }
-  > a,
-  > p > a {
+  .alert-link {
     color: darken(@alert-info-text, 10%);
   }
 }

diff --git a/_assets/bootstrap/carousel.less b/_assets/bootstrap/carousel.less
@@ -90,13 +90,13 @@
 
   // Set gradients for backgrounds
   &.left {
-    #gradient > .horizontal(rgba(0,0,0,.5), rgba(0,0,0,.0001));
+    #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));
     background-color: transparent;
   }
   &.right {
     left: auto;
     right: 0;
-    #gradient > .horizontal(rgba(0,0,0,.0001), rgba(0,0,0,.5));
+    #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));
     background-color: transparent;
   }
 
@@ -128,7 +128,7 @@
   position: absolute;
   bottom: 20px;
   left: 50%;
-  z-index: 5;
+  z-index: 15;
   width: 100px;
   margin: 0 0 0 -50px;
   list-style: none;

diff --git a/_assets/bootstrap/component-animations.less b/_assets/bootstrap/component-animations.less
@@ -11,22 +11,13 @@
   }
 }
 
-/*.collapse {
+.collapse {
   position: relative;
   height: 0;
   overflow: hidden;
   .transition(height .35s ease);
+
   &.in {
     height: auto;
   }
-}*/
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  .transition(height .35s ease);
-}
-.collapse.in {
-  height: auto;
 }
diff --git a/_assets/bootstrap/dropdowns.less b/_assets/bootstrap/dropdowns.less
@@ -68,7 +68,7 @@
 .dropdown-submenu:focus > a {
   text-decoration: none;
   color: @dropdown-link-hover-color;
-  #gradient > .vertical(@dropdown-link-hover-bg, darken(@dropdown-link-hover-bg, 5%));
+  #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
 }
 
 // Active state
@@ -79,7 +79,7 @@
   color: @dropdown-link-active-color;
   text-decoration: none;
   outline: 0;
-  #gradient > .vertical(@dropdown-link-active-bg, darken(@dropdown-link-active-bg, 5%));
+  #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
 }
 
 // Disabled state
@@ -114,6 +114,18 @@
   }
 }
 
+
+// Backdrop to catch body clicks on mobile, etc.
+// ---------------------------
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: @zindex-dropdown - 10;
+}
+
 // Right aligned dropdowns
 // ---------------------------
 .pull-right > .dropdown-menu {

diff --git a/_assets/bootstrap/forms.less b/_assets/bootstrap/forms.less
@@ -72,6 +72,17 @@ input[type="color"] {
     outline: 0;
     .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
   }
+
+  // Disabled and read-only inputs
+  // Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
+  //   disabled if the fieldset is disabled. Due to implementation difficulty,
+  //   we don't honor that edge case; we style them as disabled anyway.
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    background-color: @input-bg-disabled;
+  }
 }
 
 // Reset appearance properties for textual inputs and textarea
@@ -124,6 +135,13 @@ select[size] {
   height: auto;
 }
 
+// Fix optgroup Firefox bug per https://github.com/twitter/bootstrap/issues/7611
+select optgroup {
+  font-size: inherit;
+  font-style: inherit;
+  font-family: inherit;
+}
+
 // Focus for select, file, radio, and checkbox
 input[type="file"]:focus,
 input[type="radio"]:focus,
@@ -220,6 +238,7 @@ input[type="search"],
 input[type="tel"],
 input[type="color"] {
   &.input-large {
+    min-height: @input-height-large;
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
@@ -233,79 +252,23 @@ input[type="color"] {
 }
 
 
-// DISABLED STATE
-// --------------
-
-// Disabled and read-only inputs
-// Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
-//   disabled if the fieldset is disabled. Due to implementation difficulty,
-//   we don't honor that edge case; we style them as disabled anyway.
-input,
-select,
-textarea {
-  &[disabled],
-  &[readonly],
-  fieldset[disabled] & {
-    cursor: not-allowed;
-    background-color: @input-bg-disabled;
-  }
-}
-// Explicitly reset the colors here
-input[type="radio"],
-input[type="checkbox"] {
-  &[disabled],
-  &[readonly],
-  fieldset[disabled] & {
-    background-color: transparent;
-  }
-}
-
-
-
 
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
 // Warning
 .has-warning {
-  .formFieldState(@state-warning-text, @state-warning-text, @state-warning-bg);
+  .form-field-validation(@state-warning-text, @state-warning-text, @state-warning-bg);
 }
 // Error
 .has-error {
-  .formFieldState(@state-danger-text, @state-danger-text, @state-danger-bg);
+  .form-field-validation(@state-danger-text, @state-danger-text, @state-danger-bg);
 }
 // Success
 .has-success {
-  .formFieldState(@state-success-text, @state-success-text, @state-success-bg);
+  .form-field-validation(@state-success-text, @state-success-text, @state-success-bg);
 }
 
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @shadow: 0 0 6px lighten(#ee5f5b, 20%);
-    .box-shadow(@shadow);
-  }
-}
-
-
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: @line-height-computed 20px;
-  margin-top: @line-height-computed;
-  margin-bottom: @line-height-computed;
-  background-color: @form-actions-bg;
-  border-top: 1px solid #e5e5e5;
-  .clearfix(); // Adding clearfix to allow for .pull-right button containers
-}
 
 
 
@@ -365,7 +328,7 @@ select:focus:invalid {
 // -------------------------
 .input-group-addon {
   .box-sizing(border-box);
-  padding: 6px 8px;
+  padding: @padding-base-vertical @padding-base-horizontal;
   font-size: @font-size-base;
   font-weight: normal;
   line-height: @line-height-base;
@@ -456,14 +419,14 @@ select:focus:invalid {
   .row + .row {
     margin-top: 15px;
   }
-  .row-label {
+  .control-label {
     padding-top: 6px;
   }
 }
 
 // Only right aline form labels here when the columns stop stacking
 @media (min-width: 768px) {
-  .form-horizontal .row-label {
+  .form-horizontal .control-label {
     text-align: right;
   }
 }