Merge upstream.

diff --cc web/viewer.css
index 7c7d4f684d29186881ea6ae9079121cac29d3fb5,0337323fc2c1c305d231d3bfe5b598257539949d..b8e86f2c83105070fdebdb84eb45f08e50e93032
--- 1/web/viewer.css
--- 2/web/viewer.css
+++ b/web/viewer.css
@@@ -146,7 -176,9 +176,9 @@@ html[dir='rtl'] #sidebarContent 
  
  #toolbarSidebar {
    width: 200px;
 -  height: 32px;
 +  height: 29px;
+   background-image: url(images/texture.png),
+                     -webkit-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
    background-image: url(images/texture.png),
                      -moz-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
    background-image: url(images/texture.png),
@@@ -242,17 -284,15 +284,20 @@@ html[dir='rtl'] .splitToolbarButton > .
    margin-right:0;
  }
  
 +.splitToolbarButton.toggled .toolbarButton {
 +  margin: 0;
 +}
 +
  .splitToolbarButton:hover > .toolbarButton,
  .splitToolbarButton:focus > .toolbarButton,
 -.splitToolbarButton.toggled > .toolbarButton {
 +.splitToolbarButton.toggled > .toolbarButton,
 +.toolbarButton.textButton {
    background-color: hsla(0,0%,0%,.12);
-   background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
    background-image: -webkit-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+   background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+   background-image: -ms-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+   background-image: -o-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
+   background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
    background-clip: padding-box;
    border: 1px solid hsla(0,0%,0%,.35);
    border-color: hsla(0,0%,0%,.32) hsla(0,0%,0%,.38) hsla(0,0%,0%,.42);
@@@ -855,14 -940,15 +957,15 @@@ canvas 
    float: left;
  
    background: #666;
-   background: -moz-linear-gradient(top, #b2b2b2 0%, #898989 100%);
 -  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#999), color-stop(50%,#666), color-stop(100%,#999));
 -  background: -webkit-linear-gradient(top, #999 0%,#666 50%,#999 100%);
 -  background: -moz-linear-gradient(top, #999 0%, #666 50%, #999 100%);
 -  background: -ms-linear-gradient(top, #999 0%,#666 50%,#999 100%);
 -  background: -o-linear-gradient(top, #999 0%,#666 50%,#999 100%);
 -  background: linear-gradient(top, #999 0%,#666 50%,#999 100%);    
 +  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#b2b2b2), color-stop(100%,#898989));
 +  background: -webkit-linear-gradient(top, #b2b2b2 0%,#898989 100%);
-   background: -o-linear-gradient(top, #b2b2b2 0%,#898989 100%);
++  background: -moz-linear-gradient(top, #b2b2b2 0%,#898989 100%);
 +  background: -ms-linear-gradient(top, #b2b2b2 0%,#898989 100%);
-   background: linear-gradient(top, #b2b2b2 0%,#898989 100%);
++  background: -o-linear-gradient(top, #b2b2b2 0%,#898989 100%);
++  background: linear-gradient(top, #b2b2b2 0%,#898989 100%);    
+ 
 -  border-top-left-radius: 3px;
 -  border-bottom-left-radius: 3px;
 +  border-top-left-radius: 2px;
 +  border-bottom-left-radius: 2px;
  
    width: 0%;
    height: 100%;

diff --cc web/viewer.js
Simple merge