diff options
-rw-r--r-- | app/assets/stylesheets/generic/common.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 7 | ||||
-rw-r--r-- | app/views/events/event/_note.html.haml | 3 |
4 files changed, 14 insertions, 9 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 8b3768c2d27..8dccfcbee09 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -353,7 +353,7 @@ table { } .description { - font-size: 16px; + font-size: $gl-font-size; color: #666; margin-top: 8px; } diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index df7eae869c0..ca2ee455423 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -3,7 +3,7 @@ * */ .event-item { - font-size: 16px; + font-size: $gl-font-size; padding: $gl-padding; margin-left: -$gl-padding; margin-right: -$gl-padding; @@ -35,7 +35,7 @@ .event-title { @include str-truncated(calc(100% - 174px)); - font-weight: 500; + font-weight: 600; .author_name { color: #333; @@ -51,7 +51,8 @@ word-wrap: break-word; .md { - font-size: 16px; + color: #7f8fa4; + font-size: $gl-font-size; iframe.twitter-share-button { vertical-align: bottom; @@ -81,7 +82,7 @@ .event-note-icon { color: #777; float: left; - font-size: 16px; + font-size: $gl-font-size; line-height: 16px; margin-right: 5px; } @@ -112,7 +113,7 @@ padding-left: 0; border: none; .commit-row-title { - font-size: 16px; + font-size: $gl-font-size; } } diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 7e9ec9c88c6..87bb55395b9 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -274,7 +274,7 @@ pre.light-well { &.no-description { .project { - line-height: 38px; + line-height: 44px; } } @@ -299,6 +299,11 @@ pre.light-well { } } } + + .bottom { + padding-top: $gl-padding; + padding-bottom: 0; + } } .panel .projects-list li { diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 07bec1697f5..830fec0b4ab 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -4,7 +4,7 @@ = event.action_name = event_note_title_html(event) at - + - if event.project = link_to_project event.project - else @@ -13,7 +13,6 @@ .event-body .event-note .md - %i.fa.fa-comment-o.event-note-icon = event_note(event.target.note, project: event.project) - note = event.target - if note.attachment.url |