diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-21 20:15:45 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-21 20:15:45 +0000 |
| commit | 8e156d662b7895ce8777f34882422c3714cc65c7 (patch) | |
| tree | e083a226d7015b76d299bbf6b14ec7354e17645b | |
| parent | e82c707e510e10352fbad9e21824e56c396ec4a5 (diff) | |
| parent | fb2f71641f30edecc32d5f1ff06b697c07ddfade (diff) | |
| download | gitlab-ce-8e156d662b7895ce8777f34882422c3714cc65c7.tar.gz | |
Merge branch '30618-change-placeholder-color' into 'master'
fix placeholder visibility
Closes #30618
See merge request !10804
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 29 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 664539e93e1..1839cadcc10 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -338,3 +338,32 @@ h4 { .idiff.addition { background: $line-added-dark; } + + +/** + * form text input i.e. search bar, comments, forms, etc. + */ +input, +textarea { + &::-webkit-input-placeholder { + color: $placeholder-text-color; + } + + // support firefox 19+ vendor prefix + &::-moz-placeholder { + color: $placeholder-text-color; + opacity: 1; // FF defaults to 0.54 + } + + // scss-lint:disable PseudoElement + // support Edge vendor prefix + &::-ms-input-placeholder { + color: $placeholder-text-color; + } + + // scss-lint:disable PseudoElement + // support IE vendor prefix + &:-ms-input-placeholder { + color: $placeholder-text-color; + } +} diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index ad592a45941..49741c963df 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -111,6 +111,7 @@ $gl-gray: $gl-text-color; $gl-gray-dark: #313236; $gl-header-color: #4c4e54; $gl-header-nav-hover-color: #434343; +$placeholder-text-color: rgba(0, 0, 0, .42); /* * Lists |