Fix merge conflicts

Conflicts: vendor/assets/stylesheets/dvl/components/page_header.scss
dobtco · Sep 10, 2015 · a222011 · a222011
2 parents 6305834 + b7d4d24
commit a222011
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/vendor/assets/stylesheets/dvl/components/page_header.scss b/vendor/assets/stylesheets/dvl/components/page_header.scss
@@ -173,7 +173,7 @@
       }
     }
     &.active a {
-      color: $primaryColor;
+      color: $bodyFontColor;
     }
   }
   @media screen and (min-width: $lapWidth) {

diff --git a/vendor/assets/stylesheets/dvl/core/includes.scss b/vendor/assets/stylesheets/dvl/core/includes.scss
@@ -3,7 +3,7 @@
 
 // App-specific colors
 $bodyBackgroundColor: #fff !default;
-$brandColor: #0d2438 !default;
+$brandColor: #697182 !default;
 $selectionBackground: $brandColor !default;
 $selectionColor: #fff !default;