Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
2a24d12b
Commit
2a24d12b
authored
Jun 15, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix dropdown from project welcome page moving out of the screen
parent
953608ac
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
10 additions
and
10 deletions
+10
-10
app/views/explore/projects/_filter.html.haml
app/views/explore/projects/_filter.html.haml
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/layouts/header/_new_dropdown.haml
app/views/layouts/header/_new_dropdown.haml
+1
-1
app/views/projects/buttons/_download.html.haml
app/views/projects/buttons/_download.html.haml
+1
-1
app/views/projects/buttons/_dropdown.html.haml
app/views/projects/buttons/_dropdown.html.haml
+1
-1
app/views/projects/issues/_new_branch.html.haml
app/views/projects/issues/_new_branch.html.haml
+1
-1
app/views/projects/merge_requests/diffs/_version_controls.html.haml
...projects/merge_requests/diffs/_version_controls.html.haml
+2
-2
app/views/shared/notifications/_button.html.haml
app/views/shared/notifications/_button.html.haml
+2
-2
No files found.
app/views/explore/projects/_filter.html.haml
View file @
2a24d12b
-
if
current_user
-
if
current_user
.dropdown
.dropdown
%button
.dropdown-toggle
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
}
%button
.dropdown-toggle
{
href:
'#'
,
"data-toggle"
=>
"dropdown"
,
'data-display'
=>
'static'
}
=
icon
(
'globe'
)
=
icon
(
'globe'
)
%span
.light
Visibility:
%span
.light
Visibility:
-
if
params
[
:visibility_level
].
present?
-
if
params
[
:visibility_level
].
present?
...
...
app/views/groups/show.html.haml
View file @
2a24d12b
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
-
if
can_create_subgroups
-
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
)
}
}
.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"
}
}
%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"
)
=
icon
(
"caret-down"
,
class:
"dropdown-btn-icon"
)
%ul
#new-project-or-subgroup-dropdown
.dropdown-menu.dropdown-menu-right
{
data:
{
dropdown:
true
}
}
%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
}
}
%li
.droplab-item-selected
{
role:
"button"
,
data:
{
value:
"new-project"
,
text:
new_project_label
}
}
...
...
app/views/layouts/header/_new_dropdown.haml
View file @
2a24d12b
%li
.header-new.dropdown
%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
(
'plus-square'
,
size:
16
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
.dropdown-menu.dropdown-menu-right
.dropdown-menu.dropdown-menu-right
...
...
app/views/projects/buttons/_download.html.haml
View file @
2a24d12b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
!
project
.
empty_repo?
&&
can?
(
current_user
,
:download_code
,
project
)
-
if
!
project
.
empty_repo?
&&
can?
(
current_user
,
:download_code
,
project
)
-
archive_prefix
=
"
#{
project
.
path
}
-
#{
ref
.
tr
(
'/'
,
'-'
)
}
"
-
archive_prefix
=
"
#{
project
.
path
}
-
#{
ref
.
tr
(
'/'
,
'-'
)
}
"
.project-action-button.dropdown.inline
>
.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'
)
=
sprite_icon
(
'download'
)
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
%span
.sr-only
=
_
(
'Select Archive Format'
)
...
...
app/views/projects/buttons/_dropdown.html.haml
View file @
2a24d12b
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
-
if
show_menu
-
if
show_menu
.project-action-button.dropdown.inline
.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
(
'plus'
)
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
%ul
.dropdown-menu.dropdown-menu-right.project-home-dropdown
%ul
.dropdown-menu.dropdown-menu-right.project-home-dropdown
...
...
app/views/projects/issues/_new_branch.html.haml
View file @
2a24d12b
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%button
.btn.js-create-merge-request.btn-success.btn-inverted
{
type:
'button'
,
data:
{
action:
data_action
}
}
%button
.btn.js-create-merge-request.btn-success.btn-inverted
{
type:
'button'
,
data:
{
action:
data_action
}
}
=
value
=
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'
)
=
icon
(
'caret-down'
)
.droplab-dropdown
.droplab-dropdown
...
...
app/views/projects/merge_requests/diffs/_version_controls.html.haml
View file @
2a24d12b
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.mr-version-menus-container.content-block
.mr-version-menus-container.content-block
Changes between
Changes between
%span
.dropdown.inline.mr-version-dropdown
%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
%span
-
if
@merge_request_diff
.
latest?
-
if
@merge_request_diff
.
latest?
latest version
latest version
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
-
if
@merge_request_diff
.
base_commit_sha
-
if
@merge_request_diff
.
base_commit_sha
and
and
%span
.dropdown.inline.mr-version-compare-dropdown
%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
-
if
@start_version
version
#{
version_index
(
@start_version
)
}
version
#{
version_index
(
@start_version
)
}
-
else
-
else
...
...
app/views/shared/notifications/_button.html.haml
View file @
2a24d12b
...
@@ -6,14 +6,14 @@
...
@@ -6,14 +6,14 @@
.js-notification-toggle-btns
.js-notification-toggle-btns
%div
{
class:
(
"btn-group"
if
notification_setting
.
custom?
)
}
%div
{
class:
(
"btn-group"
if
notification_setting
.
custom?
)
}
-
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"
)
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
)
}
}
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
)
}
}
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.sr-only
Toggle dropdown
.sr-only
Toggle dropdown
-
else
-
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"
)
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
=
icon
(
"caret-down"
)
=
icon
(
"caret-down"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment