summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-15 21:30:19 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-06-15 21:30:19 +0000
commita76066d7fad192d8c339101d9b7dd0048fe6e303 (patch)
treebd2724b3ad5255762b8b817dacd44918e6989bb3
parentcab4302a84d272498a855c4acb46152b49c32b4a (diff)
parent62bd9d34ff6903db1f68596564084383d12ab2cf (diff)
downloadgitlab-ce-a76066d7fad192d8c339101d9b7dd0048fe6e303.tar.gz
Merge branch '47917-wiki-git-access' into 'master'
Resolve "Wiki git clone holder and dropdown is broken" Closes #47917 See merge request gitlab-org/gitlab-ce!19913
-rw-r--r--app/assets/stylesheets/pages/projects.scss1
-rw-r--r--app/views/shared/_clone_panel.html.haml2
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 7ac0eaec645..aa83e5bdebc 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -858,7 +858,6 @@ pre.light-well {
.git-clone-holder {
width: 380px;
- height: 28px;
.btn-clipboard {
border: 1px solid $border-color;
diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml
index 5fc02ba3160..3655c2a1d42 100644
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
@@ -11,7 +11,7 @@
%span
= default_clone_protocol.upcase
= icon('caret-down')
- %ul.dropdown-menu.dropdown-menu-selectable.dropdown-menu-right.clone-options-dropdown
+ %ul.dropdown-menu.dropdown-menu-selectable.clone-options-dropdown
%li
= ssh_clone_button(project)
%li