mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Mark Otto
2014-09-21 16:04:37 -07:00
parent 2cc9e773c5
commit d1660ad078
24 changed files with 285 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/_includes/customizer-variables.html
+31 -31
View File
@@ -131,12 +131,12 @@
<p class="help-block">Sets the <code>&lt;body&gt;</code> and more to the root pixel value.</p>
</div>
<div class="bs-customizer-input">
<label for="input-@font-size-large">@font-size-large</label>
<input id="input-@font-size-large" type="text" value="1.25rem" data-var="@font-size-large" class="form-control"/>
<label for="input-@font-size-lg">@font-size-lg</label>
<input id="input-@font-size-lg" type="text" value="1.25rem" data-var="@font-size-lg" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@font-size-small">@font-size-small</label>
<input id="input-@font-size-small" type="text" value=".85rem" data-var="@font-size-small" class="form-control"/>
<label for="input-@font-size-sm">@font-size-sm</label>
<input id="input-@font-size-sm" type="text" value=".85rem" data-var="@font-size-sm" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@font-size-xs">@font-size-xs</label>
@@ -206,20 +206,20 @@
<input id="input-@padding-base-horizontal" type="text" value=".75rem" data-var="@padding-base-horizontal" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@padding-large-vertical">@padding-large-vertical</label>
<input id="input-@padding-large-vertical" type="text" value=".75rem" data-var="@padding-large-vertical" class="form-control"/>
<label for="input-@padding-lg-vertical">@padding-lg-vertical</label>
<input id="input-@padding-lg-vertical" type="text" value=".75rem" data-var="@padding-lg-vertical" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@padding-large-horizontal">@padding-large-horizontal</label>
<input id="input-@padding-large-horizontal" type="text" value="1.5rem" data-var="@padding-large-horizontal" class="form-control"/>
<label for="input-@padding-lg-horizontal">@padding-lg-horizontal</label>
<input id="input-@padding-lg-horizontal" type="text" value="1.5rem" data-var="@padding-lg-horizontal" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@padding-small-vertical">@padding-small-vertical</label>
<input id="input-@padding-small-vertical" type="text" value=".3rem" data-var="@padding-small-vertical" class="form-control"/>
<label for="input-@padding-sm-vertical">@padding-sm-vertical</label>
<input id="input-@padding-sm-vertical" type="text" value=".3rem" data-var="@padding-sm-vertical" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@padding-small-horizontal">@padding-small-horizontal</label>
<input id="input-@padding-small-horizontal" type="text" value=".75rem" data-var="@padding-small-horizontal" class="form-control"/>
<label for="input-@padding-smhorizontal">@padding-smhorizontal</label>
<input id="input-@padding-smhorizontal" type="text" value=".75rem" data-var="@padding-smhorizontal" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@padding-xs-vertical">@padding-xs-vertical</label>
@@ -230,24 +230,24 @@
<input id="input-@padding-xs-horizontal" type="text" value=".5rem" data-var="@padding-xs-horizontal" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@line-height-large">@line-height-large</label>
<input id="input-@line-height-large" type="text" value="1.33" data-var="@line-height-large" class="form-control"/>
<label for="input-@line-height-lg">@line-height-lg</label>
<input id="input-@line-height-lg" type="text" value="1.33" data-var="@line-height-lg" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@line-height-small">@line-height-small</label>
<input id="input-@line-height-small" type="text" value="1.5" data-var="@line-height-small" class="form-control"/>
<label for="input-@line-height-sm">@line-height-sm</label>
<input id="input-@line-height-sm" type="text" value="1.5" data-var="@line-height-sm" class="form-control"/>
</div>
<div class="bs-customizer-input">
<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"/>
</div>
<div class="bs-customizer-input">
<label for="input-@border-radius-large">@border-radius-large</label>
<input id="input-@border-radius-large" type="text" value=".3rem" data-var="@border-radius-large" class="form-control"/>
<label for="input-@border-radius-lg">@border-radius-lg</label>
<input id="input-@border-radius-lg" type="text" value=".3rem" data-var="@border-radius-lg" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@border-radius-small">@border-radius-small</label>
<input id="input-@border-radius-small" type="text" value=".2rem" data-var="@border-radius-small" class="form-control"/>
<label for="input-@border-radius-sm">@border-radius-sm</label>
<input id="input-@border-radius-sm" type="text" value=".2rem" data-var="@border-radius-sm" class="form-control"/>
</div>
<div class="bs-customizer-input">
<label for="input-@component-active-color">@component-active-color</label>
@@ -279,9 +279,9 @@
<p class="help-block">Padding for <code>&lt;th&gt;</code>s and <code>&lt;td&gt;</code>s.</p>
</div>
<div class="bs-customizer-input">
<label for="input-@table-condensed-cell-padding">@table-condensed-cell-padding</label>
<input id="input-@table-condensed-cell-padding" type="text" value=".3rem" data-var="@table-condensed-cell-padding" class="form-control"/>
<p class="help-block">Padding for cells in <code>.table-condensed</code>.</p>
<label for="input-@table-sm-cell-padding">@table-sm-cell-padding</label>
<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-sm</code>.</p>
</div>
<div class="bs-customizer-input">
<label for="input-@table-bg">@table-bg</label>
@@ -421,13 +421,13 @@
<p class="help-block">Default <code>.form-control</code> border radius</p>
</div>
<div class="bs-customizer-input">
<label for="input-@input-border-radius-large">@input-border-radius-large</label>
<input id="input-@input-border-radius-large" type="text" value="@border-radius-large" data-var="@input-border-radius-large" class="form-control"/>
<label for="input-@input-border-radius-lg">@input-border-radius-lg</label>
<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>
</div>
<div class="bs-customizer-input">
<label for="input-@input-border-radius-small">@input-border-radius-small</label>
<input id="input-@input-border-radius-small" type="text" value="@border-radius-small" data-var="@input-border-radius-small" class="form-control"/>
<label for="input-@input-border-radius-sm">@input-border-radius-sm</label>
<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>
</div>
<div class="bs-customizer-input">
@@ -450,13 +450,13 @@
<p class="help-block">Default <code>.form-control</code> height</p>
</div>
<div class="bs-customizer-input">
<label for="input-@input-height-large">@input-height-large</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"/>
<label for="input-@input-height-lg">@input-height-lg</label>
<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>
</div>
<div class="bs-customizer-input">
<label for="input-@input-height-small">@input-height-small</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"/>
<label for="input-@input-height-sm">@input-height-sm</label>
<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>
</div>
<div class="bs-customizer-input">
docs/assets/css/docs.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/customize.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/assets/js/raw-files.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.css
Vendored
+100 -100
View File
@@ -491,100 +491,6 @@ mark,
padding: .2em;
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,
ol {
margin-top: 0;
@@ -1442,12 +1348,12 @@ th {
.table > tbody + tbody {
border-top: 2px solid #eceeef;
}
.table-condensed > thead > tr > th,
.table-condensed > tbody > tr > th,
.table-condensed > tfoot > tr > th,
.table-condensed > thead > tr > td,
.table-condensed > tbody > tr > td,
.table-condensed > tfoot > tr > td {
.table-sm > thead > tr > th,
.table-sm > tbody > tr > th,
.table-sm > tfoot > tr > th,
.table-sm > thead > tr > td,
.table-sm > tbody > tr > td,
.table-sm > tfoot > tr > td {
padding: .3rem;
}
.table-bordered {
@@ -5352,6 +5258,100 @@ button.close {
.affix {
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 {
width: device-width;
}
docs/dist/css/bootstrap.css.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
docs/dist/css/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long