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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
35ae84a4
Commit
35ae84a4
authored
Apr 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Skip ci] replace .hidden-lg
parent
b32c2adb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
12 deletions
+12
-12
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+3
-3
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+1
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+4
-4
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+3
-3
No files found.
app/helpers/issuables_helper.rb
View file @
35ae84a4
...
@@ -132,14 +132,14 @@ module IssuablesHelper
...
@@ -132,14 +132,14 @@ module IssuablesHelper
output
<<
"Opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
"Opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
content_tag
(
:strong
)
do
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
,
tooltip:
true
)
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
,
tooltip:
true
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"
hidden-sm hidden-md hidden-lg
"
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"
d-block d-sm-none
"
)
end
end
output
<<
" "
.
html_safe
output
<<
" "
.
html_safe
output
<<
content_tag
(
:span
,
(
issuable_first_contribution_icon
if
issuable
.
first_contribution?
),
class:
'has-tooltip'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
issuable_first_contribution_icon
if
issuable
.
first_contribution?
),
class:
'has-tooltip'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"
hidden-xs hidden-sm
"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"
d-none d-sm-none d-md-block
"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"
hidden-md hidden-lg
"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"
d-md-none d-lg-none d-xl-block
"
)
output
.
html_safe
output
.
html_safe
end
end
...
...
app/views/layouts/header/_default.html.haml
View file @
35ae84a4
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
%div
%div
=
link_to
"Sign in / Register"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in'
=
link_to
"Sign in / Register"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in'
%button
.navbar-toggle.
hidden-sm.hidden-md.hidden-lg
{
type:
'button'
}
%button
.navbar-toggle.
d-block.d-sm-none
{
type:
'button'
}
%span
.sr-only
Toggle navigation
%span
.sr-only
Toggle navigation
=
sprite_icon
(
'more'
,
size:
12
,
css_class:
'more-icon js-navbar-toggle-right'
)
=
sprite_icon
(
'more'
,
size:
12
,
css_class:
'more-icon js-navbar-toggle-right'
)
=
sprite_icon
(
'close'
,
size:
12
,
css_class:
'close-icon js-navbar-toggle-left'
)
=
sprite_icon
(
'close'
,
size:
12
,
css_class:
'close-icon js-navbar-toggle-left'
)
app/views/layouts/nav/_dashboard.html.haml
View file @
35ae84a4
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
Snippets
Snippets
-
if
any_dashboard_nav_link?
([
:groups
,
:milestones
,
:activity
,
:snippets
])
-
if
any_dashboard_nav_link?
([
:groups
,
:milestones
,
:activity
,
:snippets
])
%li
.header-more.dropdown.
hidden-lg
%li
.header-more.dropdown.
d-lg-none.d-xl-none
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
}
}
%a
{
href:
"#"
,
data:
{
toggle:
"dropdown"
}
}
More
More
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
=
sprite_icon
(
'angle-down'
,
css_class:
'caret-down'
)
...
...
app/views/projects/issues/show.html.haml
View file @
35ae84a4
...
@@ -11,11 +11,11 @@
...
@@ -11,11 +11,11 @@
.detail-page-header
.detail-page-header
.detail-page-header-body
.detail-page-header-body
.issuable-status-box.status-box.status-box-issue-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
.issuable-status-box.status-box.status-box-issue-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
=
sprite_icon
(
'mobile-issue-close'
,
size:
16
,
css_class:
'
hidden-sm hidden-md hidden-lg
'
)
=
sprite_icon
(
'mobile-issue-close'
,
size:
16
,
css_class:
'
d-block d-sm-none
'
)
%span
.hidden-xs
%span
.hidden-xs
Closed
Closed
.issuable-status-box.status-box.status-box-open
{
class:
issue_button_visibility
(
@issue
,
true
)
}
.issuable-status-box.status-box.status-box-open
{
class:
issue_button_visibility
(
@issue
,
true
)
}
=
sprite_icon
(
'issue-open-m'
,
size:
16
,
css_class:
'
hidden-sm hidden-md hidden-lg
'
)
=
sprite_icon
(
'issue-open-m'
,
size:
16
,
css_class:
'
d-block d-sm-none
'
)
%span
.hidden-xs
Open
%span
.hidden-xs
Open
.issuable-meta
.issuable-meta
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
.detail-page-header-actions.js-issuable-actions
.detail-page-header-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-secondary.float-left.
hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-secondary.float-left.
d-md-none.d-lg-none.d-xl-none
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Options
Options
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.dropdown-menu.dropdown-menu-align-right.
hidden-lg
.dropdown-menu.dropdown-menu-align-right.
d-lg-none.d-xl-none
%ul
%ul
-
unless
current_user
==
@issue
.
author
-
unless
current_user
==
@issue
.
author
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
%li
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
@issue
.
author
.
id
,
ref_url:
issue_url
(
@issue
))
...
...
app/views/projects/merge_requests/_mr_title.html.haml
View file @
35ae84a4
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.detail-page-header
.detail-page-header
.detail-page-header-body
.detail-page-header-body
.issuable-status-box.status-box
{
class:
status_box_class
(
@merge_request
)
}
.issuable-status-box.status-box
{
class:
status_box_class
(
@merge_request
)
}
=
sprite_icon
(
@merge_request
.
state_icon_name
,
size:
16
,
css_class:
'
hidden-sm hidden-md hidden-lg
'
)
=
sprite_icon
(
@merge_request
.
state_icon_name
,
size:
16
,
css_class:
'
d-block d-sm-none
'
)
%span
.hidden-xs
%span
.hidden-xs
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
.detail-page-header-actions.js-issuable-actions
.detail-page-header-actions.js-issuable-actions
.clearfix.issue-btn-group.dropdown
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-secondary.float-left.
hidden-md.hidden-lg
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
%button
.btn.btn-secondary.float-left.
d-md-none.d-lg-none.d-xl-none
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Options
Options
=
icon
(
'caret-down'
)
=
icon
(
'caret-down'
)
.dropdown-menu.dropdown-menu-align-right.
hidden-lg
.dropdown-menu.dropdown-menu-align-right.
d-lg-none.d-xl-none
%ul
%ul
-
if
can_update_merge_request
-
if
can_update_merge_request
%li
=
link_to
'Edit'
,
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
%li
=
link_to
'Edit'
,
edit_namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
)
...
...
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