Merge branch 'jivl-fix-dropdown-going-out-of-screen' into 'master'
Fix dropdown from the project welcome page moving out of the screen Closes #47966 See merge request gitlab-org/gitlab-ce!19903
This commit is contained in:
commit
557dd8d9f0
8 changed files with 10 additions and 10 deletions
|
@ -1,6 +1,6 @@
|
|||
- if current_user
|
||||
.dropdown
|
||||
%button.dropdown-toggle{ href: '#', "data-toggle" => "dropdown" }
|
||||
%button.dropdown-toggle{ href: '#', "data-toggle" => "dropdown", 'data-display' => 'static' }
|
||||
= icon('globe')
|
||||
%span.light Visibility:
|
||||
- if params[:visibility_level].present?
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
- if can_create_subgroups
|
||||
.btn-group.new-project-subgroup.droplab-dropdown.js-new-project-subgroup{ data: { project_path: new_project_path(namespace_id: @group.id), subgroup_path: new_group_path(parent_id: @group.id) } }
|
||||
%input.btn.btn-success.dropdown-primary.js-new-group-child{ type: "button", value: new_project_label, data: { action: "new-project" } }
|
||||
%button.btn.btn-success.dropdown-toggle.js-dropdown-toggle{ type: "button", data: { "dropdown-trigger" => "#new-project-or-subgroup-dropdown" } }
|
||||
%button.btn.btn-success.dropdown-toggle.js-dropdown-toggle{ type: "button", data: { "dropdown-trigger" => "#new-project-or-subgroup-dropdown", 'display' => 'static' } }
|
||||
= icon("caret-down", class: "dropdown-btn-icon")
|
||||
%ul#new-project-or-subgroup-dropdown.dropdown-menu.dropdown-menu-right{ data: { dropdown: true } }
|
||||
%li.droplab-item-selected{ role: "button", data: { value: "new-project", text: new_project_label } }
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
%li.header-new.dropdown
|
||||
= link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body' } do
|
||||
= link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", title: "New...", ref: 'tooltip', aria: { label: "New..." }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do
|
||||
= sprite_icon('plus-square', size: 16)
|
||||
= sprite_icon('angle-down', css_class: 'caret-down')
|
||||
.dropdown-menu.dropdown-menu-right
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
- if !project.empty_repo? && can?(current_user, :download_code, project)
|
||||
- archive_prefix = "#{project.path}-#{ref.tr('/', '-')}"
|
||||
.project-action-button.dropdown.inline>
|
||||
%button.btn.has-tooltip{ title: s_('DownloadSource|Download'), 'data-toggle' => 'dropdown', 'aria-label' => s_('DownloadSource|Download') }
|
||||
%button.btn.has-tooltip{ title: s_('DownloadSource|Download'), 'data-toggle' => 'dropdown', 'aria-label' => s_('DownloadSource|Download'), 'data-display' => 'static' }
|
||||
= sprite_icon('download')
|
||||
= icon("caret-down")
|
||||
%span.sr-only= _('Select Archive Format')
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
- if show_menu
|
||||
.project-action-button.dropdown.inline
|
||||
%a.btn.dropdown-toggle.has-tooltip{ href: '#', title: _('Create new...'), 'data-toggle' => 'dropdown', 'data-container' => 'body', 'aria-label' => _('Create new...') }
|
||||
%a.btn.dropdown-toggle.has-tooltip{ href: '#', title: _('Create new...'), 'data-toggle' => 'dropdown', 'data-container' => 'body', 'aria-label' => _('Create new...'), 'data-display' => 'static' }
|
||||
= icon('plus')
|
||||
= icon("caret-down")
|
||||
%ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
%button.btn.js-create-merge-request.btn-success.btn-inverted{ type: 'button', data: { action: data_action } }
|
||||
= value
|
||||
|
||||
%button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' } } }
|
||||
%button.btn.create-merge-request-dropdown-toggle.dropdown-toggle.btn-success.btn-inverted.js-dropdown-toggle{ type: 'button', data: { dropdown: { trigger: '#create-merge-request-dropdown' }, display: 'static' } }
|
||||
= icon('caret-down')
|
||||
|
||||
.droplab-dropdown
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
.mr-version-menus-container.content-block
|
||||
Changes between
|
||||
%span.dropdown.inline.mr-version-dropdown
|
||||
%a.dropdown-toggle.btn.btn-default{ data: {toggle: :dropdown} }
|
||||
%a.dropdown-toggle.btn.btn-default{ data: { toggle: :dropdown, display: 'static' } }
|
||||
%span
|
||||
- if @merge_request_diff.latest?
|
||||
latest version
|
||||
|
@ -36,7 +36,7 @@
|
|||
- if @merge_request_diff.base_commit_sha
|
||||
and
|
||||
%span.dropdown.inline.mr-version-compare-dropdown
|
||||
%a.btn.btn-default.dropdown-toggle{ data: {toggle: :dropdown} }
|
||||
%a.btn.btn-default.dropdown-toggle{ data: { toggle: :dropdown, display: 'static' } }
|
||||
- if @start_version
|
||||
version #{version_index(@start_version)}
|
||||
- else
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
.js-notification-toggle-btns
|
||||
%div{ class: ("btn-group" if notification_setting.custom?) }
|
||||
- if notification_setting.custom?
|
||||
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting) } }
|
||||
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
|
||||
= icon("bell", class: "js-notification-loading")
|
||||
= notification_title(notification_setting.level)
|
||||
%button.btn.dropdown-toggle{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
|
||||
= icon('caret-down')
|
||||
.sr-only Toggle dropdown
|
||||
- else
|
||||
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting) } }
|
||||
%button.dropdown-new.btn.btn-default.has-tooltip.notifications-btn#notifications-button{ type: "button", title: "Notification setting", "aria-label" => "Notification setting: #{notification_title(notification_setting.level)}", data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), display: 'static' } }
|
||||
= icon("bell", class: "js-notification-loading")
|
||||
= notification_title(notification_setting.level)
|
||||
= icon("caret-down")
|
||||
|
|
Loading…
Reference in a new issue