##// END OF EJS Templates
Merge pull request #7318 from Carreau/dialog-border-radius...
Brian E. Granger -
r19724:19b06bbe merge
parent child Browse files
Show More
@@ -10,8 +10,9 b''
10 @modal-inner-padding: 15px;
10 @modal-inner-padding: 15px;
11 @grid-float-breakpoint: 540px;
11 @grid-float-breakpoint: 540px;
12 @logo_height: 28px;
12 @logo_height: 28px;
13 @border-radius-small: 1px;
13 @border-radius-base: 2px;
14 @border-radius-base: 2px;
14 @border-radius-small: 2px;
15 @border-radius-large: 3px;;
15 @grid-gutter-width: 0px;
16 @grid-gutter-width: 0px;
16
17
17 // Disable modal slide-in from top animation.
18 // Disable modal slide-in from top animation.
@@ -49,4 +50,4 b' label {'
49 @page-min-height: 70vh;
50 @page-min-height: 70vh;
50 @page-backdrop-color: #EEE;
51 @page-backdrop-color: #EEE;
51 @page-color: @body-bg;
52 @page-color: @body-bg;
52 @page-padding: 15px; No newline at end of file
53 @page-padding: 15px;
@@ -314,7 +314,7 b' img {'
314 height: auto;
314 height: auto;
315 }
315 }
316 .img-rounded {
316 .img-rounded {
317 border-radius: 6px;
317 border-radius: 3px;
318 }
318 }
319 .img-thumbnail {
319 .img-thumbnail {
320 padding: 4px;
320 padding: 4px;
@@ -702,7 +702,7 b' kbd {'
702 font-size: 90%;
702 font-size: 90%;
703 color: #ffffff;
703 color: #ffffff;
704 background-color: #333333;
704 background-color: #333333;
705 border-radius: 2px;
705 border-radius: 1px;
706 box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
706 box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
707 }
707 }
708 pre {
708 pre {
@@ -1795,7 +1795,7 b' fieldset[disabled] .checkbox-inline {'
1795 padding: 5px 10px;
1795 padding: 5px 10px;
1796 font-size: 12px;
1796 font-size: 12px;
1797 line-height: 1.5;
1797 line-height: 1.5;
1798 border-radius: 2px;
1798 border-radius: 1px;
1799 }
1799 }
1800 select.input-sm {
1800 select.input-sm {
1801 height: 30px;
1801 height: 30px;
@@ -1810,7 +1810,7 b' select[multiple].input-sm {'
1810 padding: 10px 16px;
1810 padding: 10px 16px;
1811 font-size: 17px;
1811 font-size: 17px;
1812 line-height: 1.33;
1812 line-height: 1.33;
1813 border-radius: 6px;
1813 border-radius: 3px;
1814 }
1814 }
1815 select.input-lg {
1815 select.input-lg {
1816 height: 45px;
1816 height: 45px;
@@ -2319,21 +2319,21 b' fieldset[disabled] .btn-link:focus {'
2319 padding: 10px 16px;
2319 padding: 10px 16px;
2320 font-size: 17px;
2320 font-size: 17px;
2321 line-height: 1.33;
2321 line-height: 1.33;
2322 border-radius: 6px;
2322 border-radius: 3px;
2323 }
2323 }
2324 .btn-sm,
2324 .btn-sm,
2325 .btn-group-sm > .btn {
2325 .btn-group-sm > .btn {
2326 padding: 5px 10px;
2326 padding: 5px 10px;
2327 font-size: 12px;
2327 font-size: 12px;
2328 line-height: 1.5;
2328 line-height: 1.5;
2329 border-radius: 2px;
2329 border-radius: 1px;
2330 }
2330 }
2331 .btn-xs,
2331 .btn-xs,
2332 .btn-group-xs > .btn {
2332 .btn-group-xs > .btn {
2333 padding: 1px 5px;
2333 padding: 1px 5px;
2334 font-size: 12px;
2334 font-size: 12px;
2335 line-height: 1.5;
2335 line-height: 1.5;
2336 border-radius: 2px;
2336 border-radius: 1px;
2337 }
2337 }
2338 .btn-block {
2338 .btn-block {
2339 display: block;
2339 display: block;
@@ -3312,7 +3312,7 b' input[type="button"].btn-block {'
3312 padding: 10px 16px;
3312 padding: 10px 16px;
3313 font-size: 17px;
3313 font-size: 17px;
3314 line-height: 1.33;
3314 line-height: 1.33;
3315 border-radius: 6px;
3315 border-radius: 3px;
3316 }
3316 }
3317 select.input-group-lg > .form-control,
3317 select.input-group-lg > .form-control,
3318 select.input-group-lg > .input-group-addon,
3318 select.input-group-lg > .input-group-addon,
@@ -3335,7 +3335,7 b' select[multiple].input-group-lg > .input-group-btn > .btn {'
3335 padding: 5px 10px;
3335 padding: 5px 10px;
3336 font-size: 12px;
3336 font-size: 12px;
3337 line-height: 1.5;
3337 line-height: 1.5;
3338 border-radius: 2px;
3338 border-radius: 1px;
3339 }
3339 }
3340 select.input-group-sm > .form-control,
3340 select.input-group-sm > .form-control,
3341 select.input-group-sm > .input-group-addon,
3341 select.input-group-sm > .input-group-addon,
@@ -3381,12 +3381,12 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3381 .input-group-addon.input-sm {
3381 .input-group-addon.input-sm {
3382 padding: 5px 10px;
3382 padding: 5px 10px;
3383 font-size: 12px;
3383 font-size: 12px;
3384 border-radius: 2px;
3384 border-radius: 1px;
3385 }
3385 }
3386 .input-group-addon.input-lg {
3386 .input-group-addon.input-lg {
3387 padding: 10px 16px;
3387 padding: 10px 16px;
3388 font-size: 17px;
3388 font-size: 17px;
3389 border-radius: 6px;
3389 border-radius: 3px;
3390 }
3390 }
3391 .input-group-addon input[type="radio"],
3391 .input-group-addon input[type="radio"],
3392 .input-group-addon input[type="checkbox"] {
3392 .input-group-addon input[type="checkbox"] {
@@ -4194,13 +4194,13 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
4194 }
4194 }
4195 .pagination-lg > li:first-child > a,
4195 .pagination-lg > li:first-child > a,
4196 .pagination-lg > li:first-child > span {
4196 .pagination-lg > li:first-child > span {
4197 border-bottom-left-radius: 6px;
4197 border-bottom-left-radius: 3px;
4198 border-top-left-radius: 6px;
4198 border-top-left-radius: 3px;
4199 }
4199 }
4200 .pagination-lg > li:last-child > a,
4200 .pagination-lg > li:last-child > a,
4201 .pagination-lg > li:last-child > span {
4201 .pagination-lg > li:last-child > span {
4202 border-bottom-right-radius: 6px;
4202 border-bottom-right-radius: 3px;
4203 border-top-right-radius: 6px;
4203 border-top-right-radius: 3px;
4204 }
4204 }
4205 .pagination-sm > li > a,
4205 .pagination-sm > li > a,
4206 .pagination-sm > li > span {
4206 .pagination-sm > li > span {
@@ -4209,13 +4209,13 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
4209 }
4209 }
4210 .pagination-sm > li:first-child > a,
4210 .pagination-sm > li:first-child > a,
4211 .pagination-sm > li:first-child > span {
4211 .pagination-sm > li:first-child > span {
4212 border-bottom-left-radius: 2px;
4212 border-bottom-left-radius: 1px;
4213 border-top-left-radius: 2px;
4213 border-top-left-radius: 1px;
4214 }
4214 }
4215 .pagination-sm > li:last-child > a,
4215 .pagination-sm > li:last-child > a,
4216 .pagination-sm > li:last-child > span {
4216 .pagination-sm > li:last-child > span {
4217 border-bottom-right-radius: 2px;
4217 border-bottom-right-radius: 1px;
4218 border-top-right-radius: 2px;
4218 border-top-right-radius: 1px;
4219 }
4219 }
4220 .pager {
4220 .pager {
4221 padding-left: 0;
4221 padding-left: 0;
@@ -4377,7 +4377,7 b' a.list-group-item.active > .badge,'
4377 font-weight: 200;
4377 font-weight: 200;
4378 }
4378 }
4379 .container .jumbotron {
4379 .container .jumbotron {
4380 border-radius: 6px;
4380 border-radius: 3px;
4381 }
4381 }
4382 .jumbotron .container {
4382 .jumbotron .container {
4383 max-width: 100%;
4383 max-width: 100%;
@@ -5047,11 +5047,11 b' a.list-group-item-danger.active:focus {'
5047 }
5047 }
5048 .well-lg {
5048 .well-lg {
5049 padding: 24px;
5049 padding: 24px;
5050 border-radius: 6px;
5050 border-radius: 3px;
5051 }
5051 }
5052 .well-sm {
5052 .well-sm {
5053 padding: 9px;
5053 padding: 9px;
5054 border-radius: 2px;
5054 border-radius: 1px;
5055 }
5055 }
5056 .close {
5056 .close {
5057 float: right;
5057 float: right;
@@ -5118,7 +5118,7 b' button.close {'
5118 background-color: #ffffff;
5118 background-color: #ffffff;
5119 border: 1px solid #999999;
5119 border: 1px solid #999999;
5120 border: 1px solid rgba(0, 0, 0, 0.2);
5120 border: 1px solid rgba(0, 0, 0, 0.2);
5121 border-radius: 6px;
5121 border-radius: 3px;
5122 -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
5122 -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
5123 box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
5123 box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
5124 background-clip: padding-box;
5124 background-clip: padding-box;
@@ -5302,7 +5302,7 b' button.close {'
5302 background-clip: padding-box;
5302 background-clip: padding-box;
5303 border: 1px solid #cccccc;
5303 border: 1px solid #cccccc;
5304 border: 1px solid rgba(0, 0, 0, 0.2);
5304 border: 1px solid rgba(0, 0, 0, 0.2);
5305 border-radius: 6px;
5305 border-radius: 3px;
5306 -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
5306 -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
5307 box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
5307 box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
5308 white-space: normal;
5308 white-space: normal;
@@ -9671,6 +9671,7 b' p {'
9671 background-color: #ffffff;
9671 background-color: #ffffff;
9672 background-image: none;
9672 background-image: none;
9673 border: 1px solid #cccccc;
9673 border: 1px solid #cccccc;
9674 border-radius: 2px;
9674 -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
9675 -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
9675 box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
9676 box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
9676 -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
9677 -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
@@ -9679,7 +9680,7 b' p {'
9679 padding: 5px 10px;
9680 padding: 5px 10px;
9680 font-size: 12px;
9681 font-size: 12px;
9681 line-height: 1.5;
9682 line-height: 1.5;
9682 border-radius: 2px;
9683 border-radius: 1px;
9683 width: inherit;
9684 width: inherit;
9684 font-size: 87%;
9685 font-size: 87%;
9685 height: 22px;
9686 height: 22px;
General Comments 0
You need to be logged in to leave comments. Login now