History

Fix sidebar not resizable when set to show/hide automatically

Fixes #592.

Thibaut Courouble committed 9 years ago

Commit 7980abd1 parent 639ca702 files · +5 −5Browse files

Unified · Split

2 files
  1. assets/javascripts/views/sidebar/sidebar.coffee +2 −2
  2. assets/stylesheets/components/_sidebar.scss +3 −3
assets/javascripts/views/sidebar/sidebar.coffee+2−2
@@ -27,11 +27,11 @@ class app.views.Sidebar extends app.View · 26 unmodified lines
27 return27 return
28 28
29 display: ->29 display: ->
30 @el.style.display = 'block'30 @addClass 'show'
31 return31 return
32 32
33 resetDisplay: ->33 resetDisplay: ->
34 @el.style.display = '' unless @el.style.display is 'none'34 @removeClass 'show'
35 return35 return
36 36
37 showView: (view) ->37 showView: (view) ->
assets/stylesheets/components/_sidebar.scss+3−3
@@ -40,9 +40,8 @@ · 39 unmodified lines
40 }40 }
41 }41 }
42 42
43 ._sidebar-hidden & {43 ._sidebar-hidden & { display: none; }
44 display: none;44 &.show { display: block; }
45 }
46}45}
47 46
48._resizer {47._resizer {
@@ -56,6 +55,7 @@ · 7 unmodified lines
56 cursor: col-resize;55 cursor: col-resize;
57 56
58 ._sidebar-hidden & { display: none; }57 ._sidebar-hidden & { display: none; }
58 ._sidebar-hidden ._sidebar.show ~ & { display: block; }
59}59}
60 60
61//61//