summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/forms.scss
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-20 12:26:25 +0000
commita09983ae35713f5a2bbb100981116d31ce99826e (patch)
tree2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/assets/stylesheets/framework/forms.scss
parent18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff)
downloadgitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/assets/stylesheets/framework/forms.scss')
-rw-r--r--app/assets/stylesheets/framework/forms.scss6
1 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 44c8ace9040..ec8d5806345 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -4,6 +4,8 @@ textarea {
input {
border-radius: $border-radius-base;
+ color: $gl-text-color;
+ background-color: $input-bg;
}
input[type='text'].danger {
@@ -126,10 +128,6 @@ label {
display: inline;
}
-.wiki-content {
- margin-top: 35px;
-}
-
.form-control::placeholder {
color: $gl-text-color-tertiary;
}