Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
1721793e
Commit
1721793e
authored
Feb 25, 2013
by
Arthur Barrett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved annotation return styling effect to css
parent
e736ed34
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
7 deletions
+18
-7
common/lib/xmodule/xmodule/css/annotatable/display.scss
+16
-6
common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
+2
-1
No files found.
common/lib/xmodule/xmodule/css/annotatable/display.scss
View file @
1721793e
...
...
@@ -25,17 +25,27 @@
cursor
:
pointer
;
@each
$highlight
in
(
(
red
rgba
(
178
,
19
,
16
,
0
.3
))
,
(
orange
rgba
(
255
,
165
,
0
,
0
.3
))
,
(
yellow
rgba
(
255
,
255
,
10
,
0
.3
))
,
(
green
rgba
(
25
,
255
,
132
,
0
.3
))
,
(
blue
rgba
(
35
,
163
,
255
,
0
.3
))
,
(
purple
rgba
(
115
,
9
,
178
,
0
.3
)))
{
(
red
rgba
(
178
,
19
,
16
,
0
.3
)
rgba
(
178
,
19
,
16
,
0
.9
))
,
(
orange
rgba
(
255
,
165
,
0
,
0
.3
)
rgba
(
255
,
165
,
0
,
0
.9
))
,
(
yellow
rgba
(
255
,
255
,
10
,
0
.3
)
rgba
(
255
,
255
,
10
,
0
.9
))
,
(
green
rgba
(
25
,
255
,
132
,
0
.3
)
rgba
(
25
,
255
,
132
,
0
.9
))
,
(
blue
rgba
(
35
,
163
,
255
,
0
.3
)
rgba
(
35
,
163
,
255
,
0
.9
))
,
(
purple
rgba
(
115
,
9
,
178
,
0
.3
)
rgba
(
115
,
9
,
178
,
0
.9
)))
{
$marker
:
nth
(
$highlight
,
1
);
$color
:
nth
(
$highlight
,
2
);
$selected_color
:
nth
(
$highlight
,
3
);
@if
$marker
==
yellow
{
&
.highlight
{
background-color
:
$color
;
}
@if
$marker
==
yellow
{
&
.highlight
{
background-color
:
$color
;
&
.selected
{
background-color
:
$selected_color
;
}
}
}
&
.highlight-
#{
$marker
}
{
background-color
:
$color
;
&
.selected
{
background-color
:
$selected_color
;
}
}
&
.highlight-
#{
$marker
}
{
background-color
:
$color
;
}
}
&
.hide
{
...
...
common/lib/xmodule/xmodule/js/src/annotatable/display.coffee
View file @
1721793e
...
...
@@ -149,7 +149,8 @@ class @Annotatable
problem_el
.
effect
'highlight'
,
{},
500
afterScrollToSpan
:
(
span_el
)
->
span_el
.
effect
'highlight'
,
{
color
:
'rgba(0,0,0,0.5)'
},
1000
span_el
.
addClass
'selected'
,
400
,
'swing'
,
->
span_el
.
removeClass
'selected'
,
400
,
'swing'
makeTipContent
:
(
el
)
->
(
api
)
=>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment