diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-15 21:30:19 +0000 |
---|---|---|
committer | Chris Peressini <cperessini@gitlab.com> | 2018-06-18 10:49:34 +0200 |
commit | b002ef70d57c60c95853d53e5218dc50383834f2 (patch) | |
tree | 89fc2e586aa87cf684d210440ffd72770a4f335d | |
parent | 292dcd5ddf72e3c28515eb868b2eb576e99be9fd (diff) | |
download | gitlab-ce-b002ef70d57c60c95853d53e5218dc50383834f2.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.scss | 1 | ||||
-rw-r--r-- | app/views/shared/_clone_panel.html.haml | 2 |
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 |