diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 21:11:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-24 21:11:44 +0300 |
commit | fd247970cfe1e98276c780fbdcca026b7960e42a (patch) | |
tree | ab7963eb9b30fd73283c526cb6ae4ca1ef61c06f /app/assets/stylesheets | |
parent | df9890e9a702e2f12bbc8f022b916ca72820a292 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 18 | ||||
-rw-r--r-- | app/assets/stylesheets/page_bundles/search.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/startup/startup-dark.scss | 3 | ||||
-rw-r--r-- | app/assets/stylesheets/startup/startup-general.scss | 3 |
4 files changed, 33 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index e86edff3f13..c0fe8ca6f76 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -36,6 +36,24 @@ input[type='number'].hide-spinners { } /* stylelint-enable property-no-vendor-prefix */ +/** + * When form input type is search, browsers add a clear input button inside + * the input field. This overlaps with the input field we have already added. + */ + +/* stylelint-disable property-no-vendor-prefix */ +input[type='search'] { + -webkit-appearance: textfield; + -moz-appearance: textfield; + appearance: textfield; + + &::-webkit-search-cancel-button, + &::-webkit-search-results-button { + @include gl-display-none; + } +} +/* stylelint-enable property-no-vendor-prefix */ + .datetime-controls { select { width: 100px; diff --git a/app/assets/stylesheets/page_bundles/search.scss b/app/assets/stylesheets/page_bundles/search.scss index 10da541ed8d..7e3b8f1284a 100644 --- a/app/assets/stylesheets/page_bundles/search.scss +++ b/app/assets/stylesheets/page_bundles/search.scss @@ -324,13 +324,20 @@ $border-radius-medium: 3px; } } -// Disable Webkit's search input styles +/** + * When form input type is search, browsers add a clear input button inside + * the input field. This overlaps with the input field we have already added. + */ + +/* stylelint-disable property-no-vendor-prefix */ input[type='search'] { - /* stylelint-disable-next-line property-no-vendor-prefix */ -webkit-appearance: textfield; + -moz-appearance: textfield; + appearance: textfield; &::-webkit-search-cancel-button, &::-webkit-search-results-button { @include gl-display-none; } } +/* stylelint-enable property-no-vendor-prefix */ diff --git a/app/assets/stylesheets/startup/startup-dark.scss b/app/assets/stylesheets/startup/startup-dark.scss index bb83a91bc57..c9425b1103c 100644 --- a/app/assets/stylesheets/startup/startup-dark.scss +++ b/app/assets/stylesheets/startup/startup-dark.scss @@ -761,6 +761,9 @@ input { color: #ececef; background-color: #333238; } +input[type="search"] { + appearance: textfield; +} .form-control { border-radius: 4px; padding: 6px 10px; diff --git a/app/assets/stylesheets/startup/startup-general.scss b/app/assets/stylesheets/startup/startup-general.scss index 9e1c6b065a0..40a6e9eb9fe 100644 --- a/app/assets/stylesheets/startup/startup-general.scss +++ b/app/assets/stylesheets/startup/startup-general.scss @@ -761,6 +761,9 @@ input { color: #333238; background-color: #fff; } +input[type="search"] { + appearance: textfield; +} .form-control { border-radius: 4px; padding: 6px 10px; |