Merge branch 'repo-editor-ui-fix' into 'master'
Repo editor UI fixes part 2 Closes #37830, #36247, #37829, and #36244 See merge request gitlab-org/gitlab-ce!14261
This commit is contained in:
commit
8cb06b0b5f
|
@ -56,7 +56,6 @@
|
|||
|
||||
.tree-content-holder {
|
||||
display: flex;
|
||||
max-height: 100vh;
|
||||
min-height: 300px;
|
||||
}
|
||||
|
||||
|
@ -156,7 +155,7 @@
|
|||
list-style-type: none;
|
||||
background: $gray-normal;
|
||||
display: inline-block;
|
||||
padding: 10px 18px;
|
||||
padding: #{$gl-padding / 2} $gl-padding;
|
||||
border-right: 1px solid $white-dark;
|
||||
border-bottom: 1px solid $white-dark;
|
||||
white-space: nowrap;
|
||||
|
@ -180,10 +179,9 @@
|
|||
a {
|
||||
@include str-truncated(100px);
|
||||
color: $black;
|
||||
width: 100px;
|
||||
text-align: center;
|
||||
vertical-align: middle;
|
||||
text-decoration: none;
|
||||
margin-right: 12px;
|
||||
|
||||
&.close {
|
||||
width: auto;
|
||||
|
@ -193,6 +191,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.close-icon:hover {
|
||||
color: $hint-color;
|
||||
}
|
||||
|
||||
.close-icon,
|
||||
.unsaved-icon {
|
||||
float: right;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
- dropdown_toggle_text = @ref || @project.default_branch
|
||||
= form_tag nil, method: :get, style: { display: 'none' }, class: "project-refs-target-form" do
|
||||
= form_tag nil, method: :get, class: "project-refs-form project-refs-target-form" do
|
||||
= hidden_field_tag :destination, destination
|
||||
- if defined?(path)
|
||||
= hidden_field_tag :path, path
|
||||
|
@ -7,14 +7,10 @@
|
|||
= hidden_field_tag key, value, id: nil
|
||||
.dropdown
|
||||
= dropdown_toggle dropdown_toggle_text, { toggle: "dropdown", selected: dropdown_toggle_text, ref: @ref, refs_url: refs_project_path(@project, find: ['branches']), field_name: 'ref', input_field_name: 'new-branch', submit_form_on_click: true, visit: false }, { toggle_class: "js-project-refs-dropdown" }
|
||||
%ul.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
|
||||
%li
|
||||
.dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
|
||||
= dropdown_title _("Create a new branch")
|
||||
%li
|
||||
= dropdown_input _("Create a new branch")
|
||||
%li
|
||||
= dropdown_title _("Select existing branch"), options: {close: false}
|
||||
%li
|
||||
= dropdown_filter _("Search branches and tags")
|
||||
= dropdown_content
|
||||
= dropdown_loading
|
||||
|
|
Loading…
Reference in New Issue