mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-08 17:22:31 +03:00
fixing conflict and recompiling
This commit is contained in:
+4
-4
@@ -28,6 +28,7 @@ fieldset {
|
||||
// Parent element that clears floats and wraps labels and fields together
|
||||
form .clearfix {
|
||||
margin-bottom: @baseline;
|
||||
.clearfix()
|
||||
}
|
||||
|
||||
// Set font for forms
|
||||
@@ -145,7 +146,7 @@ textarea {
|
||||
}
|
||||
input:focus,
|
||||
textarea:focus {
|
||||
outline: none;
|
||||
outline: 0;
|
||||
border-color: rgba(82,168,236,.8);
|
||||
@shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
|
||||
.box-shadow(@shadow);
|
||||
@@ -330,12 +331,13 @@ textarea[readonly] {
|
||||
// Allow us to put symbols and text within the input field for a cleaner look
|
||||
.input-prepend,
|
||||
.input-append {
|
||||
.clearfix();
|
||||
input {
|
||||
.border-radius(0 3px 3px 0);
|
||||
}
|
||||
.add-on {
|
||||
position: relative;
|
||||
background: #f5f5f5;
|
||||
border: 1px solid #ccc;
|
||||
z-index: 2;
|
||||
float: left;
|
||||
display: block;
|
||||
@@ -349,8 +351,6 @@ textarea[readonly] {
|
||||
color: @grayLight;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 @white;
|
||||
background-color: #f5f5f5;
|
||||
border: 1px solid #ccc;
|
||||
.border-radius(3px 0 0 3px);
|
||||
}
|
||||
.active {
|
||||
|
||||
Reference in New Issue
Block a user