fix input color on dark themes, closes thomaspark#243

psmitak · Apr 3, 2014 · 236ff83 · 236ff83
1 parent 722db17
commit 236ff83
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 36 deletions.
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css
@@ -5824,6 +5824,14 @@ table a,
   color: #fff;
   text-decoration: underline;
 }
+input,
+textarea {
+  color: #444444;
+}
+legend {
+  font-family: 'Lobster', cursive;
+  color: #fff;
+}
 .has-warning .help-block,
 .has-warning .control-label {
   color: #ecd77f;
@@ -5848,10 +5856,6 @@ table a,
 .has-success .form-control:focus {
   border-color: #93e08b;
 }
-legend {
-  font-family: 'Lobster', cursive;
-  color: #fff;
-}
 .input-group-addon {
   color: #444444;
 }

diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css
diff --git a/amelia/bootswatch.less b/amelia/bootswatch.less
@@ -84,6 +84,16 @@ table,
 
 // Forms ======================================================================
 
+input,
+textarea {
+  color: @input-color;
+}
+
+legend {
+  font-family: 'Lobster', cursive;
+  color: #fff;
+}
+
 .has-warning {
   .help-block,
   .control-label {
@@ -120,11 +130,6 @@ table,
   }
 }
 
-legend {
-  font-family: 'Lobster', cursive;
-  color: #fff;
-}
-
 .input-group-addon {
   color: @btn-default-color;
 }

diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css
@@ -1,6 +1,6 @@
 @import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
 /*!
- * Bootswatch v3.1.1
+ * Bootswatch v3.1.1+1
  * Homepage: http://bootswatch.com
  * Copyright 2012-2014 Thomas Park
  * Licensed under MIT
@@ -5845,11 +5845,6 @@ legend {
 .input-group-addon {
   background-color: #424242;
 }
-.nav .caret,
-.nav a:hover .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
 .nav-tabs a,
 .nav-pills a,
 .breadcrumb a,

diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css
diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less
@@ -104,15 +104,6 @@ legend {
 
 // Navs =======================================================================
 
-.nav {
-
-  .caret,
-  a:hover .caret {
-    border-top-color: #fff;
-    border-bottom-color: #fff;
-  }
-}
-
 .nav-tabs,
 .nav-pills,
 .breadcrumb,

diff --git a/darkly/bootstrap.css b/darkly/bootstrap.css
@@ -5880,14 +5880,20 @@ table-bordered > tfoot > tr > td,
 .table-bordered > tfoot > tr > td {
   border: 1px solid #464545;
 }
+input,
+textarea {
+  color: #464545;
+}
 .form-control,
-input {
+input,
+textarea {
   border: none;
   -webkit-box-shadow: none;
   box-shadow: none;
 }
 .form-control:focus,
-input:focus {
+input:focus,
+textarea:focus {
   -webkit-box-shadow: none;
   box-shadow: none;
 }

diff --git a/darkly/bootstrap.min.css b/darkly/bootstrap.min.css
diff --git a/darkly/bootswatch.less b/darkly/bootswatch.less
@@ -118,8 +118,14 @@ table,
 
 // Forms ======================================================================
 
+input,
+textarea {
+  color: @input-color;
+}
+
 .form-control,
-input {
+input,
+textarea {
   border: none;
   .box-shadow(none);
 

diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css
@@ -1712,14 +1712,14 @@ output {
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(0, 0, 0, 0.6);
 }
 .form-control::-moz-placeholder {
-  color: #4e5d6c;
+  color: #cccccc;
   opacity: 1;
 }
 .form-control:-ms-input-placeholder {
-  color: #4e5d6c;
+  color: #cccccc;
 }
 .form-control::-webkit-input-placeholder {
-  color: #4e5d6c;
+  color: #cccccc;
 }
 .form-control[disabled],
 .form-control[readonly],
@@ -5863,6 +5863,10 @@ table > tfoot > tr > td,
 .table > tfoot > tr > td {
   border-color: transparent;
 }
+input,
+textarea {
+  color: #2b3e50;
+}
 label,
 .radio label,
 .checkbox label,

diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css
diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less
@@ -124,6 +124,11 @@ table,
 
 // Forms ======================================================================
 
+input,
+textarea {
+  color: @input-color;
+}
+
 label,
 .radio label,
 .checkbox label,

diff --git a/superhero/variables.less b/superhero/variables.less
@@ -183,7 +183,7 @@
 @input-border-focus:             transparent;
 
 //** Placeholder text color
-@input-color-placeholder:        @gray-light;
+@input-color-placeholder:        #ccc;
 
 //** Default `.form-control` height
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);