From 26fb3fc557ca9d6061fcb9be6a0650e6281fad27 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 16 Jan 2015 11:07:55 -0500
Subject: [PATCH] LMS: student notes - styling links to appear in highlighted
 text

---
 lms/static/sass/base/_base.scss               |  2 +-
 .../sass/course/modules/_student-notes.scss   | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lms/static/sass/base/_base.scss b/lms/static/sass/base/_base.scss
index d9ca9b74db..95e2a7ac53 100644
--- a/lms/static/sass/base/_base.scss
+++ b/lms/static/sass/base/_base.scss
@@ -103,7 +103,7 @@ a:link, a:visited {
   }
 
   &:disabled, &.is-disabled, &.disabled {
-    pointer-events: none;
+    @extend %ui-disabled;
     opacity: 0.5;
     cursor: not-allowed;
   }
diff --git a/lms/static/sass/course/modules/_student-notes.scss b/lms/static/sass/course/modules/_student-notes.scss
index 3a10c85451..bf699e4e58 100644
--- a/lms/static/sass/course/modules/_student-notes.scss
+++ b/lms/static/sass/course/modules/_student-notes.scss
@@ -215,6 +215,33 @@ $notes-annotator-background-dark: rgba(122,122,122,0.6); // taken from annotator
 // highlight
 .annotator-hl {
   background: $student-notes-highlight-color-focus;
+
+  // CASE: a highlight contains a link
+  a {
+    color: $link-color;
+
+    // STATE: hover/focus
+    &:hover, &:focus {
+      text-decoration: underline;
+    }
+
+    // STATE: disabled
+    &:disabled, &.is-disabled {
+      @extend %ui-disabled;
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+  }
+}
+
+// CASE: a link contains a highlight
+a .annotator-hl {
+  color: $link-color;
+
+  // STATE: hover/focus
+  &:hover, &:focus {
+    text-decoration: underline;
+  }
 }
 
 // content