diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-21 15:24:27 -0500 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-04-21 15:28:26 -0500 |
| commit | 1fab0e5ca1cabfed2f56f155cc4ab0cf86174de2 (patch) | |
| tree | da00b459585ac9838989720be53ba5475b0b68b4 | |
| parent | 37a91bf90086bf8cde48769778298ff83b4687e8 (diff) | |
| download | gitlab-ce-31072-activity-border.tar.gz | |
Fix border color on activities page31072-activity-border
| -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; |