Merge branch '31072-activity-border' into 'master'

Fix border color on activities page Closes #31072 See merge request !10864

Merge branch '31072-activity-border' into 'master'
f07edb5a · Phil Hughes · 1005389f · 1fab0e5c · f07edb5a · f07edb5a
Commit f07edb5a authored Apr 24, 2017 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

blocks.scss app/assets/stylesheets/framework/blocks.scss +0 -1

nav.scss app/assets/stylesheets/framework/nav.scss +1 -1

No files found.
--- 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;
  }
 }


--- 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;