Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <mark.otto@twitter.com>2011-07-30 00:10:33 +0400
committerMark Otto <mark.otto@twitter.com>2011-07-30 00:10:33 +0400
commit88bd6f72daaeb1cada7dab852e6f779af7b33823 (patch)
treedd085c6b2f7c8c2e0c977525d37771554c269c54
parent68d4b85ffc542ef85eb4fe1bfba7acf6d504f522 (diff)
parent7f99892b864295eef23bf24bd8c6c9b231d0c684 (diff)
resolve compiled css merge prob, refine few small things
-rw-r--r--Makefile4
-rw-r--r--bootstrap-1.0.0.css146
-rw-r--r--bootstrap-1.0.0.min.css30
-rw-r--r--docs/.DS_Storebin0 -> 6148 bytes
-rw-r--r--docs/assets/.DS_Storebin0 -> 6148 bytes
-rw-r--r--docs/assets/css/docs.css10
-rw-r--r--docs/assets/img/bird.pngbin0 -> 4434 bytes
-rw-r--r--docs/index.html39
-rw-r--r--lib/patterns.less102
9 files changed, 80 insertions, 251 deletions
diff --git a/Makefile b/Makefile
index 74ab90d023..f275d7ce96 100644
--- 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
index c5eb05684e..77a7276422 100644
--- 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,57 +1703,15 @@ 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;
- -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;
+ display: none;
}
-.popover2.above .arrow {
+.popover.above .arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
@@ -1761,7 +1719,7 @@ div.twipsy .twipsy-arrow {
border-right: 5px solid transparent;
border-top: 5px solid #000000;
}
-.popover2.right .arrow {
+.popover.right .arrow {
top: 50%;
left: 0;
margin-top: -5px;
@@ -1769,7 +1727,7 @@ div.twipsy .twipsy-arrow {
border-bottom: 5px solid transparent;
border-right: 5px solid #000000;
}
-.popover2.below .arrow {
+.popover.below .arrow {
top: 0;
left: 50%;
margin-left: -5px;
@@ -1777,7 +1735,7 @@ div.twipsy .twipsy-arrow {
border-right: 5px solid transparent;
border-bottom: 5px solid #000000;
}
-.popover2.left .arrow {
+.popover.left .arrow {
top: 50%;
right: 0;
margin-top: -5px;
@@ -1785,82 +1743,42 @@ div.twipsy .twipsy-arrow {
border-bottom: 5px solid transparent;
border-left: 5px solid #000000;
}
-.popover2 .arrow {
+.popover .arrow {
position: absolute;
width: 0;
height: 0;
}
-.popover2 .title {
- background-color: #222222;
- background-repeat: repeat-x;
- background-image: -khtml-gradient(linear, left top, left bottom, from(#444444), to(#222222));
- background-image: -moz-linear-gradient(#444444, #222222);
- background-image: -ms-linear-gradient(#444444, #222222);
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #444444), color-stop(100%, #222222));
- background-image: -webkit-linear-gradient(#444444, #222222);
- background-image: -o-linear-gradient(#444444, #222222);
- -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0)";
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0);
- background-image: linear-gradient(#444444, #222222);
+.popover .inner {
+ background: rgba(0, 0, 0, 0.8);
+ padding: 3px;
+ overflow: hidden;
+ width: 280px;
+ -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);
+}
+.popover .title {
+ background: #f5f5f5;
padding: 9px 15px;
- color: #fff;
line-height: 1;
- -webkit-border-radius: 6px 6px 0 0;
- -moz-border-radius: 6px 6px 0 0;
- border-radius: 6px 6px 0 0;
+ -webkit-border-radius: 3px 3px 0 0;
+ -moz-border-radius: 3px 3px 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;
- border-top: 0;
- -webkit-border-radius: 0 0 6px 6px;
- -moz-border-radius: 0 0 6px 6px;
- border-radius: 0 0 6px 6px;
+ -webkit-border-radius: 0 0 3px 3px;
+ -moz-border-radius: 0 0 3px 3px;
+ border-radius: 0 0 3px 3px;
-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
index 1bedb844ba..18283c4ad3 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -50,7 +50,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;
.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:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
-p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:12px;color:#bfbfbf;}
+p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:11px;color:#bfbfbf;}
h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;}
@@ -197,7 +197,7 @@ div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;bord
div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-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);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
div.modal .modal-body{padding:20px;}
-div.modal .modal-footer{background-color:#eee;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
+div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:after{display:block;visibility:hidden;height:0;clear:both;content:".";}
div.modal .modal-footer .btn{float:right;margin-left:10px;}
div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
@@ -205,21 +205,11 @@ div.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px s
div.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
div.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
div.twipsy .twipsy-arrow{position:absolute;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;-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{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{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{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{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
-.popover2 .arrow{position:absolute;width:0;height:0;}
-.popover2 .title{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#444444), to(#222222));background-image:-moz-linear-gradient(#444444, #222222);background-image:-ms-linear-gradient(#444444, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #444444), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#444444, #222222);background-image:-o-linear-gradient(#444444, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#444444, #222222);padding:9px 15px;color:#fff;line-height:1;-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;}
-.popover2 .content{background-color:#ffffff;padding:14px;border:1px solid #000000;border-top:0;-webkit-border-radius:0 0 6px 6px;-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{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;}
+.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.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;}
+.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;}
+.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;}
+.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;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-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);}
+.popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
+.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
diff --git a/docs/.DS_Store b/docs/.DS_Store
new file mode 100644
index 0000000000..f199fc7b18
--- /dev/null
+++ b/docs/.DS_Store
Binary files differ
diff --git a/docs/assets/.DS_Store b/docs/assets/.DS_Store
new file mode 100644
index 0000000000..57b2f456a7
--- /dev/null
+++ b/docs/assets/.DS_Store
Binary files differ
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 93c4f5b32a..13868fdd91 100644
--- 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;
} \ No newline at end of file
diff --git a/docs/assets/img/bird.png b/docs/assets/img/bird.png
new file mode 100644
index 0000000000..f0e6fcb51b
--- /dev/null
+++ b/docs/assets/img/bird.png
Binary files differ
diff --git a/docs/index.html b/docs/index.html
index 41be6b5ece..358642e2be 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1114,55 +1114,30 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</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 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="popover-wrapper">
+ <div class="popover left">
<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>
-
- </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>
+ <img class="large-bird" src="assets/img/bird.png">
</div>
</div>
</div>
</div> <!-- /row -->
-
+
</section>
diff --git a/lib/patterns.less b/lib/patterns.less
index b79438dea3..2163218f6f 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -496,7 +496,7 @@ div.modal {
padding: 20px;
}
.modal-footer {
- background-color: #eee;
+ background-color: #f5f5f5;
padding: 14px 20px 15px;
border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px);
@@ -583,108 +583,44 @@ div.twipsy {
// Popovers
// --------
-.popover-wrapper {
- position: relative;
-}
.popover {
position: absolute;
top: 0;
left: 0;
z-index: 1000;
- display: none;
-}
-.popover-border {
- background: rgba(0,0,0,.8);
padding: 5px;
- overflow: hidden;
- .border-radius(6px);
- .box-shadow(0 3px 6px rgba(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;
- .border-radius(3px);
- p, ul, ol {
- margin-bottom: 0;
- }
-}
-
-.popover2 {
- padding: 5px;
- .inner {
- .border-radius(6px);
- .box-shadow(0 3px 7px rgba(0,0,0,0.3));
- width: 280px;
- }
- &.above .arrow { #popoverArrow > .above(); }
- &.right .arrow { #popoverArrow > .right(); }
- &.below .arrow { #popoverArrow > .below(); }
- &.left .arrow { #popoverArrow > .left(); }
+ display: none;
+ &.above .arrow { #popoverArrow > .above(); }
+ &.right .arrow { #popoverArrow > .right(); }
+ &.below .arrow { #popoverArrow > .below(); }
+ &.left .arrow { #popoverArrow > .left(); }
.arrow {
position: absolute;
width: 0;
height: 0;
}
+ .inner {
+ background: rgba(0,0,0,.8);
+ padding: 3px;
+ overflow: hidden;
+ width: 280px;
+ .border-radius(6px);
+ .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+ }
.title {
- #gradient > .vertical(#444, #222);
+ background: #f5f5f5;
padding: 9px 15px;
- color: #fff;
line-height: 1;
- .border-radius(6px 6px 0 0);
+ .border-radius(3px 3px 0 0);
+ border-bottom:1px solid #eee;
}
.content {
background-color: @white;
padding: 14px;
- border: 1px solid rgba(0,0,0,1);
- border-top: 0;
- .border-radius(0 0 6px 6px);
+ .border-radius(0 0 3px 3px);
.background-clip(padding);
p, ul, ol {
margin-bottom: 0;
}
}
-}
-
-// Alt popover for menus
-.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,.75);
- border: 1px solid rgba(0,0,0,.5);
- .border-radius(6px);
- overflow: hidden;
- .box-shadow(0 3px 6px rgba(0,0,0,.25));
- -webkit-background-clip: padding;
-}
-.popover-menu .popover-inner {
- background: #222;
- padding: 7px;
- .border-radius(4px);
- width: 150px;
-}
-
-.popover-menu a {
- color: #fff;
- font-weight: bold;
- padding: 5px 8px;
-}
+} \ No newline at end of file