diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-04 11:56:32 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-04 11:56:32 +0200 |
commit | 8301836b4262ee8bf3da16d089e3d6f4b47258e2 (patch) | |
tree | b79bba2a0ad6e8615d8306e1e51dab15f2766a96 /app/assets | |
parent | af6f739f3532fdd78f347b96937d259cd5ccf3bb (diff) | |
download | gitlab-ce-8301836b4262ee8bf3da16d089e3d6f4b47258e2.tar.gz |
Small ui improvements to activity feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
-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 |
3 files changed, 13 insertions, 7 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 { |