Skip to content

B
bootstrap
Commit d1660ad0 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Swap -small and -large variables for -sm and -lg

parent 2cc9e773
Expand all Show whitespace changes
Inline Side-by-side
Showing with 283 additions and 283 deletions
dist/css/bootstrap.css
View file @ d1660ad0
...@@ -491,100 +491,6 @@ mark, ...@@ -491,100 +491,6 @@ mark,
padding: .2em; padding: .2em;
background-color: #fcf8e3; background-color: #fcf8e3;
} }
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.text-justify {
text-align: justify;
}
.text-nowrap {
white-space: nowrap;
}
.text-lowercase {
text-transform: lowercase;
}
.text-uppercase {
text-transform: uppercase;
}
.text-capitalize {
text-transform: capitalize;
}
.text-muted {
color: #818a91;
}
.text-primary {
color: #027de7;
}
a.text-primary:hover {
color: #0262b4;
}
.text-success {
color: #3c763d;
}
a.text-success:hover {
color: #2b542c;
}
.text-info {
color: #31708f;
}
a.text-info:hover {
color: #245269;
}
.text-warning {
color: #8a6d3b;
}
a.text-warning:hover {
color: #66512c;
}
.text-danger {
color: #a94442;
}
a.text-danger:hover {
color: #843534;
}
.bg-primary {
color: #fff;
background-color: #027de7;
}
a.bg-primary:hover {
background-color: #0262b4;
}
.bg-success {
background-color: #dff0d8;
}
a.bg-success:hover {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
}
a.bg-info:hover {
background-color: #afd9ee;
}
.bg-warning {
background-color: #fcf8e3;
}
a.bg-warning:hover {
background-color: #f7ecb5;
}
.bg-danger {
background-color: #f2dede;
}
a.bg-danger:hover {
background-color: #e4b9b9;
}
.bg-gray-dark {
background-color: #373a3c;
}
a.bg-gray-dark:hover {
background-color: #1f2021;
}
ul, ul,
ol { ol {
margin-top: 0; margin-top: 0;
...@@ -5352,6 +5258,100 @@ button.close { ...@@ -5352,6 +5258,100 @@ button.close {
.affix { .affix {
position: fixed; position: fixed;
} }
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.text-justify {
text-align: justify;
}
.text-nowrap {
white-space: nowrap;
}
.text-lowercase {
text-transform: lowercase;
}
.text-uppercase {
text-transform: uppercase;
}
.text-capitalize {
text-transform: capitalize;
}
.text-muted {
color: #818a91;
}
.text-primary {
color: #027de7;
}
a.text-primary:hover {
color: #0262b4;
}
.text-success {
color: #3c763d;
}
a.text-success:hover {
color: #2b542c;
}
.text-info {
color: #31708f;
}
a.text-info:hover {
color: #245269;
}
.text-warning {
color: #8a6d3b;
}
a.text-warning:hover {
color: #66512c;
}
.text-danger {
color: #a94442;
}
a.text-danger:hover {
color: #843534;
}
.bg-primary {
color: #fff;
background-color: #027de7;
}
a.bg-primary:hover {
background-color: #0262b4;
}
.bg-success {
background-color: #dff0d8;
}
a.bg-success:hover {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
}
a.bg-info:hover {
background-color: #afd9ee;
}
.bg-warning {
background-color: #fcf8e3;
}
a.bg-warning:hover {
background-color: #f7ecb5;
}
.bg-danger {
background-color: #f2dede;
}
a.bg-danger:hover {
background-color: #e4b9b9;
}
.bg-gray-dark {
background-color: #373a3c;
}
a.bg-gray-dark:hover {
background-color: #1f2021;
}
@-ms-viewport { @-ms-viewport {
width: device-width; width: device-width;
} }
......
dist/css/bootstrap.css.map
View file @ d1660ad0
This diff was suppressed by a .gitattributes entry.
dist/css/bootstrap.min.css
View file @ d1660ad0
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/_includes/customizer-variables.html
View file @ d1660ad0
...@@ -131,12 +131,12 @@ ...@@ -131,12 +131,12 @@
<p class="help-block">Sets the <code>&lt;body&gt;</code> and more to the root pixel value.</p> <p class="help-block">Sets the <code>&lt;body&gt;</code> and more to the root pixel value.</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@font-size-large">@font-size-large</label> <label for="input-@font-size-lg">@font-size-lg</label>
<input id="input-@font-size-large" type="text" value="1.25rem" data-var="@font-size-large" class="form-control"/> <input id="input-@font-size-lg" type="text" value="1.25rem" data-var="@font-size-lg" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@font-size-small">@font-size-small</label> <label for="input-@font-size-sm">@font-size-sm</label>
<input id="input-@font-size-small" type="text" value=".85rem" data-var="@font-size-small" class="form-control"/> <input id="input-@font-size-sm" type="text" value=".85rem" data-var="@font-size-sm" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@font-size-xs">@font-size-xs</label> <label for="input-@font-size-xs">@font-size-xs</label>
...@@ -206,20 +206,20 @@ ...@@ -206,20 +206,20 @@
<input id="input-@padding-base-horizontal" type="text" value=".75rem" data-var="@padding-base-horizontal" class="form-control"/> <input id="input-@padding-base-horizontal" type="text" value=".75rem" data-var="@padding-base-horizontal" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@padding-large-vertical">@padding-large-vertical</label> <label for="input-@padding-lg-vertical">@padding-lg-vertical</label>
<input id="input-@padding-large-vertical" type="text" value=".75rem" data-var="@padding-large-vertical" class="form-control"/> <input id="input-@padding-lg-vertical" type="text" value=".75rem" data-var="@padding-lg-vertical" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@padding-large-horizontal">@padding-large-horizontal</label> <label for="input-@padding-lg-horizontal">@padding-lg-horizontal</label>
<input id="input-@padding-large-horizontal" type="text" value="1.5rem" data-var="@padding-large-horizontal" class="form-control"/> <input id="input-@padding-lg-horizontal" type="text" value="1.5rem" data-var="@padding-lg-horizontal" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@padding-small-vertical">@padding-small-vertical</label> <label for="input-@padding-sm-vertical">@padding-sm-vertical</label>
<input id="input-@padding-small-vertical" type="text" value=".3rem" data-var="@padding-small-vertical" class="form-control"/> <input id="input-@padding-sm-vertical" type="text" value=".3rem" data-var="@padding-sm-vertical" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@padding-small-horizontal">@padding-small-horizontal</label> <label for="input-@padding-smhorizontal">@padding-smhorizontal</label>
<input id="input-@padding-small-horizontal" type="text" value=".75rem" data-var="@padding-small-horizontal" class="form-control"/> <input id="input-@padding-smhorizontal" type="text" value=".75rem" data-var="@padding-smhorizontal" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@padding-xs-vertical">@padding-xs-vertical</label> <label for="input-@padding-xs-vertical">@padding-xs-vertical</label>
...@@ -230,24 +230,24 @@ ...@@ -230,24 +230,24 @@
<input id="input-@padding-xs-horizontal" type="text" value=".5rem" data-var="@padding-xs-horizontal" class="form-control"/> <input id="input-@padding-xs-horizontal" type="text" value=".5rem" data-var="@padding-xs-horizontal" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@line-height-large">@line-height-large</label> <label for="input-@line-height-lg">@line-height-lg</label>
<input id="input-@line-height-large" type="text" value="1.33" data-var="@line-height-large" class="form-control"/> <input id="input-@line-height-lg" type="text" value="1.33" data-var="@line-height-lg" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@line-height-small">@line-height-small</label> <label for="input-@line-height-sm">@line-height-sm</label>
<input id="input-@line-height-small" type="text" value="1.5" data-var="@line-height-small" class="form-control"/> <input id="input-@line-height-sm" type="text" value="1.5" data-var="@line-height-sm" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@border-radius-base">@border-radius-base</label> <label for="input-@border-radius-base">@border-radius-base</label>
<input id="input-@border-radius-base" type="text" value=".25rem" data-var="@border-radius-base" class="form-control"/> <input id="input-@border-radius-base" type="text" value=".25rem" data-var="@border-radius-base" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@border-radius-large">@border-radius-large</label> <label for="input-@border-radius-lg">@border-radius-lg</label>
<input id="input-@border-radius-large" type="text" value=".3rem" data-var="@border-radius-large" class="form-control"/> <input id="input-@border-radius-lg" type="text" value=".3rem" data-var="@border-radius-lg" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@border-radius-small">@border-radius-small</label> <label for="input-@border-radius-sm">@border-radius-sm</label>
<input id="input-@border-radius-small" type="text" value=".2rem" data-var="@border-radius-small" class="form-control"/> <input id="input-@border-radius-sm" type="text" value=".2rem" data-var="@border-radius-sm" class="form-control"/>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@component-active-color">@component-active-color</label> <label for="input-@component-active-color">@component-active-color</label>
...@@ -279,9 +279,9 @@ ...@@ -279,9 +279,9 @@
<p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s.</p> <p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s.</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@table-condensed-cell-padding">@table-condensed-cell-padding</label> <label for="input-@table-sm-cell-padding">@table-sm-cell-padding</label>
<input id="input-@table-condensed-cell-padding" type="text" value=".3rem" data-var="@table-condensed-cell-padding" class="form-control"/> <input id="input-@table-sm-cell-padding" type="text" value=".3rem" data-var="@table-sm-cell-padding" class="form-control"/>
<p class="help-block">Padding for cells in <code>.table-condensed</code>.</p> <p class="help-block">Padding for cells in <code>.table-sm</code>.</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@table-bg">@table-bg</label> <label for="input-@table-bg">@table-bg</label>
...@@ -421,13 +421,13 @@ ...@@ -421,13 +421,13 @@
<p class="help-block">Default <code>.form-control</code> border radius</p> <p class="help-block">Default <code>.form-control</code> border radius</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@input-border-radius-large">@input-border-radius-large</label> <label for="input-@input-border-radius-lg">@input-border-radius-lg</label>
<input id="input-@input-border-radius-large" type="text" value="@border-radius-large" data-var="@input-border-radius-large" class="form-control"/> <input id="input-@input-border-radius-lg" type="text" value="@border-radius-lg" data-var="@input-border-radius-lg" class="form-control"/>
<p class="help-block">Large <code>.form-control</code> border radius</p> <p class="help-block">Large <code>.form-control</code> border radius</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@input-border-radius-small">@input-border-radius-small</label> <label for="input-@input-border-radius-sm">@input-border-radius-sm</label>
<input id="input-@input-border-radius-small" type="text" value="@border-radius-small" data-var="@input-border-radius-small" class="form-control"/> <input id="input-@input-border-radius-sm" type="text" value="@border-radius-sm" data-var="@input-border-radius-sm" class="form-control"/>
<p class="help-block">Small <code>.form-control</code> border radius</p> <p class="help-block">Small <code>.form-control</code> border radius</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
...@@ -450,13 +450,13 @@ ...@@ -450,13 +450,13 @@
<p class="help-block">Default <code>.form-control</code> height</p> <p class="help-block">Default <code>.form-control</code> height</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@input-height-large">@input-height-large</label> <label for="input-@input-height-lg">@input-height-lg</label>
<input id="input-@input-height-large" type="text" value="((@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + (@border-width * 2))" data-var="@input-height-large" class="form-control"/> <input id="input-@input-height-lg" type="text" value="((@font-size-lg * @line-height-lg) + (@padding-lg-vertical * 2) + (@border-width * 2))" data-var="@input-height-lg" class="form-control"/>
<p class="help-block">Large <code>.form-control</code> height</p> <p class="help-block">Large <code>.form-control</code> height</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
<label for="input-@input-height-small">@input-height-small</label> <label for="input-@input-height-sm">@input-height-sm</label>
<input id="input-@input-height-small" type="text" value="((@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + (@border-width * 2))" data-var="@input-height-small" class="form-control"/> <input id="input-@input-height-sm" type="text" value="((@font-size-sm * @line-height-sm) + (@padding-sm-vertical * 2) + (@border-width * 2))" data-var="@input-height-sm" class="form-control"/>
<p class="help-block">Small <code>.form-control</code> height</p> <p class="help-block">Small <code>.form-control</code> height</p>
</div> </div>
<div class="bs-customizer-input"> <div class="bs-customizer-input">
......
docs/assets/css/docs.min.css
View file @ d1660ad0
This diff is collapsed.
docs/assets/js/customize.min.js
View file @ d1660ad0
This diff is collapsed.
docs/assets/js/raw-files.min.js
View file @ d1660ad0
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/dist/css/bootstrap.css
View file @ d1660ad0
...@@ -491,100 +491,6 @@ mark, ...@@ -491,100 +491,6 @@ mark,
padding: .2em; padding: .2em;
background-color: #fcf8e3; background-color: #fcf8e3;
} }
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.text-justify {
text-align: justify;
}
.text-nowrap {
white-space: nowrap;
}
.text-lowercase {
text-transform: lowercase;
}
.text-uppercase {
text-transform: uppercase;
}
.text-capitalize {
text-transform: capitalize;
}
.text-muted {
color: #818a91;
}
.text-primary {
color: #027de7;
}
a.text-primary:hover {
color: #0262b4;
}
.text-success {
color: #3c763d;
}
a.text-success:hover {
color: #2b542c;
}
.text-info {
color: #31708f;
}
a.text-info:hover {
color: #245269;
}
.text-warning {
color: #8a6d3b;
}
a.text-warning:hover {
color: #66512c;
}
.text-danger {
color: #a94442;
}
a.text-danger:hover {
color: #843534;
}
.bg-primary {
color: #fff;
background-color: #027de7;
}
a.bg-primary:hover {
background-color: #0262b4;
}
.bg-success {
background-color: #dff0d8;
}
a.bg-success:hover {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
}
a.bg-info:hover {
background-color: #afd9ee;
}
.bg-warning {
background-color: #fcf8e3;
}
a.bg-warning:hover {
background-color: #f7ecb5;
}
.bg-danger {
background-color: #f2dede;
}
a.bg-danger:hover {
background-color: #e4b9b9;
}
.bg-gray-dark {
background-color: #373a3c;
}
a.bg-gray-dark:hover {
background-color: #1f2021;
}
ul, ul,
ol { ol {
margin-top: 0; margin-top: 0;
...@@ -1442,12 +1348,12 @@ th { ...@@ -1442,12 +1348,12 @@ th {
.table > tbody + tbody { .table > tbody + tbody {
border-top: 2px solid #eceeef; border-top: 2px solid #eceeef;
} }
.table-condensed > thead > tr > th, .table-sm > thead > tr > th,
.table-condensed > tbody > tr > th, .table-sm > tbody > tr > th,
.table-condensed > tfoot > tr > th, .table-sm > tfoot > tr > th,
.table-condensed > thead > tr > td, .table-sm > thead > tr > td,
.table-condensed > tbody > tr > td, .table-sm > tbody > tr > td,
.table-condensed > tfoot > tr > td { .table-sm > tfoot > tr > td {
padding: .3rem; padding: .3rem;
} }
.table-bordered { .table-bordered {
...@@ -5352,6 +5258,100 @@ button.close { ...@@ -5352,6 +5258,100 @@ button.close {
.affix { .affix {
position: fixed; position: fixed;
} }
.text-left {
text-align: left;
}
.text-right {
text-align: right;
}
.text-center {
text-align: center;
}
.text-justify {
text-align: justify;
}
.text-nowrap {
white-space: nowrap;
}
.text-lowercase {
text-transform: lowercase;
}
.text-uppercase {
text-transform: uppercase;
}
.text-capitalize {
text-transform: capitalize;
}
.text-muted {
color: #818a91;
}
.text-primary {
color: #027de7;
}
a.text-primary:hover {
color: #0262b4;
}
.text-success {
color: #3c763d;
}
a.text-success:hover {
color: #2b542c;
}
.text-info {
color: #31708f;
}
a.text-info:hover {
color: #245269;
}
.text-warning {
color: #8a6d3b;
}
a.text-warning:hover {
color: #66512c;
}
.text-danger {
color: #a94442;
}
a.text-danger:hover {
color: #843534;
}
.bg-primary {
color: #fff;
background-color: #027de7;
}
a.bg-primary:hover {
background-color: #0262b4;
}
.bg-success {
background-color: #dff0d8;
}
a.bg-success:hover {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
}
a.bg-info:hover {
background-color: #afd9ee;
}
.bg-warning {
background-color: #fcf8e3;
}
a.bg-warning:hover {
background-color: #f7ecb5;
}
.bg-danger {
background-color: #f2dede;
}
a.bg-danger:hover {
background-color: #e4b9b9;
}
.bg-gray-dark {
background-color: #373a3c;
}
a.bg-gray-dark:hover {
background-color: #1f2021;
}
@-ms-viewport { @-ms-viewport {
width: device-width; width: device-width;
} }
......
docs/dist/css/bootstrap.css.map
View file @ d1660ad0
This diff was suppressed by a .gitattributes entry.
docs/dist/css/bootstrap.min.css
View file @ d1660ad0
This source diff could not be displayed because it is too large. You can view the blob instead.
less/_buttons.less
View file @ d1660ad0
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
.btn-lg { .btn-lg {
// line-height: ensure even-numbered height of button next to large input // line-height: ensure even-numbered height of button next to large input
.button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); .button-size(@padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @line-height-lg; @border-radius-lg);
} }
.btn-sm { .btn-sm {
// line-height: ensure proper height of button next to small input // line-height: ensure proper height of button next to small input
.button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); .button-size(@padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @line-height-sm; @border-radius-sm);
} }
.btn-xs { .btn-xs {
.button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-small; @border-radius-small); .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-xs; @line-height-sm; @border-radius-sm);
} }
......
less/_code.less
View file @ d1660ad0
...@@ -26,7 +26,7 @@ kbd { ...@@ -26,7 +26,7 @@ kbd {
font-size: 90%; font-size: 90%;
color: @kbd-color; color: @kbd-color;
background-color: @kbd-bg; background-color: @kbd-bg;
.border-radius(@border-radius-small); .border-radius(@border-radius-sm);
.box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25)); .box-shadow(inset 0 -.1rem 0 rgba(0,0,0,.25));
kbd { kbd {
......
less/_dropdown.less
View file @ d1660ad0
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
.dropdown-header { .dropdown-header {
display: block; display: block;
padding: 3px 20px; padding: 3px 20px;
font-size: @font-size-small; font-size: @font-size-sm;
line-height: @line-height-base; line-height: @line-height-base;
color: @dropdown-header-color; color: @dropdown-header-color;
white-space: nowrap; // as with > li > a white-space: nowrap; // as with > li > a
......
less/_forms.less
View file @ d1660ad0
...@@ -185,12 +185,12 @@ input[type="month"] { ...@@ -185,12 +185,12 @@ input[type="month"] {
line-height: @line-height-base ~"\0"; line-height: @line-height-base ~"\0";
&.input-sm { &.input-sm {
line-height: @input-height-small; line-height: @input-height-sm;
line-height: @line-height-small ~"\0"; line-height: @line-height-sm ~"\0";
} }
&.input-lg { &.input-lg {
line-height: @input-height-large; line-height: @input-height-lg;
line-height: @line-height-large ~"\0"; line-height: @line-height-lg ~"\0";
} }
} }
...@@ -202,10 +202,10 @@ _:-ms-fullscreen, :root input[type="month"] { ...@@ -202,10 +202,10 @@ _:-ms-fullscreen, :root input[type="month"] {
line-height: @line-height-base; line-height: @line-height-base;
&.input-sm { &.input-sm {
line-height: @line-height-small; line-height: @line-height-sm;
} }
&.input-lg { &.input-lg {
line-height: @line-height-large; line-height: @line-height-lg;
} }
} }
...@@ -328,12 +328,12 @@ input[type="checkbox"] { ...@@ -328,12 +328,12 @@ input[type="checkbox"] {
.input-sm, .input-sm,
.form-group-sm .form-control { .form-group-sm .form-control {
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small); .input-size(@input-height-sm; @padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @line-height-sm; @input-border-radius-sm);
} }
.input-lg, .input-lg,
.form-group-lg .form-control { .form-group-lg .form-control {
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large); .input-size(@input-height-lg; @padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @line-height-lg; @input-border-radius-lg);
} }
...@@ -364,14 +364,14 @@ input[type="checkbox"] { ...@@ -364,14 +364,14 @@ input[type="checkbox"] {
pointer-events: none; pointer-events: none;
} }
.input-lg + .form-control-feedback { .input-lg + .form-control-feedback {
width: @input-height-large; width: @input-height-lg;
height: @input-height-large; height: @input-height-lg;
line-height: @input-height-large; line-height: @input-height-lg;
} }
.input-sm + .form-control-feedback { .input-sm + .form-control-feedback {
width: @input-height-small; width: @input-height-sm;
height: @input-height-small; height: @input-height-sm;
line-height: @input-height-small; line-height: @input-height-sm;
} }
// Feedback states // Feedback states
...@@ -548,14 +548,14 @@ input[type="checkbox"] { ...@@ -548,14 +548,14 @@ input[type="checkbox"] {
.form-group-lg { .form-group-lg {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: ((@padding-large-vertical * @line-height-large) + 1); padding-top: ((@padding-lg-vertical * @line-height-lg) + 1);
} }
} }
} }
.form-group-sm { .form-group-sm {
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
.control-label { .control-label {
padding-top: (@padding-small-vertical + 1); padding-top: (@padding-sm-vertical + 1);
} }
} }
} }
......
less/_input-group.less
View file @ d1660ad0
...@@ -83,14 +83,14 @@ ...@@ -83,14 +83,14 @@
// Sizing // Sizing
&.input-sm { &.input-sm {
padding: @padding-small-vertical @padding-small-horizontal; padding: @padding-sm-vertical @padding-smhorizontal;
font-size: @font-size-small; font-size: @font-size-sm;
.border-radius(@border-radius-small); .border-radius(@border-radius-sm);
} }
&.input-lg { &.input-lg {
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-lg-vertical @padding-lg-horizontal;
font-size: @font-size-large; font-size: @font-size-lg;
.border-radius(@border-radius-large); .border-radius(@border-radius-lg);
} }
// Nuke default margins from checkboxes and radios to vertically center within. // Nuke default margins from checkboxes and radios to vertically center within.
......
less/_jumbotron.less
View file @ d1660ad0
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.container &, .container &,
.container-fluid & { .container-fluid & {
.border-radius(@border-radius-large); // Only round corners at higher resolutions if contained in a container .border-radius(@border-radius-lg); // Only round corners at higher resolutions if contained in a container
} }
.container { .container {
......
less/_modal.less
View file @ d1660ad0
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
position: relative; position: relative;
background-color: @modal-content-bg; background-color: @modal-content-bg;
border: 1px solid @modal-content-border-color; border: 1px solid @modal-content-border-color;
.border-radius(@border-radius-large); .border-radius(@border-radius-lg);
.box-shadow(0 3px 9px rgba(0,0,0,.5)); .box-shadow(0 3px 9px rgba(0,0,0,.5));
background-clip: padding-box; background-clip: padding-box;
// Remove focus outline from opened modal // Remove focus outline from opened modal
......
less/_navbar.less
View file @ d1660ad0
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
padding: .55rem .75rem; padding: .55rem .75rem;
margin-right: @spacer; margin-right: @spacer;
margin-bottom: 0; // For headings margin-bottom: 0; // For headings
font-size: @font-size-large; font-size: @font-size-lg;
line-height: @line-height-computed; line-height: @line-height-computed;
/*height: @navbar-height;*/ /*height: @navbar-height;*/
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
padding: .55rem .75rem; padding: .55rem .75rem;
margin-right: @spacer; margin-right: @spacer;
margin-bottom: 0; // For headings margin-bottom: 0; // For headings
font-size: @font-size-large; font-size: @font-size-lg;
line-height: @line-height-computed; line-height: @line-height-computed;
background: none; background: none;
border: 0; border: 0;
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
.navbar-vertical-align(@input-height-base); .navbar-vertical-align(@input-height-base);
&.btn-sm { &.btn-sm {
.navbar-vertical-align(@input-height-small); .navbar-vertical-align(@input-height-sm);
} }
&.btn-xs { &.btn-xs {
.navbar-vertical-align(22); .navbar-vertical-align(22);
......
less/_pagination.less
View file @ d1660ad0
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
// Large // Large
.pagination-lg { .pagination-lg {
.pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large); .pagination-size(@padding-lg-vertical; @padding-lg-horizontal; @font-size-lg; @border-radius-lg);
} }
// Small // Small
.pagination-sm { .pagination-sm {
.pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small); .pagination-size(@padding-sm-vertical; @padding-smhorizontal; @font-size-sm; @border-radius-sm);
} }
less/_popover.less
View file @ d1660ad0
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
background-color: @popover-bg; background-color: @popover-bg;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid @popover-border-color; border: 1px solid @popover-border-color;
.border-radius(@border-radius-large); .border-radius(@border-radius-lg);
.box-shadow(0 5px 10px rgba(0,0,0,.2)); .box-shadow(0 5px 10px rgba(0,0,0,.2));
// Overrides for proper insertion // Overrides for proper insertion
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
font-size: @font-size-base; font-size: @font-size-base;
background-color: @popover-title-bg; background-color: @popover-title-bg;
border-bottom: 1px solid darken(@popover-title-bg, 5%); border-bottom: 1px solid darken(@popover-title-bg, 5%);
border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0; border-radius: (@border-radius-lg - 1) (@border-radius-lg - 1) 0 0;
} }
.popover-content { .popover-content {
......
less/_scaffolding.less
View file @ d1660ad0
...@@ -82,7 +82,7 @@ img { ...@@ -82,7 +82,7 @@ img {
// Rounded corners // Rounded corners
.img-rounded { .img-rounded {
.border-radius(@border-radius-large); .border-radius(@border-radius-lg);
} }
// Image thumbnails // Image thumbnails
......
less/_tooltip.less
View file @ d1660ad0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
z-index: @zindex-tooltip; z-index: @zindex-tooltip;
display: block; display: block;
visibility: visible; visibility: visible;
font-size: @font-size-small; font-size: @font-size-sm;
line-height: 1.4; line-height: 1.4;
opacity: 0; opacity: 0;
......
less/_type.less
View file @ d1660ad0
...@@ -71,7 +71,7 @@ p { ...@@ -71,7 +71,7 @@ p {
// Ex: (12px small font / 14px base font) * 100% = about 85% // Ex: (12px small font / 14px base font) * 100% = about 85%
small, small,
.small { .small {
font-size: floor((100% * @font-size-small / @font-size-base)); font-size: floor((100% * @font-size-sm / @font-size-base));
} }
mark, mark,
......
less/_variables.less
View file @ d1660ad0
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
@font-size-root: 16px; @font-size-root: 16px;
//** Sets the `<body>` and more to the root pixel value. //** Sets the `<body>` and more to the root pixel value.
@font-size-base: 1rem; @font-size-base: 1rem;
@font-size-large: 1.25rem; @font-size-lg: 1.25rem;
@font-size-small: .85rem; @font-size-sm: .85rem;
@font-size-xs: .75rem; @font-size-xs: .75rem;
@font-size-h1: 3rem; @font-size-h1: 3rem;
...@@ -92,21 +92,21 @@ ...@@ -92,21 +92,21 @@
@padding-base-vertical: .5rem; @padding-base-vertical: .5rem;
@padding-base-horizontal: .75rem; @padding-base-horizontal: .75rem;
@padding-large-vertical: .75rem; @padding-lg-vertical: .75rem;
@padding-large-horizontal: 1.5rem; @padding-lg-horizontal: 1.5rem;
@padding-small-vertical: .3rem; @padding-sm-vertical: .3rem;
@padding-small-horizontal: .75rem; @padding-smhorizontal: .75rem;
@padding-xs-vertical: .2rem; @padding-xs-vertical: .2rem;
@padding-xs-horizontal: .5rem; @padding-xs-horizontal: .5rem;
@line-height-large: 1.33; @line-height-lg: 1.33;
@line-height-small: 1.5; @line-height-sm: 1.5;
@border-radius-base: .25rem; @border-radius-base: .25rem;
@border-radius-large: .3rem; @border-radius-lg: .3rem;
@border-radius-small: .2rem; @border-radius-sm: .2rem;
//** Global color for active items (e.g., navs or dropdowns). //** Global color for active items (e.g., navs or dropdowns).
@component-active-color: #fff; @component-active-color: #fff;
...@@ -191,9 +191,9 @@ ...@@ -191,9 +191,9 @@
//** Default `.form-control` border radius //** Default `.form-control` border radius
@input-border-radius: @border-radius-base; @input-border-radius: @border-radius-base;
//** Large `.form-control` border radius //** Large `.form-control` border radius
@input-border-radius-large: @border-radius-large; @input-border-radius-lg: @border-radius-lg;
//** Small `.form-control` border radius //** Small `.form-control` border radius
@input-border-radius-small: @border-radius-small; @input-border-radius-sm: @border-radius-sm;
//** Border color for inputs on focus //** Border color for inputs on focus
@input-border-focus: #66afe9; @input-border-focus: #66afe9;
...@@ -205,9 +205,9 @@ ...@@ -205,9 +205,9 @@
//** Default `.form-control` height //** Default `.form-control` height
@input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + (@border-width * 2)); @input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + (@border-width * 2));
//** Large `.form-control` height //** Large `.form-control` height
@input-height-large: ((@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + (@border-width * 2)); @input-height-lg: ((@font-size-lg * @line-height-lg) + (@padding-lg-vertical * 2) + (@border-width * 2));
//** Small `.form-control` height //** Small `.form-control` height
@input-height-small: ((@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + (@border-width * 2)); @input-height-sm: ((@font-size-sm * @line-height-sm) + (@padding-sm-vertical * 2) + (@border-width * 2));
@legend-color: @gray-dark; @legend-color: @gray-dark;
@legend-border-color: #e5e5e5; @legend-border-color: #e5e5e5;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment