2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00

fix variable, run grunt

This commit is contained in:
Mark Otto
2014-11-09 22:05:09 -08:00
parent 86af1f39ab
commit e020d50838
12 changed files with 544 additions and 496 deletions
+41 -64
View File
@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.2.0 (http://getbootstrap.com) * Bootstrap v3.3.0 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@@ -1712,56 +1712,25 @@ textarea.form-control {
input[type="search"] { input[type="search"] {
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
line-height: 2.65rem; input[type="month"] {
line-height: 1.5 \0; line-height: 2.65rem;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: 2.025rem; line-height: 2.025rem;
line-height: 1.5 \0; }
} input[type="date"].input-lg,
input[type="date"].input-lg, input[type="time"].input-lg,
input[type="time"].input-lg, input[type="datetime-local"].input-lg,
input[type="datetime-local"].input-lg, input[type="month"].input-lg {
input[type="month"].input-lg { line-height: 3.3125rem;
line-height: 3.3125rem; }
line-height: 1.33 \0;
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.5;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;
@@ -3441,6 +3410,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-top-left-radius: .25rem;
border-top-right-radius: .25rem;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
@@ -4077,11 +4048,17 @@ a.badge:focus {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
a.list-group-item.active > .badge, .list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {
color: #027de7; color: #027de7;
background-color: #fff; background-color: #fff;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge {
margin-left: 3px; margin-left: 3px;
} }
@@ -4406,12 +4383,6 @@ a.list-group-item.active > .badge,
border-bottom-right-radius: .25rem; border-bottom-right-radius: .25rem;
border-bottom-left-radius: .25rem; border-bottom-left-radius: .25rem;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
a.list-group-item { a.list-group-item {
color: #555; color: #555;
} }
@@ -4662,10 +4633,9 @@ button.close {
box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
} }
.modal-backdrop { .modal-backdrop {
position: fixed; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0;
left: 0; left: 0;
background-color: #000; background-color: #000;
} }
@@ -4735,7 +4705,9 @@ button.close {
position: absolute; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: .85rem; font-size: .85rem;
font-weight: normal;
line-height: 1.4; line-height: 1.4;
visibility: visible; visibility: visible;
opacity: 0; opacity: 0;
@@ -4783,14 +4755,16 @@ button.close {
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-left .tooltip-arrow { .tooltip.top-left .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px; margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-right .tooltip-arrow { .tooltip.top-right .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px;
margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
@@ -4817,13 +4791,15 @@ button.close {
} }
.tooltip.bottom-left .tooltip-arrow { .tooltip.bottom-left .tooltip-arrow {
top: 0; top: 0;
left: 5px; right: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
.tooltip.bottom-right .tooltip-arrow { .tooltip.bottom-right .tooltip-arrow {
top: 0; top: 0;
right: 5px; left: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
@@ -4835,6 +4811,7 @@ button.close {
display: none; display: none;
max-width: 276px; max-width: 276px;
padding: 1px; padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
line-height: 1.5; line-height: 1.5;
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+18 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -23,4 +23,4 @@ License: http://opensource.org/licenses/MIT
* Licensed under the Creative Commons Attribution 3.0 Unported License. For * Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see http://creativecommons.org/licenses/by/3.0/. * details, see http://creativecommons.org/licenses/by/3.0/.
*/ */
!function(a){"use strict";a(function(){a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a("#loading-example-btn").on("click",function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),a(".bs-docs-activate-animated-progressbar").on("click",function(){a(this).prev(".progress-striped").toggleClass("progress-animated")}),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(){c.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery); !function(a){"use strict";a(function(){a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a("#loading-example-btn").on("click",function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),a("#exampleModal").on("show.bs.modal",function(b){var c=a(b.relatedTarget),d=c.data("whatever"),e=a(this);e.find(".modal-title").text("New message to "+d),e.find(".modal-body input").val(d)}),a(".bs-docs-activate-animated-progressbar").on("click",function(){a(this).prev(".progress-striped").toggleClass("progress-animated")}),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(){c.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
+3 -3
View File
File diff suppressed because one or more lines are too long
+41 -64
View File
@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v3.2.0 (http://getbootstrap.com) * Bootstrap v3.3.0 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc. * Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/ */
@@ -1712,56 +1712,25 @@ textarea.form-control {
input[type="search"] { input[type="search"] {
-webkit-appearance: none; -webkit-appearance: none;
} }
input[type="date"], @media screen and (-webkit-min-device-pixel-ratio: 0) {
input[type="time"], input[type="date"],
input[type="datetime-local"], input[type="time"],
input[type="month"] { input[type="datetime-local"],
line-height: 2.65rem; input[type="month"] {
line-height: 1.5 \0; line-height: 2.65rem;
} }
input[type="date"].input-sm, input[type="date"].input-sm,
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: 2.025rem; line-height: 2.025rem;
line-height: 1.5 \0; }
} input[type="date"].input-lg,
input[type="date"].input-lg, input[type="time"].input-lg,
input[type="time"].input-lg, input[type="datetime-local"].input-lg,
input[type="datetime-local"].input-lg, input[type="month"].input-lg {
input[type="month"].input-lg { line-height: 3.3125rem;
line-height: 3.3125rem; }
line-height: 1.33 \0;
}
_:-ms-fullscreen,
:root input[type="date"],
_:-ms-fullscreen,
:root input[type="time"],
_:-ms-fullscreen,
:root input[type="datetime-local"],
_:-ms-fullscreen,
:root input[type="month"] {
line-height: 1.5;
}
_:-ms-fullscreen.input-sm,
:root input[type="date"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="time"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="datetime-local"].input-sm,
_:-ms-fullscreen.input-sm,
:root input[type="month"].input-sm {
line-height: 1.5;
}
_:-ms-fullscreen.input-lg,
:root input[type="date"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="time"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="datetime-local"].input-lg,
_:-ms-fullscreen.input-lg,
:root input[type="month"].input-lg {
line-height: 1.33;
} }
.form-group { .form-group {
margin-bottom: 15px; margin-bottom: 15px;
@@ -3441,6 +3410,8 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
border-top-right-radius: 0; border-top-right-radius: 0;
} }
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
border-top-left-radius: .25rem;
border-top-right-radius: .25rem;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
} }
@@ -4077,11 +4048,17 @@ a.badge:focus {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
a.list-group-item.active > .badge, .list-group-item.active > .badge,
.nav-pills > .active > a > .badge { .nav-pills > .active > a > .badge {
color: #027de7; color: #027de7;
background-color: #fff; background-color: #fff;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
.nav-pills > li > a > .badge { .nav-pills > li > a > .badge {
margin-left: 3px; margin-left: 3px;
} }
@@ -4406,12 +4383,6 @@ a.list-group-item.active > .badge,
border-bottom-right-radius: .25rem; border-bottom-right-radius: .25rem;
border-bottom-left-radius: .25rem; border-bottom-left-radius: .25rem;
} }
.list-group-item > .badge {
float: right;
}
.list-group-item > .badge + .badge {
margin-right: 5px;
}
a.list-group-item { a.list-group-item {
color: #555; color: #555;
} }
@@ -4662,10 +4633,9 @@ button.close {
box-shadow: 0 3px 9px rgba(0, 0, 0, .5); box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
} }
.modal-backdrop { .modal-backdrop {
position: fixed; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
bottom: 0;
left: 0; left: 0;
background-color: #000; background-color: #000;
} }
@@ -4735,7 +4705,9 @@ button.close {
position: absolute; position: absolute;
z-index: 1070; z-index: 1070;
display: block; display: block;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: .85rem; font-size: .85rem;
font-weight: normal;
line-height: 1.4; line-height: 1.4;
visibility: visible; visibility: visible;
opacity: 0; opacity: 0;
@@ -4783,14 +4755,16 @@ button.close {
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-left .tooltip-arrow { .tooltip.top-left .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px; margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
.tooltip.top-right .tooltip-arrow { .tooltip.top-right .tooltip-arrow {
right: 5px;
bottom: 0; bottom: 0;
left: 5px;
margin-bottom: -5px;
border-width: 5px 5px 0; border-width: 5px 5px 0;
border-top-color: #000; border-top-color: #000;
} }
@@ -4817,13 +4791,15 @@ button.close {
} }
.tooltip.bottom-left .tooltip-arrow { .tooltip.bottom-left .tooltip-arrow {
top: 0; top: 0;
left: 5px; right: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
.tooltip.bottom-right .tooltip-arrow { .tooltip.bottom-right .tooltip-arrow {
top: 0; top: 0;
right: 5px; left: 5px;
margin-top: -5px;
border-width: 0 5px 5px; border-width: 0 5px 5px;
border-bottom-color: #000; border-bottom-color: #000;
} }
@@ -4835,6 +4811,7 @@ button.close {
display: none; display: none;
max-width: 276px; max-width: 276px;
padding: 1px; padding: 1px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
line-height: 1.5; line-height: 1.5;
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -186,13 +186,13 @@ input[type="search"] {
input[type="time"].input-sm, input[type="time"].input-sm,
input[type="datetime-local"].input-sm, input[type="datetime-local"].input-sm,
input[type="month"].input-sm { input[type="month"].input-sm {
line-height: @input-height-small; line-height: @input-height-sm;
} }
input[type="date"].input-lg, input[type="date"].input-lg,
input[type="time"].input-lg, input[type="time"].input-lg,
input[type="datetime-local"].input-lg, input[type="datetime-local"].input-lg,
input[type="month"].input-lg { input[type="month"].input-lg {
line-height: @input-height-large; line-height: @input-height-lg;
} }
} }