local merge conflict resolution

2013-02-13 13:41:35 -05:00
parent e13db29efc 0af6b991f0
commit 8ec4c09615
1 changed files with 8 additions and 8 deletions
--- a/cms/static/sass/_header.scss
+++ b/cms/static/sass/_header.scss
@@ -151,14 +151,6 @@
      font-weight: 600;
      color: $gray-d3;

-      &:hover, &:active, &.is-selected {
-        color: $blue;
-
-        .icon-expand {
-          color: $blue;
-        }
-      }
-
      .label-prefix {
        display: block;
        @include font-size(11);
@@ -546,6 +538,14 @@ body.signin .nav-not-signedin-signup {
    .nav-item .title {
      outline: 0;
      cursor: pointer;
+
+      &:hover, &:active, &.is-selected {
+        color: $blue;
+
+        .icon-expand {
+          color: $blue;
+        }
+      }
    }
  }