diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-01-18 18:56:45 +0100 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-19 14:44:06 -0600 |
commit | 2bb2544ecaf37a02e4055194e90405dc1ffca094 (patch) | |
tree | 4f7992d8959b5ac34b40fdea286ec5adda8d2fce /app/assets/stylesheets/pages/diff.scss | |
parent | 28b4407bded6dd526bfafa5e498b4ac109fec7f7 (diff) | |
download | gitlab-ce-2bb2544ecaf37a02e4055194e90405dc1ffca094.tar.gz |
Use flexbox instead of media queries
Move CSS to correct file
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index d614fa45ad3..8b784c2a439 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -48,15 +48,6 @@ .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 { @@ -493,66 +484,3 @@ } } } - -/** - * 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; - } - } -} |