Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6672 from edx/talbs/fix-edxnotes-links+highlights

Browse Source 
LMS: Student Notes - Styling links to appear in highlighted text
This commit is contained in:
Brian Talbot
2015-01-16 14:49:08 -05:00
parent dde097c926 26fb3fc557
commit a8cc338711
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/static/sass/base/_base.scss
View File

@@ -103,7 +103,7 @@ a:link, a:visited {
}
&:disabled, &.is-disabled, &.disabled {
pointer-events: none;
@extend %ui-disabled;
opacity: 0.5;
cursor: not-allowed;
}

27
lms/static/sass/course/modules/_student-notes.scss
View File

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