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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
6b5c3f09
Commit
6b5c3f09
authored
May 26, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved mobile styling
parent
2830b46c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
14 deletions
+37
-14
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+20
-0
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+17
-14
No files found.
app/assets/stylesheets/pages/commit.scss
View file @
6b5c3f09
...
@@ -26,8 +26,28 @@
...
@@ -26,8 +26,28 @@
.commit-info-row
{
.commit-info-row
{
margin-bottom
:
10px
;
margin-bottom
:
10px
;
&
.commit-info-row-header
{
line-height
:
34px
;
@media
(
min-width
:
$screen-sm-min
)
{
margin-bottom
:
0
;
}
.commit-options-dropdown-caret
{
@media
(
max-width
:
$screen-sm
)
{
margin-left
:
0
;
}
}
}
.avatar
{
.avatar
{
@extend
.avatar-inline
;
@extend
.avatar-inline
;
margin-left
:
0
;
@media
(
min-width
:
$screen-sm-min
)
{
margin-left
:
4px
;
}
}
}
.commit-committer-link
,
.commit-committer-link
,
.commit-author-link
{
.commit-author-link
{
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
6b5c3f09
.pull-right.commit-action-buttons
.commit-info-row.commit-info-row-header
%div
%span
.hidden-xs
Authored by
%strong
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
.pull-right.commit-action-buttons
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
%span
.btn.disabled.btn-grouped
%span
.btn.disabled.btn-grouped
.hidden-xs
=
icon
(
'comment'
)
=
icon
(
'comment'
)
=
@notes_count
=
@notes_count
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-grouped"
do
=
link_to
namespace_project_tree_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"btn btn-grouped
hidden-xs hidden-sm
"
do
Browse Files
Browse Files
.dropdown.inline
.dropdown.inline
%a
.btn.btn-default.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
%a
.btn.btn-default.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
Options
%span
.hidden-xs
Options
%span
.caret
%span
.caret
.commit-options-dropdown-caret
%ul
.dropdown-menu.dropdown-menu-align-right
%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
)
-
unless
@commit
.
has_been_reverted?
(
current_user
)
%li
.clearfix
%li
.clearfix
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
=
revert_commit_link
(
@commit
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
.
id
),
has_tooltip:
false
)
...
@@ -23,12 +31,6 @@
...
@@ -23,12 +31,6 @@
%li
=
link_to
"Email Patches"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :patch
)
%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
)
%li
=
link_to
"Plain Diff"
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
,
format: :diff
)
.commit-info-row
%span
.light
Authored by
%strong
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
-
if
@commit
.
different_committer?
-
if
@commit
.
different_committer?
.commit-info-row
.commit-info-row
%span
.light
Committed by
%span
.light
Committed by
...
@@ -37,8 +39,9 @@
...
@@ -37,8 +39,9 @@
#{
time_ago_with_tooltip
(
@commit
.
committed_date
)
}
#{
time_ago_with_tooltip
(
@commit
.
committed_date
)
}
.commit-info-row
.commit-info-row
%span
.light
Commit
%span
.hidden-xs.hidden-sm
Commit
=
link_to
@commit
.
id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace"
=
link_to
@commit
.
id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace hidden-xs hidden-sm"
=
link_to
@commit
.
short_id
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@commit
),
class:
"monospace visible-xs-inline visible-sm-inline"
=
clipboard_button
(
clipboard_text:
@commit
.
id
)
=
clipboard_button
(
clipboard_text:
@commit
.
id
)
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
%span
.cgray
=
pluralize
(
@commit
.
parents
.
count
,
"parent"
)
-
@commit
.
parents
.
each
do
|
parent
|
-
@commit
.
parents
.
each
do
|
parent
|
...
...
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