diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-20 19:55:21 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-20 19:55:21 +0000 |
commit | a91ff32b7699039c94ec095ddd658a9edcf38cd4 (patch) | |
tree | f9d3961dc81c5e2e4d381c627121fa19779cfbdc /app/assets | |
parent | ff75bd0409f79c8b75cf49a219cfe3257526042d (diff) | |
parent | 1446a03e79e7ecdf09e73854062f9ca6349aad9f (diff) | |
download | gitlab-ce-a91ff32b7699039c94ec095ddd658a9edcf38cd4.tar.gz |
Merge branch '25709-diff-file-overflow' into 'master'
Responsive title in diffs inline, side by side, with and without sidebar
Closes #25709
See merge request !8475
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 34 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
2 files changed, 38 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index c51912b4ac4..db1c8da06d0 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -231,3 +231,37 @@ span.idiff { } } } + + +.file-title-flex-parent { + display: flex; + align-items: center; + background-color: $gray-light; + border-bottom: 1px solid $border-color; + padding: 10px $gl-padding; + margin: 0; + border-radius: 3px 3px 0 0; + + > a { + flex: 1; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + color: $gl-text-color; + } + + small { + margin: 0 10px 0 0; + } + + .file-actions { + white-space: nowrap; + + .btn { + padding: 0 10px; + font-size: 13px; + line-height: 28px; + display: inline-block; + } + } +} diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 96ba7c40634..8b784c2a439 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -37,6 +37,10 @@ .file-title { cursor: pointer; + a:hover { + text-decoration: none; + } + &:hover { background-color: $gray-normal; } |