Skip to content
Snippets Groups Projects
Commit 5db587a1 authored by Filipa Lacerda's avatar Filipa Lacerda Committed by Annabel Dunstone Gray
Browse files

Responsive title in diffs inline, side by side, with and without sidebar

Adds MR ID to CHANGELOG entry
parent 1c81452a
No related branches found
No related tags found
No related merge requests found
Loading
@@ -44,6 +44,15 @@
Loading
@@ -44,6 +44,15 @@
.diff-toggle-caret { .diff-toggle-caret {
padding-right: 6px; 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 { .diff-content {
Loading
@@ -480,3 +489,66 @@
Loading
@@ -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;
}
}
}
Loading
@@ -10,13 +10,13 @@
Loading
@@ -10,13 +10,13 @@
   
- if diff_file.renamed_file - if diff_file.renamed_file
- old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path) - old_path, new_path = mark_inline_diffs(diff_file.old_path, diff_file.new_path)
%strong %strong.file-title-name
= old_path = old_path
→ →
%strong %strong.file-title-name
= new_path = new_path
- else - else
%strong %strong.file-title-name
= diff_file.new_path = diff_file.new_path
- if diff_file.deleted_file - if diff_file.deleted_file
deleted deleted
Loading
Loading
---
title: Responsive title in diffs inline, side by side, with and without sidebar
merge_request: 8475
author:
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment