diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-21 16:03:09 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-21 16:03:09 +0000 |
commit | 7a532bcffcb5e32d219c7cdea9eba6eb826317aa (patch) | |
tree | 1cda1ef4814e6d36e6124f46d253b8c97e2b6cc2 | |
parent | 88e3915dbab8eedcb7c92d2ace7df6eb29a71eb7 (diff) | |
parent | 4512ed80fc229a8048a950070fa2174754707bc0 (diff) | |
download | gitlab-ce-7a532bcffcb5e32d219c7cdea9eba6eb826317aa.tar.gz |
Merge branch 'fix/new-project-path-input-overlapping' into 'master'
Fix new project path input overlapping, height and radius #41811
Closes #41811
See merge request gitlab-org/gitlab-ce!16755
-rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/selects.scss | 2 | ||||
-rw-r--r-- | changelogs/unreleased/fix-new-project-path-input-overlapping.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index a2ea155a10e..2c30311b1c1 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -167,7 +167,7 @@ label { .input-group { .select2-container { display: table-cell; - width: 200px !important; + max-width: 180px; } .input-group-addon { diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index dbee7073975..b40dcf93969 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -8,7 +8,7 @@ .select2-choice { background: $white-light; border-color: $input-border; - height: 35px; + height: 34px; padding: $gl-vert-padding $gl-input-padding; font-size: $gl-font-size; line-height: 1.42857143; diff --git a/changelogs/unreleased/fix-new-project-path-input-overlapping.yml b/changelogs/unreleased/fix-new-project-path-input-overlapping.yml new file mode 100644 index 00000000000..fb33ce9437a --- /dev/null +++ b/changelogs/unreleased/fix-new-project-path-input-overlapping.yml @@ -0,0 +1,5 @@ +--- +title: Fix new project path input overlapping +merge_request: 16755 +author: George Tsiolis +type: fixed |