diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-02 18:15:34 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-02 18:15:34 +0000 |
| commit | 2cbb2d0eceaed0f31c92d4eed8932e98f4f74559 (patch) | |
| tree | ec3aa6d500286a3bde9ae65a0dad2bcce36dbfff | |
| parent | e84b60f414b59bb3ee9d08752db368b51e605c41 (diff) | |
| parent | 7a571f40393812345806f87f5565de7878820e41 (diff) | |
| download | gitlab-ce-2cbb2d0eceaed0f31c92d4eed8932e98f4f74559.tar.gz | |
Merge branch 'fix/activity-inline-event-line-height' into 'master'
Fix activity inline event line height on mobile
Closes #38778
See merge request gitlab-org/gitlab-ce!16121
| -rw-r--r-- | app/assets/stylesheets/pages/events.scss | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-activity-inline-event-line-height.yml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index eea8b7dd193..da096354b5a 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -159,7 +159,6 @@ } } - /* * Last push widget */ @@ -182,6 +181,12 @@ .event-item { padding-left: 0; + &.event-inline { + .event-title { + line-height: 20px; + } + } + .event-title { white-space: normal; overflow: visible; diff --git a/changelogs/unreleased/fix-activity-inline-event-line-height.yml b/changelogs/unreleased/fix-activity-inline-event-line-height.yml new file mode 100644 index 00000000000..85e69567499 --- /dev/null +++ b/changelogs/unreleased/fix-activity-inline-event-line-height.yml @@ -0,0 +1,5 @@ +--- +title: Fix activity inline event line height on mobile +merge_request: 16121 +author: George Tsiolis +type: fixed |