Merge pull request #7318 from Carreau/dialog-border-radius

fix border radius on element.
This commit is contained in:
Brian E. Granger 2014-12-26 16:49:23 -08:00
commit dd2c077939
2 changed files with 29 additions and 27 deletions

View File

@ -10,8 +10,9 @@
@modal-inner-padding: 15px;
@grid-float-breakpoint: 540px;
@logo_height: 28px;
@border-radius-small: 1px;
@border-radius-base: 2px;
@border-radius-small: 2px;
@border-radius-large: 3px;;
@grid-gutter-width: 0px;
// Disable modal slide-in from top animation.

View File

@ -314,7 +314,7 @@ img {
height: auto;
}
.img-rounded {
border-radius: 6px;
border-radius: 3px;
}
.img-thumbnail {
padding: 4px;
@ -702,7 +702,7 @@ kbd {
font-size: 90%;
color: #ffffff;
background-color: #333333;
border-radius: 2px;
border-radius: 1px;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
}
pre {
@ -1795,7 +1795,7 @@ fieldset[disabled] .checkbox-inline {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 2px;
border-radius: 1px;
}
select.input-sm {
height: 30px;
@ -1810,7 +1810,7 @@ select[multiple].input-sm {
padding: 10px 16px;
font-size: 17px;
line-height: 1.33;
border-radius: 6px;
border-radius: 3px;
}
select.input-lg {
height: 45px;
@ -2319,21 +2319,21 @@ fieldset[disabled] .btn-link:focus {
padding: 10px 16px;
font-size: 17px;
line-height: 1.33;
border-radius: 6px;
border-radius: 3px;
}
.btn-sm,
.btn-group-sm > .btn {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 2px;
border-radius: 1px;
}
.btn-xs,
.btn-group-xs > .btn {
padding: 1px 5px;
font-size: 12px;
line-height: 1.5;
border-radius: 2px;
border-radius: 1px;
}
.btn-block {
display: block;
@ -3312,7 +3312,7 @@ input[type="button"].btn-block {
padding: 10px 16px;
font-size: 17px;
line-height: 1.33;
border-radius: 6px;
border-radius: 3px;
}
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
@ -3335,7 +3335,7 @@ select[multiple].input-group-lg > .input-group-btn > .btn {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 2px;
border-radius: 1px;
}
select.input-group-sm > .form-control,
select.input-group-sm > .input-group-addon,
@ -3381,12 +3381,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.input-group-addon.input-sm {
padding: 5px 10px;
font-size: 12px;
border-radius: 2px;
border-radius: 1px;
}
.input-group-addon.input-lg {
padding: 10px 16px;
font-size: 17px;
border-radius: 6px;
border-radius: 3px;
}
.input-group-addon input[type="radio"],
.input-group-addon input[type="checkbox"] {
@ -4194,13 +4194,13 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.pagination-lg > li:first-child > a,
.pagination-lg > li:first-child > span {
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.pagination-lg > li:last-child > a,
.pagination-lg > li:last-child > span {
border-bottom-right-radius: 6px;
border-top-right-radius: 6px;
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
.pagination-sm > li > a,
.pagination-sm > li > span {
@ -4209,13 +4209,13 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.pagination-sm > li:first-child > a,
.pagination-sm > li:first-child > span {
border-bottom-left-radius: 2px;
border-top-left-radius: 2px;
border-bottom-left-radius: 1px;
border-top-left-radius: 1px;
}
.pagination-sm > li:last-child > a,
.pagination-sm > li:last-child > span {
border-bottom-right-radius: 2px;
border-top-right-radius: 2px;
border-bottom-right-radius: 1px;
border-top-right-radius: 1px;
}
.pager {
padding-left: 0;
@ -4377,7 +4377,7 @@ a.list-group-item.active > .badge,
font-weight: 200;
}
.container .jumbotron {
border-radius: 6px;
border-radius: 3px;
}
.jumbotron .container {
max-width: 100%;
@ -5047,11 +5047,11 @@ a.list-group-item-danger.active:focus {
}
.well-lg {
padding: 24px;
border-radius: 6px;
border-radius: 3px;
}
.well-sm {
padding: 9px;
border-radius: 2px;
border-radius: 1px;
}
.close {
float: right;
@ -5118,7 +5118,7 @@ button.close {
background-color: #ffffff;
border: 1px solid #999999;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
border-radius: 3px;
-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
background-clip: padding-box;
@ -5302,7 +5302,7 @@ button.close {
background-clip: padding-box;
border: 1px solid #cccccc;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
border-radius: 3px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
white-space: normal;
@ -9671,6 +9671,7 @@ p {
background-color: #ffffff;
background-image: none;
border: 1px solid #cccccc;
border-radius: 2px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@ -9679,7 +9680,7 @@ p {
padding: 5px 10px;
font-size: 12px;
line-height: 1.5;
border-radius: 2px;
border-radius: 1px;
width: inherit;
font-size: 87%;
height: 22px;