Merge "vector: Restore gray search input placeholder"

diff --combined skins/vector/screen.less
index a882732,868db7c..f8be097
--- 1/skins/vector/screen.less
--- 2/skins/vector/screen.less
+++ b/skins/vector/screen.less
@@@ -37,7 -37,7 +37,7 @@@ div#content 
        /* Merge the border with tabs' one (in their background image) */
        margin-top: -1px;
        background-color: white;
 -      color: @body-font-color;
 +      color: @content-font-color;
        direction: ltr;
  }
  /* Hide, but keep accessible for screen-readers */
@@@ -378,6 -378,9 +378,9 @@@ div#simpleSearch 
  div#simpleSearch input:focus {
        outline: none;
  }
+ div#simpleSearch input {
+       color: black;
+ }
  div#simpleSearch input.placeholder {
        color: #999;
  }
@@@ -407,7 -410,6 +410,6 @@@ div#simpleSearch input#searchInput 
         * this from ever being shown anyways.
        */
        font-size: 13px;
-       color: black;
        background-color: transparent;
        direction: ltr;
  }
@@@ -547,6 -549,104 +549,6 @@@ div#footer #footer-places li 
        text-decoration: none;
  }
  
 -/*
 - *
 - * The following code is highly modified from monobook. It would be nice if the
 - * preftoc id was more human readable like preferences-toc for instance,
 - * howerver this would require backporting the other skins.
 - */
 -
 -/* Preferences */
 -#preftoc {
 -      /* Tabs */
 -      width: 100%;
 -      float: left;
 -      clear: both;
 -      margin: 0 !important;
 -      padding: 0 !important;
 -      .background-image('images/preferences-break.png');
 -      background-position: bottom left;
 -      background-repeat: no-repeat;
 -}
 -      #preftoc li {
 -              /* Tab */
 -              float: left;
 -              margin: 0;
 -              padding: 0;
 -              padding-right: 1px;
 -              height: 2.25em;
 -              white-space: nowrap;
 -              list-style-type: none;
 -              list-style-image: none;
 -              .background-image('images/preferences-break.png');
 -              background-position: bottom right;
 -              background-repeat: no-repeat;
 -      }
 -      /* Sadly, IE6 won't understand this */
 -      #preftoc li:first-child {
 -              margin-left: 1px;
 -      }
 -      #preftoc a,
 -      #preftoc a:active {
 -              display: inline-block;
 -              position: relative;
 -              color: @menu-link-color;
 -              padding: 0.5em;
 -              text-decoration: none;
 -              background-image: none;
 -              font-size: 0.9em;
 -      }
 -      #preftoc a:hover,
 -      #preftoc a:focus {
 -              text-decoration: underline;
 -      }
 -      #preftoc li.selected a {
 -              .background-image('images/preferences-fade.png');
 -              background-position: bottom;
 -              background-repeat: repeat-x;
 -              color: #333;
 -              text-decoration: none;
 -      }
 -#preferences {
 -      float: left;
 -      width: 100%;
 -      margin: 0;
 -      margin-top: -2px;
 -      clear: both;
 -      border: solid 1px #ccc;
 -      background-color: #fafafa;
 -}
 -#preferences fieldset {
 -      border: none;
 -      border-top: solid 1px #ccc;
 -}
 -#preferences fieldset.prefsection {
 -      border: none;
 -      padding: 0;
 -      margin: 1em;
 -}
 -#preferences legend {
 -      color: #666;
 -}
 -#preferences fieldset.prefsection legend.mainLegend {
 -      display: none;
 -}
 -#preferences td {
 -      padding-left: 0.5em;
 -      padding-right: 0.5em;
 -}
 -.htmlform-tip {
 -      font-size: x-small;
 -      padding: .2em 2em;
 -      color: #666;
 -}
 -#preferences div.mw-prefs-buttons {
 -      padding: 1em;
 -}
 -#preferences div.mw-prefs-buttons input {
 -      margin-right: 0.25em;
 -}
 -
  ul {
        list-style-type: disc;
        .list-style-image('images/bullet-icon.png');