Merge branch 'develop' into tvw

This commit is contained in:
Connor Turland 2014-11-11 07:51:22 -05:00
commit 38c3ba419c
2 changed files with 5 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

View file

@ -1220,7 +1220,7 @@ h3.realtimeBoxTitle {
}
.rightclickmenu .rc-center .rc-icon {
background-image: url(context_topicview_sprite.png);
}
.rightclickmenu .rc-popout .rc-icon {
background-position: 0 -72px;
@ -1231,6 +1231,10 @@ h3.realtimeBoxTitle {
.rightclickmenu .rc-metacode .rc-icon {
background-position: 0 -120px;
}
.rightclickmenu .rc-siblings .rc-icon {
background-position: 0 -24px;
background-image: url(context_topicview_sprite.png);
}
.rightclickmenu .expandLi {
position: absolute;
top: 4px;