BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5db587a1
Commit
5db587a1
authored
Jan 06, 2017
by
Filipa Lacerda
Committed by
Annabel Dunstone Gray
Jan 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Responsive title in diffs inline, side by side, with and without sidebar
Adds MR ID to CHANGELOG entry
parent
1c81452a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
79 additions
and
3 deletions
+79
-3
diff.scss
app/assets/stylesheets/pages/diff.scss
+72
-0
_file_header.html.haml
app/views/projects/diffs/_file_header.html.haml
+3
-3
25709-diff-file-overflow.yml
changelogs/unreleased/25709-diff-file-overflow.yml
+4
-0
No files found.
app/assets/stylesheets/pages/diff.scss
View file @
5db587a1
...
...
@@ -44,6 +44,15 @@
.diff-toggle-caret
{
padding-right
:
6px
;
}
.file-title-name
{
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
inline-block
;
vertical-align
:
bottom
;
max-width
:
450px
;
}
}
.diff-content
{
...
...
@@ -480,3 +489,66 @@
}
}
}
/**
* Diff file title
*/
.file-holder
[
data-view
=
"parallel"
]
.file-title-name
,
.file-holder
[
data-view
=
"inline"
]
.file-title-name
{
@media
(
max-width
:
$screen-xs
)
{
max-width
:
140px
;
}
@media
(
min-width
:
$screen-xs
)
and
(
max-width
:
$screen-xs-max
)
{
max-width
:
250px
;
}
@media
(
min-width
:
$screen-sm
)
and
(
max-width
:
$screen-sm-max
)
{
max-width
:
250px
;
}
@media
(
min-width
:
$screen-md
)
and
(
max-width
:
$screen-md-max
)
{
max-width
:
480px
;
}
}
.file-holder
[
data-view
=
"parallel"
]
.file-title-name
{
@media
(
min-width
:
$screen-lg
)
{
max-width
:
760px
;
}
}
.file-holder
[
data-view
=
"inline"
]
.file-title-name
{
@media
(
min-width
:
$screen-lg
)
{
max-width
:
530px
;
}
}
.right-sidebar-expanded
{
.file-holder
[
data-view
=
"parallel"
]
.file-title-name
,
.file-holder
[
data-view
=
"inline"
]
.file-title-name
{
@media
(
min-width
:
$screen-sm
)
and
(
max-width
:
$screen-sm-max
)
{
max-width
:
250px
;
}
@media
(
min-width
:
$screen-md
)
and
(
max-width
:
$screen-md-max
)
{
max-width
:
250px
;
}
@media
(
min-width
:
$screen-lg
)
{
max-width
:
460px
;
}
}
.file-holder
[
data-view
=
"parallel"
]
.file-title-name
{
@media
(
min-width
:
$screen-xs
)
and
(
max-width
:
$screen-xs-max
)
{
max-width
:
180px
;
}
}
.file-holder
[
data-view
=
"inline"
]
.file-title-name
{
@media
(
min-width
:
$screen-xs
)
and
(
max-width
:
$screen-xs-max
)
{
max-width
:
100px
;
}
}
}
app/views/projects/diffs/_file_header.html.haml
View file @
5db587a1
...
...
@@ -10,13 +10,13 @@
-
if
diff_file
.
renamed_file
-
old_path
,
new_path
=
mark_inline_diffs
(
diff_file
.
old_path
,
diff_file
.
new_path
)
%strong
%strong
.file-title-name
=
old_path
→
%strong
%strong
.file-title-name
=
new_path
-
else
%strong
%strong
.file-title-name
=
diff_file
.
new_path
-
if
diff_file
.
deleted_file
deleted
...
...
changelogs/unreleased/25709-diff-file-overflow.yml
0 → 100644
View file @
5db587a1
---
title
:
Responsive title in diffs inline, side by side, with and without sidebar
merge_request
:
8475
author
:
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