1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
This commit is contained in:
Mark Otto 2015-09-15 21:11:19 -07:00
parent 85f08df3b0
commit c34fdd415e
9 changed files with 41 additions and 41 deletions

View file

@ -547,7 +547,7 @@ hr {
margin-top: 1rem; margin-top: 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
border: 0; border: 0;
border-top: .0625rem solid rgba(0, 0, 0, .1); border-top: 1px solid rgba(0, 0, 0, .1);
} }
small, small,
@ -1849,7 +1849,7 @@ pre code {
color: #55595c; color: #55595c;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: .0625rem solid #ccc; border: 1px solid #ccc;
border-radius: .25rem; border-radius: .25rem;
} }
@ -1899,7 +1899,7 @@ pre code {
} }
.form-control-label { .form-control-label {
padding: .4375rem .75rem; padding: .375rem .75rem;
margin-bottom: 0; margin-bottom: 0;
} }
@ -1908,7 +1908,7 @@ pre code {
input[type="time"].form-control, input[type="time"].form-control,
input[type="datetime-local"].form-control, input[type="datetime-local"].form-control,
input[type="month"].form-control { input[type="month"].form-control {
line-height: 2.375rem; line-height: 2.25rem;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
.input-group-sm input[type="date"].form-control, .input-group-sm input[type="date"].form-control,
@ -1918,7 +1918,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control, .input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm, input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control { .input-group-sm input[type="month"].form-control {
line-height: 1.95rem; line-height: 1.825rem;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control, .input-group-lg input[type="date"].form-control,
@ -1928,14 +1928,14 @@ pre code {
.input-group-lg input[type="datetime-local"].form-control, .input-group-lg input[type="datetime-local"].form-control,
input[type="month"].input-lg, input[type="month"].input-lg,
.input-group-lg input[type="month"].form-control { .input-group-lg input[type="month"].form-control {
line-height: 3.291667rem; line-height: 3.166667rem;
} }
} }
.form-control-static { .form-control-static {
min-height: 2.375rem; min-height: 2.25rem;
padding-top: .4375rem; padding-top: .375rem;
padding-bottom: .4375rem; padding-bottom: .375rem;
margin-bottom: 0; margin-bottom: 0;
} }
@ -2045,9 +2045,9 @@ input[type="checkbox"].disabled {
.form-control-error { .form-control-error {
padding-right: 2.25rem; padding-right: 2.25rem;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center right .59375rem; background-position: center right .5625rem;
-webkit-background-size: 1.54375rem 1.54375rem; -webkit-background-size: 1.4625rem 1.4625rem;
background-size: 1.54375rem 1.54375rem; background-size: 1.4625rem 1.4625rem;
} }
.has-success .help-block, .has-success .help-block,
@ -2210,7 +2210,7 @@ input[type="checkbox"].disabled {
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border: .0625rem solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
} }
@ -3772,7 +3772,7 @@ input[type="button"].btn-block {
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1; line-height: 1;
background: none; background: none;
border: .0625rem solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
} }
@ -4744,9 +4744,9 @@ a.label:hover {
position: relative; position: relative;
display: block; display: block;
padding: .75rem 1.25rem; padding: .75rem 1.25rem;
margin-bottom: -.0625rem; margin-bottom: -1px;
background-color: #fff; background-color: #fff;
border: .0625rem solid #ddd; border: 1px solid #ddd;
} }
.list-group-item:first-child { .list-group-item:first-child {
@ -4761,7 +4761,7 @@ a.label:hover {
} }
.list-group-flush .list-group-item { .list-group-flush .list-group-item {
border-width: .0625rem 0; border-width: 1px 0;
border-radius: 0; border-radius: 0;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -30,4 +30,4 @@ fill:r.fill,"font-weight":r.font.weight,"font-family":r.font.family+", monospace
* Licensed under the Creative Commons Attribution 3.0 Unported License. For * Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see https://creativecommons.org/licenses/by/3.0/. * details, see https://creativecommons.org/licenses/by/3.0/.
*/ */
!function(a){"use strict";a(function(){a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a('[data-toggle="popover"]').popover(),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bd-example [href=#]").click(function(a){a.preventDefault()}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';a(this).before(b)});var b=new ZeroClipboard(a(".btn-clipboard")),c=a("#global-zeroclipboard-html-bridge");b.on("load",function(){c.data("placement","top").attr("title","Copy to clipboard").tooltip(),b.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),b.on("complete",function(){c.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")})}),b.on("noflash wrongflash",function(){a(".zero-clipboard").remove(),ZeroClipboard.destroy()})})}(jQuery),function(){"use strict";anchors.options.placement="left",anchors.add(".bd-content > h1, .bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5")}(); !function(a){"use strict";a(function(){a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a('[data-toggle="popover"]').popover(),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a('.bd-example-indeterminate [type="checkbox"]').prop("indeterminate",!0),a(".bd-example [href=#]").click(function(a){a.preventDefault()}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';a(this).before(b)});var b=new ZeroClipboard(a(".btn-clipboard")),c=a("#global-zeroclipboard-html-bridge");b.on("load",function(){c.data("placement","top").attr("title","Copy to clipboard").tooltip(),b.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),b.on("complete",function(){c.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")})}),b.on("noflash wrongflash",function(){a(".zero-clipboard").remove(),ZeroClipboard.destroy()})})}(jQuery),function(){"use strict";anchors.options.placement="left",anchors.add(".bd-content > h1, .bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5")}();

View file

@ -547,7 +547,7 @@ hr {
margin-top: 1rem; margin-top: 1rem;
margin-bottom: 1rem; margin-bottom: 1rem;
border: 0; border: 0;
border-top: .0625rem solid rgba(0, 0, 0, .1); border-top: 1px solid rgba(0, 0, 0, .1);
} }
small, small,
@ -1849,7 +1849,7 @@ pre code {
color: #55595c; color: #55595c;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: .0625rem solid #ccc; border: 1px solid #ccc;
border-radius: .25rem; border-radius: .25rem;
} }
@ -1899,7 +1899,7 @@ pre code {
} }
.form-control-label { .form-control-label {
padding: .4375rem .75rem; padding: .375rem .75rem;
margin-bottom: 0; margin-bottom: 0;
} }
@ -1908,7 +1908,7 @@ pre code {
input[type="time"].form-control, input[type="time"].form-control,
input[type="datetime-local"].form-control, input[type="datetime-local"].form-control,
input[type="month"].form-control { input[type="month"].form-control {
line-height: 2.375rem; line-height: 2.25rem;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
.input-group-sm input[type="date"].form-control, .input-group-sm input[type="date"].form-control,
@ -1918,7 +1918,7 @@ pre code {
.input-group-sm input[type="datetime-local"].form-control, .input-group-sm input[type="datetime-local"].form-control,
input[type="month"].input-sm, input[type="month"].input-sm,
.input-group-sm input[type="month"].form-control { .input-group-sm input[type="month"].form-control {
line-height: 1.95rem; line-height: 1.825rem;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
.input-group-lg input[type="date"].form-control, .input-group-lg input[type="date"].form-control,
@ -1928,14 +1928,14 @@ pre code {
.input-group-lg input[type="datetime-local"].form-control, .input-group-lg input[type="datetime-local"].form-control,
input[type="month"].input-lg, input[type="month"].input-lg,
.input-group-lg input[type="month"].form-control { .input-group-lg input[type="month"].form-control {
line-height: 3.291667rem; line-height: 3.166667rem;
} }
} }
.form-control-static { .form-control-static {
min-height: 2.375rem; min-height: 2.25rem;
padding-top: .4375rem; padding-top: .375rem;
padding-bottom: .4375rem; padding-bottom: .375rem;
margin-bottom: 0; margin-bottom: 0;
} }
@ -2045,9 +2045,9 @@ input[type="checkbox"].disabled {
.form-control-error { .form-control-error {
padding-right: 2.25rem; padding-right: 2.25rem;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center right .59375rem; background-position: center right .5625rem;
-webkit-background-size: 1.54375rem 1.54375rem; -webkit-background-size: 1.4625rem 1.4625rem;
background-size: 1.54375rem 1.54375rem; background-size: 1.4625rem 1.4625rem;
} }
.has-success .help-block, .has-success .help-block,
@ -2210,7 +2210,7 @@ input[type="checkbox"].disabled {
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
border: .0625rem solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
} }
@ -3772,7 +3772,7 @@ input[type="button"].btn-block {
font-size: 1.25rem; font-size: 1.25rem;
line-height: 1; line-height: 1;
background: none; background: none;
border: .0625rem solid transparent; border: 1px solid transparent;
border-radius: .25rem; border-radius: .25rem;
} }
@ -4744,9 +4744,9 @@ a.label:hover {
position: relative; position: relative;
display: block; display: block;
padding: .75rem 1.25rem; padding: .75rem 1.25rem;
margin-bottom: -.0625rem; margin-bottom: -1px;
background-color: #fff; background-color: #fff;
border: .0625rem solid #ddd; border: 1px solid #ddd;
} }
.list-group-item:first-child { .list-group-item:first-child {
@ -4761,7 +4761,7 @@ a.label:hover {
} }
.list-group-flush .list-group-item { .list-group-flush .list-group-item {
border-width: .0625rem 0; border-width: 1px 0;
border-radius: 0; border-radius: 0;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long