resolve compiled css merge prob, refine few small things

mansilladev · Jul 29, 2011 · 88bd6f7 · 88bd6f7
2 parents 68d4b85 + 7f99892
commit 88bd6f7
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 251 deletions.
diff --git a/Makefile b/Makefile
@@ -18,11 +18,11 @@ build:
 	fi
 
 watch:
-	@@if test ! -z ${LESS_COMPESSOR}; then \
+	@@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
 	  watchr -e "watch('lib/.*\.less') { system 'make' }"; \
 	else \
-		echo "You must have the WATCHR installed in order to build Bootstrap."; \
+		echo "You must have the watchr installed in order to watch Bootstrap less files."; \
 		echo "You can install it by running: gem install watchr"; \
 	fi
 

diff --git a/bootstrap-1.0.0.css b/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: Sat Jul 23 22:37:22 PDT 2011
+ * Date: Fri Jul 29 13:03:43 PDT 2011
  */
 /*
  * Reset.less
@@ -473,7 +473,7 @@ p {
   margin-bottom: 18px;
 }
 p small {
-  font-size: 12px;
+  font-size: 11px;
   color: #bfbfbf;
 }
 h1,
@@ -1621,7 +1621,7 @@ div.modal .modal-body {
   padding: 20px;
 }
 div.modal .modal-footer {
-  background-color: #eee;
+  background-color: #f5f5f5;
   padding: 14px 20px 15px;
   border-top: 1px solid #ddd;
   -webkit-border-radius: 0 0 6px 6px;
@@ -1703,164 +1703,82 @@ div.twipsy .twipsy-arrow {
   width: 0;
   height: 0;
 }
-.popover-wrapper {
-  position: relative;
-}
 .popover {
   position: absolute;
   top: 0;
   left: 0;
   z-index: 1000;
-  display: none;
-}
-.popover-border {
-  background: rgba(0, 0, 0, 0.8);
   padding: 5px;
-  overflow: hidden;
+  display: none;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  -moz-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-}
-.popover-title {
-  padding: 5px 15px 10px;
-  color: #fff;
-  line-height: 1;
-}
-.popover-inner {
-  background-color: #fff;
-  overflow: hidden;
-  padding: 15px;
-  width: 200px;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.popover-inner p, .popover-inner ul, .popover-inner ol {
-  margin-bottom: 0;
-}
-.popover2 {
-  padding: 5px;
-}
-.popover2 .inner {
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  width: 280px;
 }
-.popover2.above .arrow {
+.popover.above .arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
   border-left: 5px solid transparent;
   border-right: 5px solid transparent;
   border-top: 5px solid #000000;
 }
-.popover2.right .arrow {
+.popover.right .arrow {
   top: 50%;
   left: 0;
   margin-top: -5px;
   border-top: 5px solid transparent;
   border-bottom: 5px solid transparent;
   border-right: 5px solid #000000;
 }
-.popover2.below .arrow {
+.popover.below .arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;
   border-left: 5px solid transparent;
   border-right: 5px solid transparent;
   border-bottom: 5px solid #000000;
 }
-.popover2.left .arrow {
+.popover.left .arrow {
   top: 50%;
   right: 0;
   margin-top: -5px;
   border-top: 5px solid transparent;
   border-bottom: 5px solid transparent;
   border-left: 5px solid #000000;
 }
-.popover2 .arrow {
+.popover .arrow {
   position: absolute;
   width: 0;
   height: 0;
 }
-.popover2 .title {
+.popover .inner {
-  background-color: #222222;
+  background: rgba(0, 0, 0, 0.8);
-  background-repeat: repeat-x;
+  padding: 3px;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#444444), to(#222222));
+  overflow: hidden;
-  background-image: -moz-linear-gradient(#444444, #222222);
+  width: 280px;
-  background-image: -ms-linear-gradient(#444444, #222222);
+  -webkit-border-radius: 6px;
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #444444), color-stop(100%, #222222));
+  -moz-border-radius: 6px;
-  background-image: -webkit-linear-gradient(#444444, #222222);
+  border-radius: 6px;
-  background-image: -o-linear-gradient(#444444, #222222);
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0)";
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  background-image: linear-gradient(#444444, #222222);
+}
+.popover .title {
+  background: #f5f5f5;
   padding: 9px 15px;
-  color: #fff;
   line-height: 1;
-  -webkit-border-radius: 6px 6px 0 0;
+  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 6px 6px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 6px 6px 0 0;
+  border-radius: 3px 3px 0 0;
+  border-bottom: 1px solid #eee;
 }
-.popover2 .content {
+.popover .content {
   background-color: #ffffff;
   padding: 14px;
-  border: 1px solid #000000;
+  -webkit-border-radius: 0 0 3px 3px;
-  border-top: 0;
+  -moz-border-radius: 0 0 3px 3px;
-  -webkit-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
   -webkit-background-clip: padding;
   -moz-background-clip: padding;
   background-clip: padding;
 }
-.popover2 .content p, .popover2 .content ul, .popover2 .content ol {
+.popover .content p, .popover .content ul, .popover .content ol {
   margin-bottom: 0;
 }
-.popover-menu {
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: none;
-  z-index: 1000;
-  background: none;
-}
-.popover-menu .popover-arrow {
-  width: 100%;
-  height: 14px;
-  background: url(/blueprint/images/popover-menu-bottom.png) no-repeat bottom center;
-}
-.popover-menu .popover-border {
-  margin: 0 0 -3px;
-  padding: 2px;
-  background: rgba(255, 255, 255, 0.75);
-  border: 1px solid rgba(0, 0, 0, 0.5);
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
-  overflow: hidden;
-  -webkit-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  -moz-box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
-  -webkit-background-clip: padding;
-}
-.popover-menu .popover-inner {
-  background: #222;
-  padding: 7px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  width: 150px;
-}
-.popover-menu a {
-  color: #fff;
-  font-weight: bold;
-  padding: 5px 8px;
-}
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
diff --git a/docs/.DS_Store b/docs/.DS_Store
diff --git a/docs/assets/.DS_Store b/docs/assets/.DS_Store
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -231,14 +231,24 @@ div.topbar-wrapper div.topbar {
 div.popover-well {
   min-height: 160px;
 }
+
 div.popover-well div.popover {
   display: block;
 }
+
 div.popover-well div.popover-wrapper {
   width: 50%;
   height: 160px;
   float: left;
+  margin-left: 55px;
+  position:relative;
 }
+
 div.popover-well div.popover-menu-wrapper {
   height: 80px;
+}
+
+img.large-bird {
+  margin: 5px 0 0 310px;
+  opacity:.1;
 }
diff --git a/docs/assets/img/bird.png b/docs/assets/img/bird.png
diff --git a/docs/index.html b/docs/index.html
@@ -1114,55 +1114,30 @@ <h2>Tool Tips</h2>
       </div>
     </div>
   </div> <!-- /row -->
-    
+
   <div class="row">
     <div class="span4 columns">
       <h2>Popovers</h2>
+      <p>Use popovers to provide subtextual information to a page without effecting layout.</p>
     </div>
     <div class="span12 columns">
       <div class="well popover-well">
-
+         <div class="popover-wrapper">
-        <div class="popover-wrapper">
+          <div class="popover left">
-          <div class="popover above">
-            <div class="popover-border">
-              <h3 class="popover-title">Popover title</h3>
-              <div class="popover-inner">
-                <p>Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div class="popover-wrapper">
-          <div class="popover bottom popover2">
             <div class="arrow"></div>
             <div class="inner">
-              <h3 class="title">Popover title</h3>
+              <h3 class="title">Popover Title</h3>
               <div class="content">
                 <p>Etiam porta sem malesuada magna mollis euismod. Maecenas faucibus mollis interdum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
               </div>
             </div>
           </div>
-        </div>
+          <img class="large-bird" src="assets/img/bird.png">
-
-      </div>
-      <div class="well popover-well popover-menu-well">
-        <div class="popover-wrapper">
-          <div class="popover popover-menu">
-            <div class="popover-border">
-              <div class="popover-inner">
-                <a href="">View</a>
-                <a href="">Edit</a>
-                <a href="">Delete</a>
-              </div>
-            </div>
-            <div class="popover-arrow"></div>
-          </div>
         </div>
       </div>
     </div>
   </div> <!-- /row -->
-    
+
 
 </section>