2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Implement the new border-radius guard: only round things if global @enable-rounded == true

This commit is contained in:
Mark Otto
2014-07-08 16:25:01 -07:00
parent 86099bfb33
commit f6367bc0e4
36 changed files with 55 additions and 489 deletions
+4 -4
View File
@@ -85,7 +85,7 @@
margin-right: 2px;
line-height: @line-height-base;
border: 1px solid transparent;
border-radius: @border-radius-base @border-radius-base 0 0;
.border-radius(@border-radius-base @border-radius-base 0 0);
&:hover {
border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;
}
@@ -120,7 +120,7 @@
// Links rendered as pills
> a {
border-radius: @nav-pills-border-radius;
.border-radius(@nav-pills-border-radius);
}
+ li {
margin-left: 2px;
@@ -193,7 +193,7 @@
> li > a {
// Override margin from .nav-tabs
margin-right: 0;
border-radius: @border-radius-base;
.border-radius(@border-radius-base);
}
> .active > a,
@@ -205,7 +205,7 @@
@media (min-width: @screen-sm-min) {
> li > a {
border-bottom: 1px solid @nav-tabs-justified-link-border-color;
border-radius: @border-radius-base @border-radius-base 0 0;
.border-radius(@border-radius-base @border-radius-base 0 0);
}
> .active > a,
> .active > a:hover,