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

Merge branch 'fix/activity-inline-event-line-height' into 'master'
2cbb2d0e · Annabel Dunstone Gray · e84b60f4 · 7a571f40 · 2cbb2d0e · 2cbb2d0e
Commit 2cbb2d0e authored Jan 02, 2018 by Annabel Dunstone Gray
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

events.scss app/assets/stylesheets/pages/events.scss +6 -1

fix-activity-inline-event-line-height.yml ...logs/unreleased/fix-activity-inline-event-line-height.yml +5 -0

No files found.
--- 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;

--- a/changelogs/unreleased/fix-activity-inline-event-line-height.yml
+++ b/changelogs/unreleased/fix-activity-inline-event-line-height.yml
+---
+title: Fix activity inline event line height on mobile
+merge_request: 16121
+author: George Tsiolis
+type: fixed