diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 15:09:55 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-03 15:09:55 +0200 |
commit | 6d651a0260066185fe39b1381d54a5281d13a7f8 (patch) | |
tree | b2966673394a08f732a9a74e781c74958b8c9799 | |
parent | 1d6a65a2aba6382564f761ec7881e582fc6d055f (diff) | |
download | gitlab-ce-6d651a0260066185fe39b1381d54a5281d13a7f8.tar.gz |
Increase use of variables in css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | app/assets/stylesheets/base/mixins.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/common.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/lists.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/events.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 |
6 files changed, 28 insertions, 6 deletions
diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/base/mixins.scss index 66417c2bdf2..2fd6c192e30 100644 --- a/app/assets/stylesheets/base/mixins.scss +++ b/app/assets/stylesheets/base/mixins.scss @@ -187,7 +187,7 @@ &.light { a { - color: #777; + color: $gl-gray; } } } diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 17dec228611..7dfb19e9079 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -376,7 +376,7 @@ table { list-style: none; text-align: center; margin-top: 5px; - margin-bottom: 19px; + margin-bottom: 18px; height: 60px; margin-top: -18px; padding-top: 18px; diff --git a/app/assets/stylesheets/generic/lists.scss b/app/assets/stylesheets/generic/lists.scss index 4b7ff84de2b..26c2234c8d0 100644 --- a/app/assets/stylesheets/generic/lists.scss +++ b/app/assets/stylesheets/generic/lists.scss @@ -109,3 +109,17 @@ ul.bordered-list { li.task-list-item { list-style-type: none; } + +ul.content-list { + @include basic-list; + + margin: 0; + padding: 0; + + li { + padding: 18px; + border-color: #f1f2f4; + margin: 0 -18px; + } +} + diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 359f4073e87..de2ae93df37 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -52,7 +52,7 @@ li.commit { } .commit-row-message { - color: #444; + color: $gl-link-color; &:hover { text-decoration: underline; @@ -88,12 +88,12 @@ li.commit { } .commit-row-info { - color: #777; + color: $gl-gray; line-height: 24px; font-size: 13px; a { - color: #777; + color: $gl-gray; } .committed_ago { diff --git a/app/assets/stylesheets/pages/events.scss b/app/assets/stylesheets/pages/events.scss index a90b05da293..1d71a542f8a 100644 --- a/app/assets/stylesheets/pages/events.scss +++ b/app/assets/stylesheets/pages/events.scss @@ -14,6 +14,14 @@ position: relative; top: -2px; } + + .event-title { + line-height: 44px; + } + + .event-item-timestamp { + line-height: 44px; + } } a { diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index f8e3d861c08..2095e73f553 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -184,7 +184,7 @@ ul.nav.nav-projects-tabs { .breadcrumb.repo-breadcrumb { padding: 0; - line-height: 34px; + line-height: 42px; background: white; border: none; font-size: 16px; |