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

remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions

Browse Source
This commit is contained in:
Mark Otto
2012-09-30 23:11:54 -07:00
parent 0cd186183c
commit 9872902e47
26 changed files with 152 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/accordion.less
+1 -1
View File
@@ -12,7 +12,7 @@
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
.border-radius(4px);
border-radius: 4px;
}
.accordion-heading {
border-bottom: 0;
less/alerts.less
+1 -1
View File
@@ -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: 4px;
color: @warningText;
}
.alert h4 {
less/breadcrumbs.less
+1 -1
View File
@@ -8,7 +8,7 @@
margin: 0 0 @baseLineHeight;
list-style: none;
background-color: #f5f5f5;
.border-radius(4px);
border-radius: 4px;
li {
display: inline-block;
text-shadow: 0 1px 0 @white;
less/button-groups.less
+6 -6
View File
@@ -32,7 +32,7 @@
// Float them, remove border radius, then re-add to first and last elements
.btn-group > .btn {
position: relative;
.border-radius(0);
border-radius: 0;
}
.btn-group > .btn + .btn {
margin-left: -1px;
@@ -219,21 +219,21 @@
display: block;
float: none;
width: 100%;
.border-radius(0);
border-radius: 0;
}
.btn-group-vertical .btn + .btn {
margin-left: 0;
margin-top: -1px;
}
.btn-group-vertical .btn:first-child {
.border-radius(4px 4px 0 0);
border-radius: 4px 4px 0 0;
}
.btn-group-vertical .btn:last-child {
.border-radius(0 0 4px 4px);
border-radius: 0 0 4px 4px;
}
.btn-group-vertical .btn-large:first-child {
.border-radius(6px 6px 0 0);
border-radius: 6px 6px 0 0;
}
.btn-group-vertical .btn-large:last-child {
.border-radius(0 0 6px 6px);
border-radius: 0 0 6px 6px;
}
less/buttons.less
+5 -5
View File
@@ -19,7 +19,7 @@
.buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
border: 1px solid @btnBorder;
border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px);
border-radius: 4px;
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
// Hover state
@@ -70,7 +70,7 @@
.btn-large {
padding: @paddingLarge;
font-size: @fontSizeLarge;
.border-radius(@borderRadiusLarge);
border-radius: @borderRadiusLarge;
}
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
@@ -81,7 +81,7 @@
.btn-small {
padding: @paddingSmall;
font-size: @fontSizeSmall;
.border-radius(@borderRadiusSmall);
border-radius: @borderRadiusSmall;
}
.btn-small [class^="icon-"],
.btn-small [class*=" icon-"] {
@@ -92,7 +92,7 @@
.btn-mini {
padding: @paddingMini;
font-size: @fontSizeMini;
.border-radius(@borderRadiusSmall);
border-radius: @borderRadiusSmall;
}
@@ -184,7 +184,7 @@ input[type="button"] {
border-color: transparent;
cursor: pointer;
color: @linkColor;
.border-radius(0);
border-radius: 0;
}
.btn-link:hover {
color: @linkColorHover;
less/code.less
+2 -2
View File
@@ -10,7 +10,7 @@ pre {
#font > #family > .monospace;
font-size: @baseFontSize - 2;
color: @grayDark;
.border-radius(3px);
border-radius: 3px;
}
// Inline code
@@ -35,7 +35,7 @@ pre {
background-color: #f5f5f5;
border: 1px solid #ccc; // IE8 fallback
border: 1px solid rgba(0,0,0,.15);
.border-radius(4px);
border-radius: 4px;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
less/dropdowns.less
+3 -7
View File
@@ -48,13 +48,9 @@
background-color: @dropdownBackground;
border: 1px solid #ccc; // IE8 fallback
border: 1px solid @dropdownBorder;
*border-right-width: 2px;
*border-bottom-width: 2px;
.border-radius(6px);
border-radius: 6px;
.box-shadow(0 5px 10px rgba(0,0,0,.2));
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
.background-clip(padding-box);
// Aligns the dropdown menu to right
&.pull-right {
@@ -212,5 +208,5 @@
// ---------
.typeahead {
margin-top: 2px; // give it some space to breathe
.border-radius(4px);
border-radius: 4px;
}
less/forms.less
+21 -21
View File
@@ -85,7 +85,7 @@ input[type="color"],
font-size: @baseFontSize;
line-height: @baseLineHeight;
color: @gray;
.border-radius(@inputBorderRadius);
border-radius: @inputBorderRadius;
vertical-align: middle;
}
@@ -278,17 +278,17 @@ input[type="color"],
padding-left: 14px;
padding-right: 14px; // TODO: Resolve this override
font-size: @fontSizeLarge;
.border-radius(@borderRadiusLarge);
border-radius: @borderRadiusLarge;
}
&.input-small {
padding: @paddingSmall;
font-size: @fontSizeSmall;
.border-radius(@borderRadiusSmall);
border-radius: @borderRadiusSmall;
}
&.input-mini {
padding: @paddingMini;
font-size: @fontSizeMini;
.border-radius(@borderRadiusSmall);
border-radius: @borderRadiusSmall;
}
}
@@ -459,7 +459,7 @@ select:focus:required:invalid {
margin: 0; // Prevent bottom margin from screwing up alignment in stacked forms
font-size: @baseFontSize;
vertical-align: top;
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
// Make input on top when focused so blue border and shadow always show
&:focus {
z-index: 2;
@@ -487,7 +487,7 @@ select:focus:required:invalid {
.add-on,
.btn {
vertical-align: top;
.border-radius(0);
border-radius: 0;
}
.active {
background-color: lighten(@green, 30);
@@ -503,7 +503,7 @@ select:focus:required:invalid {
.add-on:first-child,
.btn:first-child {
// FYI, `.btn:first-child` accounts for a button group that's prepended
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
}
}
@@ -511,9 +511,9 @@ select:focus:required:invalid {
input,
select,
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
+ .btn-group .btn {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
}
.add-on,
@@ -523,7 +523,7 @@ select:focus:required:invalid {
}
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
}
@@ -532,20 +532,20 @@ select:focus:required:invalid {
input,
select,
.uneditable-input {
.border-radius(0);
border-radius: 0;
+ .btn-group .btn {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
}
.add-on:first-child,
.btn:first-child {
margin-right: -1px;
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
border-radius: @inputBorderRadius 0 0 @inputBorderRadius;
}
.add-on:last-child,
.btn:last-child {
margin-left: -1px;
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
}
.btn-group:first-child {
margin-left: 0;
@@ -562,27 +562,27 @@ input.search-query {
padding-right: 14px;
padding-right: 4px \9;
padding-left: 14px;
padding-left: 4px \9; /* IE8 doesn't have border-radius, so don't indent the padding */
padding-left: 4px \9; /* IE8 doesn't have border radius, so don't indent the padding */
margin-bottom: 0; // Remove the default margin on all inputs
.border-radius(15px);
border-radius: 15px;
}
/* Allow for input prepend/append in search forms */
.form-search .input-append .search-query,
.form-search .input-prepend .search-query {
.border-radius(0); // Override due to specificity
border-radius: 0; // Override due to specificity
}
.form-search .input-append .search-query {
.border-radius(14px 0 0 14px);
border-radius: 14px 0 0 14px;
}
.form-search .input-append .btn {
.border-radius(0 14px 14px 0);
border-radius: 0 14px 14px 0;
}
.form-search .input-prepend .search-query {
.border-radius(0 14px 14px 0);
border-radius: 0 14px 14px 0;
}
.form-search .input-prepend .btn {
.border-radius(14px 0 0 14px);
border-radius: 14px 0 0 14px;
}
less/hero-unit.less
+1 -1
View File
@@ -7,7 +7,7 @@
padding: 60px;
margin-bottom: 30px;
background-color: @heroUnitBackground;
.border-radius(6px);
border-radius: 6px;
h1 {
margin-bottom: 0;
font-size: 60px;
less/labels-badges.less
+2 -2
View File
@@ -18,11 +18,11 @@
// Set unique padding and border-radii
.label {
padding: 1px 4px 2px;
.border-radius(3px);
border-radius: 3px;
}
.badge {
padding: 1px 9px 2px;
.border-radius(9px);
border-radius: 9px;
}
// Hover state, but only for links
less/mixins.less
-8
View File
@@ -175,13 +175,6 @@
// CSS3 PROPERTIES
// --------------------------------------------------
// Border Radius
.border-radius(@radius) {
-webkit-border-radius: @radius;
-moz-border-radius: @radius;
border-radius: @radius;
}
// Single Corner Border Radius
.border-top-left-radius(@radius) {
-webkit-border-top-left-radius: @radius;
@@ -290,7 +283,6 @@
}
// Background clipping
// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
.background-clip(@clip) {
-webkit-background-clip: @clip;
-moz-background-clip: @clip;
less/modals.less
+2 -3
View File
@@ -31,8 +31,7 @@
background-color: @white;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3);
*border: 1px solid #999; /* IE6-7 */
.border-radius(6px);
border-radius: 6px;
.box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding-box);
&.fade {
@@ -71,7 +70,7 @@
text-align: right; // right align buttons
background-color: #f5f5f5;
border-top: 1px solid #ddd;
.border-radius(0 0 6px 6px);
border-radius: 0 0 6px 6px;
.box-shadow(inset 0 1px 0 @white);
.clearfix(); // clear it in case folks use .pull-* classes on buttons
less/navbar.less
+6 -6
View File
@@ -14,7 +14,7 @@
color: @navbarText;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
border: 1px solid @navbarBorder;
.border-radius(4px);
border-radius: 4px;
.box-shadow(0 1px 4px rgba(0,0,0,.065));
// Prevent floats from breaking the navbar
@@ -131,7 +131,7 @@
margin-bottom: 0;
padding: 4px 14px;
#font > .sans-serif(13px, normal, 1);
.border-radius(15px); // redeclare because of specificity of the type attribute
border-radius: 15px; // redeclare because of specificity of the type attribute
}
}
@@ -143,7 +143,7 @@
.navbar-static-top {
position: static;
margin-bottom: 0; // remove 18px margin for default navbar
.border-radius(0);
border-radius: 0;
}
@@ -162,7 +162,7 @@
border-width: 0 0 1px;
padding-left: 0;
padding-right: 0;
.border-radius(0);
border-radius: 0;
}
.navbar-fixed-bottom {
border-width: 1px 0 0;
@@ -258,7 +258,7 @@
width: 18px;
height: 2px;
background-color: #f5f5f5;
.border-radius(1px);
border-radius: 1px;
.box-shadow(0 1px 0 rgba(0,0,0,.25));
}
.btn-navbar .icon-bar + .icon-bar {
@@ -347,7 +347,7 @@
right: 100%;
margin-left: 0;
margin-right: -1px;
.border-radius(6px 0 6px 6px);
border-radius: 6px 0 6px 6px;
}
}
less/navs.less
+8 -10
View File
@@ -114,7 +114,7 @@
padding-bottom: 8px;
line-height: @baseLineHeight;
border: 1px solid transparent;
.border-radius(4px 4px 0 0);
border-radius: 4px 4px 0 0;
&:hover {
border-color: @grayLighter @grayLighter #ddd;
}
@@ -139,7 +139,7 @@
padding-bottom: 8px;
margin-top: 2px;
margin-bottom: 2px;
.border-radius(5px);
border-radius: 5px;
}
// Active state
@@ -168,7 +168,7 @@
}
.nav-tabs.nav-stacked > li > a {
border: 1px solid #ddd;
.border-radius(0);
border-radius: 0;
}
.nav-tabs.nav-stacked > li:first-child > a {
.border-top-radius(4px);
@@ -195,10 +195,10 @@
// ---------
.nav-tabs .dropdown-menu {
.border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
border-radius: 0 0 6px 6px; // remove the top rounded corners here since there is a hard edge above the menu
}
.nav-pills .dropdown-menu {
.border-radius(6px); // make rounded corners match the pills
border-radius: 6px; // make rounded corners match the pills
}
// Default dropdown links
@@ -303,7 +303,7 @@
margin-bottom: 0;
}
.tabs-below > .nav-tabs > li > a {
.border-radius(0 0 4px 4px);
border-radius: 0 0 4px 4px;
&:hover {
border-bottom-color: transparent;
border-top-color: #ddd;
@@ -337,7 +337,7 @@
}
.tabs-left > .nav-tabs > li > a {
margin-right: -1px;
.border-radius(4px 0 0 4px);
border-radius: 4px 0 0 4px;
}
.tabs-left > .nav-tabs > li > a:hover {
border-color: @grayLighter #ddd @grayLighter @grayLighter;
@@ -345,7 +345,6 @@
.tabs-left > .nav-tabs .active > a,
.tabs-left > .nav-tabs .active > a:hover {
border-color: #ddd transparent #ddd #ddd;
*border-right-color: @white;
}
// Tabs on the right
@@ -356,7 +355,7 @@
}
.tabs-right > .nav-tabs > li > a {
margin-left: -1px;
.border-radius(0 4px 4px 0);
border-radius: 0 4px 4px 0;
}
.tabs-right > .nav-tabs > li > a:hover {
border-color: @grayLighter @grayLighter @grayLighter #ddd;
@@ -364,7 +363,6 @@
.tabs-right > .nav-tabs .active > a,
.tabs-right > .nav-tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent;
*border-left-color: @white;
}
less/pager.less
+1 -1
View File
@@ -18,7 +18,7 @@
padding: 5px 14px;
background-color: #fff;
border: 1px solid #ddd;
.border-radius(15px);
border-radius: 15px;
}
.pager li > a:hover {
text-decoration: none;
less/pagination.less
+1 -1
View File
@@ -14,7 +14,7 @@
margin-left: 0;
margin-bottom: 0;
// Visuals
.border-radius(@baseBorderRadius);
border-radius: @baseBorderRadius;
.box-shadow(0 1px 2px rgba(0,0,0,.05));
}
.pagination ul > li {
less/popovers.less
+2 -2
View File
@@ -17,7 +17,7 @@
background-clip: padding-box;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2);
.border-radius(6px);
border-radius: 6px;
.box-shadow(0 5px 10px rgba(0,0,0,.2));
// Offset the popover to account for the popover arrow
@@ -36,7 +36,7 @@
line-height: 18px;
background-color: @popoverTitleBackground;
border-bottom: 1px solid darken(@popoverTitleBackground, 5%);
.border-radius(5px 5px 0 0);
border-radius: 5px 5px 0 0;
}
.popover-content {
less/progress-bars.less
+1 -1
View File
@@ -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: 4px;
}
// Bar of progress
less/responsive-navbar.less
+3 -3
View File
@@ -69,13 +69,13 @@
padding: 9px 15px;
font-weight: bold;
color: @navbarLinkColor;
.border-radius(3px);
border-radius: 3px;
}
// Buttons
.nav-collapse .btn {
padding: 4px 10px 4px;
font-weight: normal;
.border-radius(4px);
border-radius: 4px;
}
.nav-collapse .dropdown-menu li + li a {
margin-bottom: 2px;
@@ -105,7 +105,7 @@
padding: 0;
background-color: transparent;
border: none;
.border-radius(0);
border-radius: 0;
.box-shadow(none);
}
.nav-collapse .dropdown-menu:before,
less/scaffolding.less
+2 -2
View File
@@ -34,7 +34,7 @@ a:hover {
// Rounded corners
.img-rounded {
.border-radius(6px);
border-radius: 6px;
}
// Add polaroid-esque trim
@@ -48,5 +48,5 @@ a:hover {
// Perfect circle
.img-circle {
.border-radius(500px); // crank the border-radius so it works with most reasonably sized images
border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
}
less/tables.less
+2 -2
View File
@@ -70,7 +70,7 @@ table {
border: 1px solid @tableBorder;
border-collapse: separate; // Done so we can round those corners!
border-left: 0;
.border-radius(4px);
border-radius: 4px;
th,
td {
border-left: 1px solid @tableBorder;
@@ -104,7 +104,7 @@ table {
thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child,
tfoot:last-child tr:last-child td:first-child {
.border-radius(0 0 0 4px);
border-radius: 0 0 0 4px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
less/thumbnails.less
+1 -1
View File
@@ -9,7 +9,7 @@
padding: 4px;
line-height: @baseLineHeight;
border: 1px solid #ddd;
.border-radius(4px);
border-radius: 4px;
.box-shadow(0 1px 3px rgba(0,0,0,.055));
.transition(all .2s ease-in-out);
}
less/tooltip.less
+1 -1
View File
@@ -27,7 +27,7 @@
text-align: center;
text-decoration: none;
background-color: @tooltipBackground;
.border-radius(4px);
border-radius: 4px;
}
// Arrows
less/wells.less
+3 -3
View File
@@ -10,7 +10,7 @@
margin-bottom: 20px;
background-color: @wellBackground;
border: 1px solid darken(@wellBackground, 7%);
.border-radius(4px);
border-radius: 4px;
.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: 6px;
}
.well-small {
padding: 9px;
.border-radius(3px);
border-radius: 3px;
}