aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-09-16 10:51:44 -0700
committerMark Otto <[email protected]>2011-09-16 10:51:44 -0700
commite8d9eb264c3ba8c263d37259f65eece7247b00b9 (patch)
treec6d6cac4266f0c618329eace3c026eae127cd037 /bootstrap.css
parent29033316e414748862b28eb69dfc2a6e71bd15b1 (diff)
downloadbootstrap-e8d9eb264c3ba8c263d37259f65eece7247b00b9.tar.xz
bootstrap-e8d9eb264c3ba8c263d37259f65eece7247b00b9.zip
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css14
1 files changed, 9 insertions, 5 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 8f1058535..94dbb099b 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Fri Sep 16 10:13:51 PDT 2011
+ * Date: Fri Sep 16 10:51:22 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).
@@ -1589,8 +1589,8 @@ a.menu:after, .dropdown-toggle:after {
top: 1px;
}
.tabs > li > a {
- margin-right: 2px;
padding: 0 15px;
+ margin-right: 2px;
line-height: 36px;
border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
@@ -1603,7 +1603,6 @@ a.menu:after, .dropdown-toggle:after {
border-color: #eee #eee #ddd;
}
.tabs > li.active > a {
- padding: 0 14px;
color: #808080;
background-color: #ffffff;
border: 1px solid #ddd;
@@ -1939,6 +1938,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
}
+.alert-message .close {
+ *margin-top: 3px;
+ /* IE7 spacing */
+
+}
.alert-message h5 {
line-height: 18px;
}
@@ -2252,8 +2256,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
height: 0;
}
.popover .inner {
- background: #333;
- background: rgba(0, 0, 0, 0.8);
+ background-color: #000000;
+ background-color: rgba(0, 0, 0, 0.8);
padding: 3px;
overflow: hidden;
width: 280px;