Commit bb97e4a6 authored by Randall Leeds's avatar Randall Leeds

unify collapse classes and remove html collapse

parent baf94fed
......@@ -63,7 +63,7 @@ class Hypothesis extends Annotator
sidebar = $(Handlebars.templates.sidebar())
Annotator.prototype.sidebar = sidebar
@sidebar = sidebar
@sidebar.addClass('collapse')
@sidebar.addClass('hyp-collapsed')
@sidebar.on 'click', (event) => event.stopPropagation()
this
......@@ -334,12 +334,10 @@ class Hypothesis extends Annotator
this.showSidebar()
showSidebar: =>
$(document.documentElement).addClass('hyp-collapse')
@sidebar.removeClass('collapse')
@sidebar.removeClass('hyp-collapsed')
hideSidebar: =>
@sidebar.addClass('collapse')
$(document.documentElement).removeClass('hyp-collapse')
@sidebar.addClass('hyp-collapsed')
updateViewer: (annotations) =>
existing = d3.select(@viewer.element.get(0)).datum()
......
......@@ -131,7 +131,7 @@ $iconset: iconset_wireframe;
// Styles for the sidebar
.hyp-sidebar {
@include single-transition(margin-left, 0.6s, ease-in-out);
@include single-transition(all, 0.6s, ease-in-out);
background: url('../images/noise_1.png');
color: #666666;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
......@@ -164,8 +164,9 @@ $iconset: iconset_wireframe;
}
}
.hyp-sidebar.collapse {
.hyp-sidebar.hyp-collapsed {
margin-left: -15px;
width: 0;
.annotator-outer {
margin-left: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment