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
6d6fb561
Commit
6d6fb561
authored
Nov 01, 2016
by
Dimitrie Hoekstra
Committed by
Annabel Dunstone Gray
Nov 04, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added various changes to commit title area
parent
e4c05de7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
83 additions
and
46 deletions
+83
-46
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+36
-0
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+47
-46
No files found.
app/assets/stylesheets/pages/commit.scss
View file @
6d6fb561
...
@@ -36,6 +36,42 @@
...
@@ -36,6 +36,42 @@
padding
:
10px
0
;
padding
:
10px
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
.commitable-meta
{
display
:
inline-block
;
line-height
:
18px
;
}
.commit-hash-full
{
@media
(
max-width
:
$screen-md-min
)
{
width
:
80px
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
inline-block
;
vertical-align
:
bottom
;
}
}
.commitable-actions
{
@media
(
min-width
:
$screen-sm
)
{
float
:
right
;
padding-top
:
0
;
}
.dropdown
{
@media
(
max-width
:
$screen-sm
)
{
width
:
100%
;
margin-top
:
10px
;
}
}
.dropdown-toggle
{
@media
(
max-width
:
$screen-sm
)
{
width
:
100%
;
}
}
}
.commit-options-dropdown-caret
{
.commit-options-dropdown-caret
{
@media
(
max-width
:
$screen-sm
)
{
@media
(
max-width
:
$screen-sm
)
{
margin-left
:
0
;
margin-left
:
0
;
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
6d6fb561
.commit-info-row.commit-info-row-header
.commit-info-row.commit-info-row-header
%span
.hidden-xs.hidden-sm
Commit
.commitable-meta
=
link_to
@commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace js-details-short"
%strong
Commit
=
link_to
(
"#"
,
class:
"js-details-expand hidden-xs hidden-sm"
)
do
%strong
.monospace.js-details-short
=
@commit
.
short_id
%span
.text-expander
=
link_to
(
"#"
,
class:
"js-details-expand hidden-xs hidden-sm"
)
do
\...
%span
.text-expander
%span
.js-details-content.hide
\...
=
link_to
@commit
.
id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace hidden-xs hidden-sm"
%span
.js-details-content.hide
=
clipboard_button
(
clipboard_text:
@commit
.
id
)
%strong
.monospace.commit-hash-full
=
@commit
.
id
%span
.hidden-xs
authored
=
clipboard_button
(
clipboard_text:
@commit
.
id
)
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
%span
.hidden-xs
authored
%span
by
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
=
author_avatar
(
@commit
,
size:
24
)
%span
by
%strong
=
author_avatar
(
@commit
,
size:
24
)
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
-
if
@commit
.
different_committer?
%span
.light
Committed by
%strong
%strong
=
commit_committer_link
(
@commit
,
avatar:
true
,
size:
24
)
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
#{
time_ago_with_tooltip
(
@commit
.
committed_date
)
}
-
if
@commit
.
different_committer?
%span
.light
Committed by
.pull-right.commit-action-buttons
%strong
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
=
commit_committer_link
(
@commit
,
avatar:
true
,
size:
24
)
%span
.btn.disabled.btn-grouped.hidden-xs.append-right-10
#{
time_ago_with_tooltip
(
@commit
.
committed_date
)
}
=
icon
(
'comment'
)
.commitable-actions
=
@notes_count
.commit-action-buttons
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-default append-right-10 hidden-xs hidden-sm"
do
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
Browse Files
%span
.btn.disabled.btn-grouped.hidden-xs.append-right-10
.dropdown.inline
=
icon
(
'comment'
)
%a
.btn.btn-default.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
=
@notes_count
%span
.hidden-xs
Options
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-default append-right-10 hidden-xs hidden-sm"
do
=
icon
(
'caret-down'
,
class:
".commit-options-dropdown-caret"
)
Browse Files
%ul
.dropdown-menu.dropdown-menu-align-right
.dropdown.inline
%li
.visible-xs-block.visible-sm-block
%a
.btn.btn-default.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
)
do
%span
Options
Browse Files
=
icon
(
'caret-down'
,
class:
".commit-options-dropdown-caret"
)
-
unless
@commit
.
has_been_reverted?
(
current_user
)
%ul
.dropdown-menu.dropdown-menu-align-right
%li
.visible-xs-block.visible-sm-block
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
)
do
Browse Files
-
unless
@commit
.
has_been_reverted?
(
current_user
)
%li
.clearfix
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
%li
.clearfix
=
cherry_pick_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
%li
.clearfix
%li
.clearfix
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
=
link_to
"Tag"
,
new_namespace_project_tag_path
(
@project
.
namespace
,
@project
,
ref:
@commit
)
%li
.clearfix
%li
.divider
=
cherry_pick_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
%li
.dropdown-header
%li
.clearfix
Download
=
link_to
"Tag"
,
new_namespace_project_tag_path
(
@project
.
namespace
,
@project
,
ref:
@commit
)
-
unless
@commit
.
parents
.
length
>
1
%li
.divider
%li
=
link_to
"Email Patches"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :patch
)
%li
.dropdown-header
%li
=
link_to
"Plain Diff"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :diff
)
Download
-
unless
@commit
.
parents
.
length
>
1
%li
=
link_to
"Email Patches"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :patch
)
%li
=
link_to
"Plain Diff"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :diff
)
.commit-box
.commit-box
%h3
.commit-title
%h3
.commit-title
...
...
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