add scrollbars to sidebars

oerpub · Aug 15, 2013 · d83c3f4 · d83c3f4
1 parent 7cd4116
commit d83c3f4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/styles/workspace/sidebar.less b/styles/workspace/sidebar.less
@@ -33,6 +33,11 @@
   border-left: 1px solid #999;
 }
 
+#workspace > *,
+#sidebar > * {
+  height: 100%;
+}
+
 #greenpicker {
   position: absolute;
   left: 0;
@@ -186,6 +191,10 @@
     // Root nodes in the sidebar should have no left margin
     > ol { margin: 0; }
 
+    overflow-x: hidden;
+    overflow-y: auto;
+    height: 100%;
+
     li { white-space: nowrap; }
 
     li {
@@ -241,4 +250,4 @@
 #workspace .edit-settings, .body-above {
   display:none;
   visibility: visible;
-}
+}
diff --git a/templates/workspace/menu/toolbar-aloha.html b/templates/workspace/menu/toolbar-aloha.html
@@ -33,8 +33,8 @@
     <button class="btn action strong" rel="tooltip" title="Bold"><i class="icon-bold"></i></button>
     <button class="btn action emphasis" rel="tooltip" title="Italics"><i class="icon-italic"></i></button>
     <button class="btn action underline" rel="tooltip" title="Underline"><i class="icon-underline"></i></button>
-    <button class="btn action superscript" rel="tooltip" title="Superscript"><i class="icon-superscript"></i></button>
-    <button class="btn action subscript" rel="tooltip" title="Subscript"><i class="icon-subscript"></i></button>    
+    <button class="btn action superscript" rel="tooltip" title="Superscript">A<sup>S</sup></button>
+    <button class="btn action subscript" rel="tooltip" title="Subscript">A<sub>S</sub></button>    
   </div>
 
   <div class="btn-group">
@@ -67,8 +67,14 @@
       <li class="disabled"><a href="#" class="action deletecolumn">Delete Column</a></li>
       <li class="disabled"><a href="#" class="action deletetable">Delete Table</a></li>
     </ul>
-    <button class="btn action insertMath" rel="tooltip" title="Insert Math">x<sup>2</sup></button>
+    <button class="btn action insertMath" rel="tooltip" title="Insert Math">x<sup>2+1</sup></button>
   </div>
 
+  <div class="btn-group">
+    <button class="btn action copy" style="display: none" title="Bold">Copy Section</button>
+  </div>
+  <div class="btn-group">
+    <button class="btn action paste" style="display: none" title="Italics">Paste</button>
+  </div>
 <!-- / ".btn-toolbar" -->
 </span>
diff --git a/templates/workspace/sidebar/toc.html b/templates/workspace/sidebar/toc.html
@@ -1,12 +1,11 @@
-{{#if mediaType}}
-  <h3 data-media-type="{{mediaType}}">
-    <i class="icon-content"></i>
-    <span title="Click to Change Title" class="editor-content-title">{{title}}</span>
-  </h3>
-{{else}}
-  <h3><span class="go-workspace">My Workspace</span></h3>
-{{/if}}
-
 <nav id="workspace-sidebar-toc" data-type="toc">
+  {{#if mediaType}}
+    <h3 data-media-type="{{mediaType}}">
+      <i class="icon-content"></i>
+      <span title="Click to Change Title" class="editor-content-title">{{title}}</span>
+    </h3>
+  {{else}}
+    <h3><span class="go-workspace">My Workspace</span></h3>
+  {{/if}}
   <ol></ol>
 </nav>