diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-11 20:58:53 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-11 20:58:53 +0300 |
| commit | 9f8d91c94e6ad41c970931d5eab6948fad31187b (patch) | |
| tree | c192056d3f4a5bb529d9e692658ed4e43026b5ec /app | |
| parent | 8206cae781f4b69fc165638d8cc964d92df70740 (diff) | |
| parent | ed1fea06fb72161dd183e7708f6aba58dfcf7d52 (diff) | |
Merge branch 'winh-protection-push-dropdowns-backport' into 'master'
Limit dropdown toggle width for protected branches / tags
See merge request gitlab-org/gitlab-ce!18212
Diffstat (limited to 'app')
3 files changed, 2 insertions, 7 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 790e91e4431..d7d343b088a 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -935,11 +935,6 @@ pre.light-well { } } - .dropdown-menu-toggle { - width: 100%; - max-width: 300px; - } - .flash-container { padding: 0; } diff --git a/app/views/projects/protected_branches/shared/_branches_list.html.haml b/app/views/projects/protected_branches/shared/_branches_list.html.haml index a09c13176c3..300055a4207 100644 --- a/app/views/projects/protected_branches/shared/_branches_list.html.haml +++ b/app/views/projects/protected_branches/shared/_branches_list.html.haml @@ -1,4 +1,4 @@ -.panel.panel-default.protected-branches-list.js-protected-branches-list +.protected-branches-list.js-protected-branches-list - if @protected_branches.empty? .panel-heading %h3.panel-title diff --git a/app/views/projects/protected_tags/shared/_tags_list.html.haml b/app/views/projects/protected_tags/shared/_tags_list.html.haml index 02908e16dc5..3ed82e51dbe 100644 --- a/app/views/projects/protected_tags/shared/_tags_list.html.haml +++ b/app/views/projects/protected_tags/shared/_tags_list.html.haml @@ -1,4 +1,4 @@ -.panel.panel-default.protected-tags-list.js-protected-tags-list +.protected-tags-list.js-protected-tags-list - if @protected_tags.empty? .panel-heading %h3.panel-title |