diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-08 17:22:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-08 17:22:26 +0200 |
| commit | 86556a079e34eb1267e63f7b39cc018665e21bfc (patch) | |
| tree | 4b328dd67aa1042f15f83b4746437aa1cd50b8cd /app/assets | |
| parent | e9cf79da2f90a33d1058a1735d8a71a38df8f442 (diff) | |
| download | gitlab-ce-86556a079e34eb1267e63f7b39cc018665e21bfc.tar.gz | |
Improve diff UI and mr compare page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/pages/commit.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss index f9e9b024d47..051ca3792c3 100644 --- a/app/assets/stylesheets/pages/commit.scss +++ b/app/assets/stylesheets/pages/commit.scss @@ -26,14 +26,6 @@ margin-top: 10px; } -.commit-stat-summary { - color: #666; - font-size: 14px; - font-weight: normal; - padding: 3px 0; - margin-bottom: 10px; -} - .commit-info-row { margin-bottom: 10px; .avatar { diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index f816d32a93c..487b600e31d 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -1,6 +1,8 @@ .diff-file { - border: 1px solid $border-color; - margin-bottom: 1em; + margin-left: -16px; + margin-right: -16px; + border: none; + border-bottom: 1px solid #E7E9EE; .diff-header { position: relative; @@ -367,3 +369,7 @@ white-space: pre-wrap; } +.inline-parallel-buttons { + float: right; + margin-top: -5px; +} |