Merge branch 'release'

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
This commit is contained in:
marco
2013-10-01 17:05:02 -04:00
16 changed files with 301 additions and 138 deletions

View File

@@ -111,7 +111,7 @@ nav.sequence-nav {
outline: 0;
}
&:hover {
&:hover, &:focus {
background-color: #fff;
background-repeat: no-repeat;
background-position: center 14px;
@@ -235,7 +235,7 @@ nav.sequence-nav {
}
}
&:hover {
&:hover, &:focus {
p {
display: block;
margin-top: 4px;

View File

@@ -103,6 +103,7 @@ class @Sequence
sequence_links = @$('#seq_content a.seqnav')
sequence_links.click @goto
@$("a.active").blur()
goto: (event) =>
event.preventDefault()