diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-05 19:55:35 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-05 19:55:35 +0900 |
| commit | 6c712667abdc3a5a51dc0ac15a7cbe56b603badb (patch) | |
| tree | 1f3d14e5e336d7e5d0edac3db5c881c8fd3a1c22 /app/assets/stylesheets/framework/files.scss | |
| parent | a0f7819ff5d6164a13dcad1e0ceab3567354592b (diff) | |
| parent | eba27fe022562e6e5cdae81a08addff6ec152826 (diff) | |
| download | gitlab-ce-6c712667abdc3a5a51dc0ac15a7cbe56b603badb.tar.gz | |
Merge branch 'refactor-clusters' into move-kubernetes-from-service-to-clusters-page-10-2-ver
Diffstat (limited to 'app/assets/stylesheets/framework/files.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 5833ef939e9..6382551fcc9 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -165,22 +165,36 @@ &:last-child { border-right: none; } - } - td.blame-commit { - padding: 5px 10px; - min-width: 400px; - max-width: 400px; - background: $gray-light; - border-left: 3px solid; + &.blame-commit { + padding: 5px 10px; + min-width: 400px; + max-width: 400px; + background: $gray-light; + border-left: 3px solid; + + .commit-row-title { + display: flex; + } + + .item-title { + flex: 1; + margin-right: 0.5em; + } + } + + &.line-numbers { + float: none; + border-left: 1px solid $blame-line-numbers-border; - .commit-row-title { - display: flex; + i { + float: none; + margin-right: 0; + } } - .item-title { - flex: 1; - margin-right: 0.5em; + &.lines { + padding: 0; } } @@ -195,20 +209,6 @@ border-left-color: mix($blame-gray, $blame-cyan, $i / 4.0 * 100%); } } - - td.line-numbers { - float: none; - border-left: 1px solid $blame-line-numbers-border; - - i { - float: none; - margin-right: 0; - } - } - - td.lines { - padding: 0; - } } &.logs { |