提交 8cb06b0b 编写于 作者: J Jacob Schatz

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
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
.tree-content-holder { .tree-content-holder {
display: flex; display: flex;
max-height: 100vh;
min-height: 300px; min-height: 300px;
} }
...@@ -156,7 +155,7 @@ ...@@ -156,7 +155,7 @@
list-style-type: none; list-style-type: none;
background: $gray-normal; background: $gray-normal;
display: inline-block; display: inline-block;
padding: 10px 18px; padding: #{$gl-padding / 2} $gl-padding;
border-right: 1px solid $white-dark; border-right: 1px solid $white-dark;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
white-space: nowrap; white-space: nowrap;
...@@ -180,10 +179,9 @@ ...@@ -180,10 +179,9 @@
a { a {
@include str-truncated(100px); @include str-truncated(100px);
color: $black; color: $black;
width: 100px;
text-align: center;
vertical-align: middle; vertical-align: middle;
text-decoration: none; text-decoration: none;
margin-right: 12px;
&.close { &.close {
width: auto; width: auto;
...@@ -193,6 +191,10 @@ ...@@ -193,6 +191,10 @@
} }
} }
.close-icon:hover {
color: $hint-color;
}
.close-icon, .close-icon,
.unsaved-icon { .unsaved-icon {
float: right; float: right;
......
- dropdown_toggle_text = @ref || @project.default_branch - 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 = hidden_field_tag :destination, destination
- if defined?(path) - if defined?(path)
= hidden_field_tag :path, path = hidden_field_tag :path, path
...@@ -7,14 +7,10 @@ ...@@ -7,14 +7,10 @@
= hidden_field_tag key, value, id: nil = hidden_field_tag key, value, id: nil
.dropdown .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" } = 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]) } .dropdown-menu.dropdown-menu-selectable.git-revision-dropdown{ class: ("dropdown-menu-align-right" if local_assigns[:align_right]) }
%li
= dropdown_title _("Create a new branch") = dropdown_title _("Create a new branch")
%li
= dropdown_input _("Create a new branch") = dropdown_input _("Create a new branch")
%li
= dropdown_title _("Select existing branch"), options: {close: false} = dropdown_title _("Select existing branch"), options: {close: false}
%li
= dropdown_filter _("Search branches and tags") = dropdown_filter _("Search branches and tags")
= dropdown_content = dropdown_content
= dropdown_loading = dropdown_loading
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册