Commit c4c22f00 authored by Thomas Park's avatar Thomas Park
Browse files

flatly: fixes #107, input-addon

parent 15734466
...@@ -6248,6 +6248,11 @@ p { ...@@ -6248,6 +6248,11 @@ p {
box-shadow: none; box-shadow: none;
} }
.navbar .btn,
.navbar .btn-group {
margin-top: 6px;
}
.navbar-inverse .brand:hover { .navbar-inverse .brand:hover {
color: #2c3e50; color: #2c3e50;
} }
...@@ -6365,7 +6370,7 @@ div.subnav .nav > .active > a:hover { ...@@ -6365,7 +6370,7 @@ div.subnav .nav > .active > a:hover {
} }
.btn { .btn {
padding: 8px 20px; padding: 9px 20px;
color: #ffffff; color: #ffffff;
text-decoration: none; text-decoration: none;
text-shadow: none; text-shadow: none;
...@@ -6518,6 +6523,73 @@ input[type="color"]:focus, ...@@ -6518,6 +6523,73 @@ input[type="color"]:focus,
box-shadow: none; box-shadow: none;
} }
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
-webkit-border-radius: 6px 0 0 6px;
-moz-border-radius: 6px 0 0 6px;
border-radius: 6px 0 0 6px;
}
.input-append input,
.input-append select,
.input-append .uneditable-input {
-webkit-border-radius: 6px 0 0 6px;
-moz-border-radius: 6px 0 0 6px;
border-radius: 6px 0 0 6px;
}
.input-append input + .btn-group .btn:last-child,
.input-append select + .btn-group .btn:last-child,
.input-append .uneditable-input + .btn-group .btn:last-child {
-webkit-border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
border-radius: 0 6px 6px 0;
}
.input-append .add-on:last-child,
.input-append .btn:last-child,
.input-append .btn-group:last-child > .dropdown-toggle {
-webkit-border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
border-radius: 0 6px 6px 0;
}
.input-prepend.input-append input,
.input-prepend.input-append select,
.input-prepend.input-append .uneditable-input {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.input-prepend.input-append input + .btn-group .btn,
.input-prepend.input-append select + .btn-group .btn,
.input-prepend.input-append .uneditable-input + .btn-group .btn {
-webkit-border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
border-radius: 0 6px 6px 0;
}
.input-prepend.input-append .add-on:first-child,
.input-prepend.input-append .btn:first-child {
-webkit-border-radius: 6px 0 0 6px;
-moz-border-radius: 6px 0 0 6px;
border-radius: 6px 0 0 6px;
}
.input-prepend.input-append .add-on:last-child,
.input-prepend.input-append .btn:last-child {
-webkit-border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
border-radius: 0 6px 6px 0;
}
.input-append .add-on,
.input-prepend .add-on {
padding: 9px 5px;
text-shadow: none;
}
.control-group.error, .control-group.error,
.control-group.error input:focus, .control-group.error input:focus,
.control-group.error textarea:focus { .control-group.error textarea:focus {
...@@ -6710,7 +6782,7 @@ legend { ...@@ -6710,7 +6782,7 @@ legend {
.modal-footer { .modal-footer {
background-color: #ecf0f1; background-color: #ecf0f1;
border-top: 2px solid rgba(0, 0, 0, 0.2); border-top: none;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -90,6 +90,10 @@ p { ...@@ -90,6 +90,10 @@ p {
.box-shadow(none); .box-shadow(none);
} }
.btn, .btn-group {
margin-top: 6px;
}
&-inverse { &-inverse {
.brand:hover { .brand:hover {
...@@ -223,7 +227,7 @@ div.subnav { ...@@ -223,7 +227,7 @@ div.subnav {
// -------------------------------------------------- // --------------------------------------------------
.btn { .btn {
padding: 8px 20px; padding: 9px 20px;
border: none; border: none;
background-image: none; background-image: none;
color: @white; color: @white;
...@@ -293,7 +297,7 @@ input[type="color"], ...@@ -293,7 +297,7 @@ input[type="color"],
padding: 7px 6px; padding: 7px 6px;
border: 2px solid #dce4ec; border: 2px solid #dce4ec;
text-indent: 1px; text-indent: 1px;
.border-radius(6px); .border-radius(@inputBorderRadius);
.box-shadow(none); .box-shadow(none);
.placeholder(#acb6c0); .placeholder(#acb6c0);
...@@ -302,7 +306,65 @@ input[type="color"], ...@@ -302,7 +306,65 @@ input[type="color"],
.box-shadow(none); .box-shadow(none);
} }
}
.input-prepend {
.add-on:first-child,
.btn:first-child {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
}
.input-append {
input,
select,
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
+ .btn-group .btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
}
}
.add-on:last-child,
.btn:last-child,
.btn-group:last-child > .dropdown-toggle {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
}
}
.input-prepend.input-append {
input,
select,
.uneditable-input {
.border-radius(0);
+ .btn-group .btn {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
}
}
.add-on:first-child,
.btn:first-child {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
}
}
.input-append,
.input-prepend {
.add-on {
padding: 9px 5px;
text-shadow: none;
}
} }
.control-group.error, .control-group.error,
...@@ -485,7 +547,7 @@ legend { ...@@ -485,7 +547,7 @@ legend {
&-footer { &-footer {
background-color: @grayLighter; background-color: @grayLighter;
border-top: 2px solid @dropdownDividerTop; border-top: none;
.box-shadow(none); .box-shadow(none);
} }
} }
......
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