aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-21 12:31:55 -0700
committerJacob Thornton <[email protected]>2011-08-21 12:31:55 -0700
commit971336c8086825e1a227bb956482708a3df0875d (patch)
tree49badb2a0e487cf9ed4f1bd70ca6bdc620e209df
parent6fa71861556f4f6c4b5e2b29e592ab9c118be8ef (diff)
downloadbootstrap-971336c8086825e1a227bb956482708a3df0875d.tar.xz
bootstrap-971336c8086825e1a227bb956482708a3df0875d.zip
don't display right border for ie
-rw-r--r--bootstrap-1.0.0.css3
-rw-r--r--bootstrap-1.0.0.min.css2
-rw-r--r--lib/patterns.less1
3 files changed, 4 insertions, 2 deletions
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index d5b91901c..aa3308210 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: Sun Aug 21 12:27:18 PDT 2011
+ * Date: Sun Aug 21 12:30:45 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).
@@ -1545,6 +1545,7 @@ div.pagination ul {
float: left;
margin: 0;
border: 1px solid #ddd;
+ border-right-color: rgba(0, 0, 0, 0.15);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css
index 22f98ddad..c723cd651 100644
--- a/bootstrap-1.0.0.min.css
+++ b/bootstrap-1.0.0.min.css
@@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:-
ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;}
ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
-div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;}
+div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;border-right-color:rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;}
div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;}
div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;}
div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;}
diff --git a/lib/patterns.less b/lib/patterns.less
index 9e57d0e30..dc5f45ab0 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -457,6 +457,7 @@ div.pagination {
float: left;
margin: 0;
border: 1px solid #ddd;
+ border-right-color: rgba(0,0,0,.15); // don't display right border for ie
.border-radius(3px);
.box-shadow(0 1px 2px rgba(0,0,0,.075);
li {