flatly: fixes #107, input-addon

[bootswatch] / flatly / bootswatch.less

diff --git a/flatly/bootswatch.less b/flatly/bootswatch.less
old mode 100755 (executable)
new mode 100644 (file)
index 5d34e12..1576d4f
--- a/flatly/bootswatch.less
+++ b/flatly/bootswatch.less
@@ -1,5 +1,5 @@
 // Flatness by Jenil (www.jgog.in)
-// Bootswatch 2.3.1
+// Bootswatch 2.3.2
 // -----------------------------------------------------
 
 
@@ -90,8 +90,16 @@ p {
                .box-shadow(none);
        }
 
+       .btn, .btn-group {
+               margin-top: 6px;
+       }
+
        &-inverse {
 
+               .brand:hover {
+                       color: @blueDark;
+               }
+
                .navbar-search .search-query {
                        border-color: transparent;
                        .box-shadow(none);
@@ -174,8 +182,8 @@ div.subnav {
 
                & > .active > a,
                & > .active > a:hover {
-                       background-color: @orange;
-                       color: @white;
+                       background-color: @paginationActiveBackground;
+                       color: @textColor;
                }
 
                & > .disabled > a,
@@ -219,7 +227,7 @@ div.subnav {
 // --------------------------------------------------
 
 .btn {
-       padding: 8px 20px;
+       padding: 9px 20px;
        border: none;
        background-image: none;
        color: @white;
@@ -289,7 +297,7 @@ input[type="color"],
        padding: 7px 6px;
        border: 2px solid #dce4ec;
        text-indent: 1px;
-       .border-radius(6px);
+       .border-radius(@inputBorderRadius);
        .box-shadow(none);
        .placeholder(#acb6c0);
 
@@ -298,7 +306,65 @@ input[type="color"],
                .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,
@@ -418,23 +484,40 @@ legend {
        .box-shadow(none);
 
        .bar {
-               background: @textColor;
+               background-color: @blueDark;
+               background-image: none;
                .box-shadow(none);
        }
 
-       &-success .bar {
-               background-color: @green;
+       .bar + .bar {
+               .box-shadow(none);
        }
 
-       &-warning .bar {
-               background-color: @orange;
+       &-striped .bar {
+               #gradient > .striped(@blueDark);
        }
 
-       &-danger .bar {
+       &-success .bar,
+       &-success.progress-striped .bar,
+       .bar-success {
                background-color: @green;
        }
 
-       &-info .bar {
+       &-warning .bar,
+       &-warning.progress-striped .bar,
+       .bar-warning {
+               background-color: @yellow;
+       }
+
+       &-danger .bar,
+       &-danger.progress-striped .bar,
+       .bar-danger {
+               background-color: @red;
+       }
+
+       &-info .bar,
+       &-info.progress-striped .bar,
+       .bar-info {
                background-color: @blue;
        }
 }
@@ -464,7 +547,7 @@ legend {
 
        &-footer {
                background-color: @grayLighter;
-               border-top: 2px solid @dropdownDividerTop;
+               border-top: none;
                .box-shadow(none);
        }
 }
@@ -509,7 +592,3 @@ legend {
 
        }
 }
-
-
-
-