diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-24 07:57:54 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-24 07:57:54 +0000 |
| commit | f07edb5af1e18be817e49e0afd86f59a6eef1cd9 (patch) | |
| tree | fdced1e2b47c362e5d25142e00616909e0c1e4ac /app/assets | |
| parent | 1005389f70070245092c1ae5f3f9b10b8e7c102e (diff) | |
| parent | 1fab0e5ca1cabfed2f56f155cc4ab0cf86174de2 (diff) | |
| download | gitlab-ce-f07edb5af1e18be817e49e0afd86f59a6eef1cd9.tar.gz | |
Merge branch '31072-activity-border' into 'master'
Fix border color on activities page
Closes #31072
See merge request !10864
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 52425262925..f3e2a5db0a6 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -230,7 +230,6 @@ float: right; margin-top: 8px; padding-bottom: 8px; - border-bottom: 1px solid $border-color; } } diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index e6d808717f3..b6cf5101d60 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -110,7 +110,7 @@ .top-area { @include clearfix; - border-bottom: 1px solid $white-normal; + border-bottom: 1px solid $border-color; .nav-text { padding-top: 16px; |