Merge branch 'ce-6213-fix-appearance-forms' into 'master'

CE Port of EE Resolve "Admin area > Appearance forms"

See merge request gitlab-org/gitlab-ce!19551

app/assets/stylesheets/bootstrap_migration.scss

@@ -261,3 +261,7 @@ pre code {
     color: $white-light;
   }
 }
+
+input[type=color].form-control {
+  height: $input-height;
+}