resolve conflicts

bootstrap-1.0.0.css

@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Aug 21 20:30:19 PDT 2011
+ * Date: Sun Aug 21 20:33:21 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -395,8 +395,9 @@ a:hover {
   color: #333333;
   font-size: 13px;
   line-height: 18px;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  border-bottom-color: rgba(0, 0, 0, 0.25);
+  border: 1px solid;
+  border-color: #ccc #ccc #bbb;
+  border-color: borderColor borderColor rgba(0, 0, 0, 0.25);
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -424,6 +425,8 @@ a:hover {
   background-image: linear-gradient(#049cdb, #0064cd);
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
 }
 .btn.primary:hover {
   color: #fff;
@@ -440,7 +443,15 @@ a:hover {
   padding-left: 9px;
   font-size: 11px;
 }
-.btn:disabled, .btn.disabled {
+.btn.disabled {
+  background-image: none;
+  filter: alpha(opacity=65);
+  -khtml-opacity: 0.65;
+  -moz-opacity: 0.65;
+  opacity: 0.65;
+  cursor: default;
+}
+.btn:disabled {
   background-image: none;
   filter: alpha(opacity=65);
   -khtml-opacity: 0.65;
@@ -1104,6 +1115,18 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   right: 0;
   z-index: 10000;
   overflow: visible;
+}
+.topbar .fill {
+  background: #222;
+  background-color: #222222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(#333333, #222222);
+  background-image: -ms-linear-gradient(#333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(#333333, #222222);
+  background-image: -o-linear-gradient(#333333, #222222);
+  background-image: linear-gradient(#333333, #222222);
   -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
@@ -1118,6 +1141,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #ffffff;
   text-decoration: none;
 }
+.topbar h3 {
+  position: relative;
+}
 .topbar h3 a {
   float: left;
   display: block;
@@ -1138,7 +1164,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   opacity: 1;
 }
 .topbar form input {
-  background-color: #bfbfbf;
+  background-color: #444;
   background-color: rgba(255, 255, 255, 0.3);
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: normal;
@@ -1166,7 +1192,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   color: #e6e6e6;
 }
 .topbar form input:hover {
-  background-color: #444;
+  background-color: #bfbfbf;
   background-color: rgba(255, 255, 255, 0.5);
   color: #fff;
 }
@@ -1239,7 +1265,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   opacity: 0.5;
 }
 .topbar ul li.menu.open a.menu, .topbar ul li.menu.open a:hover {
-  background-color: #333;
+  background-color: #444;
   background-color: rgba(255, 255, 255, 0.1);
   color: #fff;
 }
@@ -1303,6 +1329,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 .topbar ul li ul li.divider {
   height: 1px;
   overflow: hidden;
+  background: #222;
   background: rgba(0, 0, 0, 0.2);
   border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   margin: 5px 0;
@@ -1346,6 +1373,17 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   margin-bottom: 8px;
 }
 .alert-message {
+  background-color: rgba(0, 0, 0, 0.15);
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));
+  background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
+  background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));
+  background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
+  background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));
+  background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
+  filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
   background-color: #e6e6e6;
   margin-bottom: 18px;
   padding: 8px 15px;
@@ -1435,6 +1473,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   padding: 14px;
   color: #404040;
   color: rgba(0, 0, 0, 0.8);
+  *color: #404040;
+  /* IE 6-7 */
+
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;
@@ -1443,6 +1484,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 .block-message p {
   color: #404040;
   color: rgba(0, 0, 0, 0.8);
+  *color: #404040;
+  /* IE 6-7 */
+
   margin-right: 30px;
   margin-bottom: 0;
 }
@@ -1543,6 +1587,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   margin: 0;
   border: 1px solid #ddd;
   border: 1px solid rgba(0, 0, 0, 0.15);
+  border-right: 0\9;
+  /* IE8 and below don't support last child. TODO: clean this up;  */
+
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -1557,8 +1604,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   float: left;
   padding: 0 14px;
   line-height: 34px;
-  border-right: 1px solid #ddd;
-  border-right: 1px solid rgba(0, 0, 0, 0.15);
+  border-right: 1px solid;
+  border-right-color: #ddd;
+  border-right-color: rgba(0, 0, 0, 0.15);
   text-decoration: none;
 }
 .pagination ul li a:hover, .pagination ul li.active a {

docs/assets/css/docs.css

@@ -221,6 +221,9 @@ div.topbar-wrapper {
 div.topbar-wrapper div.topbar {
   position: absolute;
   margin: 0 -20px;
+}
+
+div.topbar-wrapper div.topbar .fill {
   padding-left: 20px;
   padding-right: 20px;
   -webkit-border-radius: 4px;

docs/assets/js/application.js

@@ -42,25 +42,12 @@ $(document).ready(function(){
   // Dropdown example for topbar nav
   // ===============================
 
-  $("body").bind("click", function(e) {
-    $("ul.menu-dropdown").hide();
-    $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide();
+  $("body").bind("click", function (e) {
+    $('a.menu').parent("li").removeClass("open");
   });
 
-  $("a.menu").click(function(e) {
-    var $target = $(this);
-    var $parent = $target.parent("li");
-    var $siblings = $target.siblings("ul.menu-dropdown");
-    var $parentSiblings = $parent.siblings("li");
-    if ($parent.hasClass("open")) {
-      $parent.removeClass("open");
-      $siblings.hide();
-    } else {
-      $parent.addClass("open");
-      $siblings.show();
-    }
-    $parentSiblings.children("ul.menu-dropdown").hide();
-    $parentSiblings.removeClass("open");
+  $("a.menu").click(function (e) {
+    var $li = $(this).parent("li").toggleClass('open');
     return false;
   });
 

docs/index.html

@@ -32,21 +32,23 @@
   <body onload="prettyPrint();">
 
     <div class="topbar">
-      <div class="container">
-        <h3><a href="#">Bootstrap</a></h3>
-        <ul>
-          <li class="active"><a href="#masthead">Overview</a></li>
-          <li><a href="#about">About</a></li>
-          <li><a href="#grid-system">Grid</a></li>
-          <li><a href="#layouts">Layouts</a></li>
-          <li><a href="#typography">Typography</a></li>
-          <li><a href="#tables">Tables</a></li>
-          <li><a href="#forms">Forms</a></li>
-          <li><a href="#navigation">Navigation</a></li>
-          <li><a href="#alerts">Alerts</a></li>
-          <li><a href="#popovers">Popovers</a></li>
-          <li><a href="#less">Less</a></li>
-        </ul>
+      <div class="fill">
+        <div class="container">
+          <h3><a href="#">Bootstrap</a></h3>
+          <ul>
+            <li class="active"><a href="#masthead">Overview</a></li>
+            <li><a href="#about">About</a></li>
+            <li><a href="#grid-system">Grid</a></li>
+            <li><a href="#layouts">Layouts</a></li>
+            <li><a href="#typography">Typography</a></li>
+            <li><a href="#tables">Tables</a></li>
+            <li><a href="#forms">Forms</a></li>
+            <li><a href="#navigation">Navigation</a></li>
+            <li><a href="#alerts">Alerts</a></li>
+            <li><a href="#popovers">Popovers</a></li>
+            <li><a href="#less">Less</a></li>
+          </ul>
+        </div>
       </div>
     </div>
 
@@ -831,8 +833,10 @@
     <h3>Example buttons</h3>
     <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
     <div class="well" style="padding: 14px 19px;">
-      <button type="submit" class="btn primary">Submit</button>
-      <button type="submit" class="btn">Cancel</button>
+      <form>
+        <button type="submit" class="btn primary">Submit</button>
+        <button type="submit" class="btn">Cancel</button>
+      </form>
     </div>
     <h3>Alternate sizes</h3>
     <p>Fancy larger or smaller buttons? Have at it!</p>
@@ -846,6 +850,7 @@
     </div>
     <h3>Disabled state</h3>
     <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
+    <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
     <h4>Links</h4>
     <div class="well">
       <a href="#" class="btn large primary disabled">Primary action</a>
@@ -853,8 +858,10 @@
     </div>
     <h4>Buttons</h4>
     <div class="well">
-      <button class="btn large primary" disabled>Primary action</button>
-      <button class="btn large" disabled>Action</button>
+      <form>
+        <button class="btn large primary disabled" disabled>Primary action</button>
+        <button class="btn large disabled" disabled>Action</button>
+      </form>
     </div>
   </div>
 </div>
@@ -869,28 +876,30 @@
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
-      <div class="container fixed">
-        <h3><a href="#">Project Name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <form action="">
-          <input type="text" placeholder="Search" />
-        </form>
-        <ul class="nav secondary-nav">
-          <li class="menu">
-            <a href="#" class="menu">Dropdown</a>
-            <ul class="menu-dropdown">
-              <li><a href="#">Secondary link</a></li>
-              <li><a href="#">Something else here</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
-            </ul>
-          </li>
-        </ul>
+      <div class="fill">
+        <div class="container fixed">
+          <h3><a href="#">Project Name</a></h3>
+          <ul>
+            <li class="active"><a href="#">Home</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+          </ul>
+          <form action="">
+            <input type="text" placeholder="Search" />
+          </form>
+          <ul class="nav secondary-nav">
+            <li class="menu">
+              <a href="#" class="menu">Dropdown</a>
+              <ul class="menu-dropdown">
+                <li><a href="#">Secondary link</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Another link</a></li>
+              </ul>
+            </li>
+          </ul>
+        </div>
       </div>
     </div>
   </div> <!-- topbar-wrapper -->
@@ -1089,7 +1098,7 @@
       <p>Modals&mdash;dialogs or lightboxes&mdash;are great for contextual actions in situations where it’s important that the background context be maintained.</p>
     </div>
     <div class="span12 columns">
-      <div class="well" style="background-color: rgba(0,0,0,0.5); border: none; padding: 40px;">
+      <div class="well" style="background-color: #888; border: none; padding: 40px;">
         <!-- Modal -->
         <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
           <div class="modal-header">
@@ -1157,7 +1166,11 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
               </div>
             </div>
           </div>
+<<<<<<< HEAD
           <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
+=======
+          <img class="large-bird" src="assets/img/bird.png" width="220px" height="151px">
+>>>>>>> 842ad01fce710c50dc9c0174ab790f91e66c46b1
         </div>
       </div>
     </div>

lib/patterns.less

@@ -16,8 +16,14 @@
   right: 0;
   z-index: 10000;
   overflow: visible;
-  @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-  .box-shadow(@shadow);
+
+  // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
+  .fill {
+    background:#222;
+    #gradient > .vertical(#333, #222);
+    @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+    .box-shadow(@shadow);
+  }
 
   // Links get text shadow
   a {
@@ -35,15 +41,18 @@
   }
 
   // Website name
-  h3 a {
-    float: left;
-    display: block;
-    padding: 8px 20px 12px;
-    margin-left: -20px; // negative indent to left-align the text down the page
-    color: @white;
-    font-size: 20px;
-    font-weight: 200;
-    line-height: 1;
+  h3 {
+    position:relative;
+    a {
+      float: left;
+      display: block;
+      padding: 8px 20px 12px;
+      margin-left: -20px; // negative indent to left-align the text down the page
+      color: @white;
+      font-size: 20px;
+      font-weight: 200;
+      line-height: 1;
+    }
   }
 
   // Search Form
@@ -53,7 +62,7 @@
     position: relative;
     .opacity(100);
     input {
-      background-color: @grayLight;
+      background-color: #444;
       background-color: rgba(255,255,255,.3);
       #font > .sans-serif(13px, normal, 1);
       width: 220px;
@@ -75,7 +84,7 @@
       }
       // Hover states
       &:hover {
-        background-color: #444;
+        background-color: @grayLight;
         background-color: rgba(255,255,255,.5);
         color: #fff;
       }
@@ -153,7 +162,7 @@
       &.open {
         a.menu,
         a:hover {
-          background-color: #333;
+          background-color: #444;
           background-color: rgba(255,255,255,.1);
           color: #fff;
         }
@@ -217,6 +226,7 @@
         &.divider {
           height: 1px;
           overflow: hidden;
+          background: #222;
           background: rgba(0,0,0,.2);
           border-bottom: 1px solid rgba(255,255,255,.1);
           margin: 5px 0;
@@ -278,6 +288,10 @@
 
 // One-liner alert bars
 .alert-message {
+  // TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_;
+  #gradient > .vertical(transparent, rgba(0,0,0,0.15));
+  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
+  filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";
   background-color: @grayLighter;
   margin-bottom: @baseline;
   padding: 8px 15px;
@@ -329,11 +343,13 @@
   padding: 14px;
   color: @grayDark;
   color: rgba(0,0,0,.8);
+  *color: @grayDark; /* IE 6-7 */
   text-shadow: 0 1px 0 rgba(255,255,255,.25);
   .border-radius(6px);
   p {
     color: @grayDark;
     color: rgba(0,0,0,.8);
+    *color: @grayDark; /* IE 6-7 */
     margin-right: 30px;
     margin-bottom: 0;
   }
@@ -442,6 +458,7 @@
     margin: 0;
     border: 1px solid #ddd;
     border: 1px solid rgba(0,0,0,.15);
+    border-right: 0\9; /* IE8 and below don't support last child. TODO: clean this up;  */
     .border-radius(3px);
     .box-shadow(0 1px 2px rgba(0,0,0,.05);
     li {
@@ -450,8 +467,9 @@
         float: left;
         padding: 0 14px;
         line-height: (@baseline * 2) - 2;
-        border-right: 1px solid #ddd;
-        border-right: 1px solid rgba(0,0,0,.15);
+        border-right: 1px solid;
+        border-right-color: #ddd;
+        border-right-color: rgba(0,0,0,.15);
         text-decoration: none;
       }
       a:hover,

lib/preboot.less

@@ -189,8 +189,9 @@
   color: @textColor;
   font-size: @fontSize;
   line-height: @baseline;
-  border: 1px solid @borderColor;
-  border-bottom-color: fadein(@borderColor, 15%);
+  border: 1px solid;
+  border-color: #ccc #ccc #bbb;
+  border-color: borderColor borderColor fadein(@borderColor, 15%);
   .border-radius(@borderRadius);
   @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   .box-shadow(@shadow);

lib/scaffolding.less

@@ -101,6 +101,8 @@ a {
     #gradient > .vertical(@blue, @blueDark);
     color: #fff;
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+    border-color: @blueDark @blueDark darken(@blueDark, 15%);
+    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
     &:hover {
       color: #fff;
     }
@@ -115,12 +117,18 @@ a {
     padding-left: 9px;
     font-size: 11px;
   }
-  &:disabled,
   &.disabled {
     background-image: none;
     .opacity(65);
     cursor: default;
   }
+
+  // this can't be included with the .disabled def because IE8 and below will drop it ;_;
+  &:disabled {
+    background-image: none;
+    .opacity(65);
+    cursor: default;
+  }
   &:active {
     @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
     .box-shadow(@shadow);