From dd8b745b883a900aa637a7b8142be5691ebc3913 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Wed, 3 Oct 2012 09:26:52 -0700
Subject: [PATCH] use border-radius vars where possible
---
docs/assets/css/bootstrap.css | 30 +++++++++++++++---------------
less/accordion.less | 2 +-
less/alerts.less | 2 +-
less/breadcrumbs.less | 2 +-
less/buttons.less | 2 +-
less/code.less | 2 +-
less/dropdowns.less | 2 +-
less/navbar.less | 2 +-
less/progress-bars.less | 2 +-
less/responsive-navbar.less | 2 +-
less/tables.less | 2 +-
less/thumbnails.less | 2 +-
less/tooltip.less | 2 +-
less/variables.less | 2 +-
less/wells.less | 6 +++---
15 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 987c9abe59..b7621054e8 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3144,9 +3144,9 @@ button.close {
.btn-large {
padding: 11px 19px;
font-size: 17.5px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
}
.btn-large [class^="icon-"],
@@ -4838,22 +4838,22 @@ input[type="submit"].btn.btn-mini {
.pagination-large ul > li:first-child > a,
.pagination-large ul > li:first-child > span {
- -webkit-border-bottom-left-radius: 5px;
- border-bottom-left-radius: 5px;
- -webkit-border-top-left-radius: 5px;
- border-top-left-radius: 5px;
- -moz-border-radius-bottomleft: 5px;
- -moz-border-radius-topleft: 5px;
+ -webkit-border-bottom-left-radius: 6px;
+ border-bottom-left-radius: 6px;
+ -webkit-border-top-left-radius: 6px;
+ border-top-left-radius: 6px;
+ -moz-border-radius-bottomleft: 6px;
+ -moz-border-radius-topleft: 6px;
}
.pagination-large ul > li:last-child > a,
.pagination-large ul > li:last-child > span {
- -webkit-border-top-right-radius: 5px;
- border-top-right-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
- border-bottom-right-radius: 5px;
- -moz-border-radius-topright: 5px;
- -moz-border-radius-bottomright: 5px;
+ -webkit-border-top-right-radius: 6px;
+ border-top-right-radius: 6px;
+ -webkit-border-bottom-right-radius: 6px;
+ border-bottom-right-radius: 6px;
+ -moz-border-radius-topright: 6px;
+ -moz-border-radius-bottomright: 6px;
}
.pagination-mini ul > li:first-child > a,
diff --git a/less/accordion.less b/less/accordion.less
index c13c7be260..d63523bc8c 100644
--- a/less/accordion.less
+++ b/less/accordion.less
@@ -12,7 +12,7 @@
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
.accordion-heading {
border-bottom: 0;
diff --git a/less/alerts.less b/less/alerts.less
index 6df5fd72d0..9abb226d6b 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -12,7 +12,7 @@
text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: @warningBackground;
border: 1px solid @warningBorder;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
color: @warningText;
}
.alert h4 {
diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index fd269b31a0..76fbe30ffd 100644
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -8,7 +8,7 @@
margin: 0 0 @baseLineHeight;
list-style: none;
background-color: #f5f5f5;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
li {
display: inline-block;
.ie7-inline-block();
diff --git a/less/buttons.less b/less/buttons.less
index 1f9ceda9f2..63f2d86c8f 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -22,7 +22,7 @@
border: 1px solid @btnBorder;
*border: 0; // Remove the border to prevent IE7's black border on input:focus
border-bottom-color: darken(@btnBorder, 10%);
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
.ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
diff --git a/less/code.less b/less/code.less
index f1851a074c..5495b15ec9 100644
--- a/less/code.less
+++ b/less/code.less
@@ -35,7 +35,7 @@ pre {
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15);
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
// Make prettyprint styles more spaced out for readability
&.prettyprint {
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 5ed279167e..359f0e2282 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -234,5 +234,5 @@
// ---------
.typeahead {
margin-top: 2px; // give it some space to breathe
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
diff --git a/less/navbar.less b/less/navbar.less
index 95131ff3a4..f69e048994 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -25,7 +25,7 @@
padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
border: 1px solid @navbarBorder;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
.box-shadow(0 1px 4px rgba(0,0,0,.065));
// Prevent floats from breaking the navbar
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 36744d89c7..5e0c3dda01 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -48,7 +48,7 @@
margin-bottom: @baseLineHeight;
#gradient > .vertical(#f5f5f5, #f9f9f9);
.box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
// Bar of progress
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 9cc6e258ea..574eb1444f 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -75,7 +75,7 @@
.nav-collapse .btn {
padding: 4px 10px 4px;
font-weight: normal;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
.nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px;
diff --git a/less/tables.less b/less/tables.less
index f676abed73..ca2c287c7d 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -71,7 +71,7 @@ table {
border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapse; // IE7 can't round corners anyway
border-left: 0;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
th,
td {
border-left: 1px solid @tableBorder;
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 91b75f785b..a84a7d37d9 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -29,7 +29,7 @@
padding: 4px;
line-height: @baseLineHeight;
border: 1px solid #ddd;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
.box-shadow(0 1px 3px rgba(0,0,0,.055));
.transition(all .2s ease-in-out);
}
diff --git a/less/tooltip.less b/less/tooltip.less
index fba1856f58..93fac8d6b2 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -27,7 +27,7 @@
text-align: center;
text-decoration: none;
background-color: @tooltipBackground;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
// Arrows
diff --git a/less/variables.less b/less/variables.less
index 7ca1305fe8..3fb5274c3a 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -71,7 +71,7 @@
@paddingMini: 1px 6px; // 24px
@baseBorderRadius: 4px;
-@borderRadiusLarge: 5px;
+@borderRadiusLarge: 6px;
@borderRadiusSmall: 3px;
diff --git a/less/wells.less b/less/wells.less
index e4e0a9bebe..84a744b1c5 100644
--- a/less/wells.less
+++ b/less/wells.less
@@ -10,7 +10,7 @@
margin-bottom: 20px;
background-color: @wellBackground;
border: 1px solid darken(@wellBackground, 7%);
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
blockquote {
border-color: #ddd;
@@ -21,9 +21,9 @@
// Sizes
.well-large {
padding: 24px;
- .border-radius(6px);
+ .border-radius(@borderRadiusLarge);
}
.well-small {
padding: 9px;
- .border-radius(3px);
+ .border-radius(@borderRadiusSmall);
}
--
GitLab