summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-04-01 20:43:15 +0000
committerFatih Acet <acetfatih@gmail.com>2019-04-01 20:43:15 +0000
commit2f4a623817618d89866915e585396debb220a7a0 (patch)
treed3cf43d49b9be97a9cf8d7430b9f4484e635cf4b
parent8e9c6b1ac805af6a6f07af2bc6df1c003dcd44c5 (diff)
parent2fd784a4c1cb991391399ac369bfb008db697380 (diff)
downloadgitlab-ce-2f4a623817618d89866915e585396debb220a7a0.tar.gz
Merge branch 'nfriend-css-updates-for-gitlab-design-system-compliance' into 'master'
Update border radius of form controls and remove space above page titles See merge request gitlab-org/gitlab-ce!24497
-rw-r--r--app/assets/stylesheets/framework/forms.scss2
-rw-r--r--app/assets/stylesheets/framework/page_title.scss1
-rw-r--r--changelogs/unreleased/nfriend-css-updates-for-gitlab-design-system-compliance.yml5
3 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss
index 3b1d1d67509..c36c15a85be 100644
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -128,7 +128,7 @@ label {
.form-control {
@include box-shadow(none);
- border-radius: 2px;
+ border-radius: $border-radius-default;
padding: $gl-vert-padding $gl-input-padding;
&.input-short {
diff --git a/app/assets/stylesheets/framework/page_title.scss b/app/assets/stylesheets/framework/page_title.scss
index e8302953a63..ad6575761b5 100644
--- a/app/assets/stylesheets/framework/page_title.scss
+++ b/app/assets/stylesheets/framework/page_title.scss
@@ -2,7 +2,6 @@
@extend .d-flex;
@extend .align-items-center;
- padding-top: $gl-padding-top;
border-bottom: 1px solid $border-color;
.page-title {
diff --git a/changelogs/unreleased/nfriend-css-updates-for-gitlab-design-system-compliance.yml b/changelogs/unreleased/nfriend-css-updates-for-gitlab-design-system-compliance.yml
new file mode 100644
index 00000000000..8cde0958f7a
--- /dev/null
+++ b/changelogs/unreleased/nfriend-css-updates-for-gitlab-design-system-compliance.yml
@@ -0,0 +1,5 @@
+---
+title: Update `border-radius` of form controls and remove extra space above page titles
+merge_request: 24497
+author:
+type: fixed