diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-21 19:03:48 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-21 19:03:48 +0000 |
| commit | db9a8f4e3257104937d4558cd25ccbd345914a73 (patch) | |
| tree | d2ea6ad8977ea58970e6e02372a88900124c24ae | |
| parent | c66fdc2bd01620d6452943b21e74f0e9f5fafa98 (diff) | |
| parent | 0337b20dbecfbe847387b69508868317269eb8ef (diff) | |
| download | gitlab-ce-db9a8f4e3257104937d4558cd25ccbd345914a73.tar.gz | |
Merge branch 'system-note-commits-list-gradient-fix' into 'master'
Fixed commit list system not gradient
Closes #33896
See merge request !12306
| -rw-r--r-- | app/assets/stylesheets/framework/timeline.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/timeline.scss b/app/assets/stylesheets/framework/timeline.scss index 10881987038..3d68a50f91f 100644 --- a/app/assets/stylesheets/framework/timeline.scss +++ b/app/assets/stylesheets/framework/timeline.scss @@ -44,6 +44,10 @@ &:target, &.target { background: $line-target-blue; + + &.system-note .note-body .note-text.system-note-commit-list::after { + background: linear-gradient(rgba($line-target-blue, 0.1) -100px, $line-target-blue 100%); + } } .avatar { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 8b7df4dd72b..b6988c01b4a 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -250,7 +250,7 @@ ul.notes { &::after { content: ''; width: 100%; - height: 67px; + height: 70px; position: absolute; left: 0; bottom: 0; |