mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00
Code Issues Releases Wiki Activity

readd bootstrap.zip, add @inputBorderRadius var to close #2946

Browse Source
This commit is contained in:
Mark Otto
2012-04-07 16:17:15 -07:00
parent f563b1db43
commit 0a71f171bc
7 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip Normal file
View File

Binary file not shown.

2
docs/download.html
View File

@@ -368,6 +368,8 @@
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
<label>@inputBorder</label> <label>@inputBorder</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label>
<input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label> <label>@inputDisabledBackground</label>
<input type="text" class="span3" placeholder="@grayLighter"> <input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label> <label>@formActionsBackground</label>

4
docs/less.html
View File

@@ -453,6 +453,10 @@
<td><code>@inputBorder</code></td> <td><code>@inputBorder</code></td>
<td><code>#ccc</code></td> <td><code>#ccc</code></td>
</tr> </tr>
<tr>
<td><code>@inputBorderRadius</code></td>
<td><code>3px</code></td>
</tr>
<tr> <tr>
<td><code>@inputDisabledBackground</code></td> <td><code>@inputDisabledBackground</code></td>
<td><code>@grayLighter</code></td> <td><code>@grayLighter</code></td>

2
docs/templates/pages/download.mustache vendored
View File

@@ -291,6 +291,8 @@
<input type="text" class="span3" placeholder="@white"> <input type="text" class="span3" placeholder="@white">
<label>@inputBorder</label> <label>@inputBorder</label>
<input type="text" class="span3" placeholder="#ccc"> <input type="text" class="span3" placeholder="#ccc">
<label>@inputBorderRadius</label>
<input type="text" class="span3" placeholder="3px">
<label>@inputDisabledBackground</label> <label>@inputDisabledBackground</label>
<input type="text" class="span3" placeholder="@grayLighter"> <input type="text" class="span3" placeholder="@grayLighter">
<label>@formActionsBackground</label> <label>@formActionsBackground</label>

4
docs/templates/pages/less.mustache vendored
View File

@@ -376,6 +376,10 @@
<td><code>@inputBorder</code></td> <td><code>@inputBorder</code></td>
<td><code>#ccc</code></td> <td><code>#ccc</code></td>
</tr> </tr>
<tr>
<td><code>@inputBorderRadius</code></td>
<td><code>3px</code></td>
</tr>
<tr> <tr>
<td><code>@inputDisabledBackground</code></td> <td><code>@inputDisabledBackground</code></td>
<td><code>@grayLighter</code></td> <td><code>@grayLighter</code></td>

14
less/forms.less
View File

@@ -72,7 +72,7 @@ select,
line-height: @baseLineHeight; line-height: @baseLineHeight;
color: @gray; color: @gray;
border: 1px solid @inputBorder; border: 1px solid @inputBorder;
.border-radius(3px); .border-radius(@inputBorderRadius);
} }
.uneditable-textarea { .uneditable-textarea {
width: auto; width: auto;
@@ -372,7 +372,7 @@ select:focus:required:invalid {
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
*margin-left: 0; *margin-left: 0;
vertical-align: middle; vertical-align: middle;
.border-radius(0 3px 3px 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
// Make input on top when focused so blue border and shadow always show // Make input on top when focused so blue border and shadow always show
&:focus { &:focus {
z-index: 2; z-index: 2;
@@ -397,7 +397,7 @@ select:focus:required:invalid {
} }
.add-on, .add-on,
.btn { .btn {
.border-radius(3px 0 0 3px); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
} }
.active { .active {
background-color: lighten(@green, 30); background-color: lighten(@green, 30);
@@ -414,7 +414,7 @@ select:focus:required:invalid {
input, input,
select, select,
.uneditable-input { .uneditable-input {
.border-radius(3px 0 0 3px); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
} }
.uneditable-input { .uneditable-input {
border-left-color: #eee; border-left-color: #eee;
@@ -423,7 +423,7 @@ select:focus:required:invalid {
.add-on, .add-on,
.btn { .btn {
margin-left: -1px; margin-left: -1px;
.border-radius(0 3px 3px 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
} }
} }
// Remove all border-radius for inputs with both prepend and append // Remove all border-radius for inputs with both prepend and append
@@ -436,12 +436,12 @@ select:focus:required:invalid {
.add-on:first-child, .add-on:first-child,
.btn:first-child { .btn:first-child {
margin-right: -1px; margin-right: -1px;
.border-radius(3px 0 0 3px); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
} }
.add-on:last-child, .add-on:last-child,
.btn:last-child { .btn:last-child {
margin-left: -1px; margin-left: -1px;
.border-radius(0 3px 3px 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
} }
} }

1
less/variables.less
View File

@@ -96,6 +96,7 @@
// ------------------------- // -------------------------
@inputBackground: @white; @inputBackground: @white;
@inputBorder: #ccc; @inputBorder: #ccc;
@inputBorderRadius: 3px;
@inputDisabledBackground: @grayLighter; @inputDisabledBackground: @grayLighter;
@formActionsBackground: #f5f5f5; @formActionsBackground: #f5f5f5;