Merge pull request mozilla#2328 from brendandahl/css-tweaks

Minor css tweaks for small viewer and aligning borders.
skopp · Oct 29, 2012 · eeb5709 · eeb5709
2 parents 1f08405 + 11175ba
commit eeb5709
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/web/viewer.css b/web/viewer.css
@@ -240,7 +240,7 @@ html[dir='rtl'] #sidebarContent {
 
 #toolbarSidebar {
   width: 200px;
-  height: 29px;
+  height: 32px;
   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),
@@ -251,11 +251,11 @@ html[dir='rtl'] #sidebarContent {
                     -o-linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
   background-image: url(images/texture.png),
                     linear-gradient(hsla(0,0%,30%,.99), hsla(0,0%,25%,.95));
-  box-shadow: inset -2px 0 0 hsla(0,0%,100%,.08),
-              inset 0 1px 1px hsla(0,0%,0%,.15),
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
+
               inset 0 -1px 0 hsla(0,0%,100%,.05),
               0 1px 0 hsla(0,0%,0%,.15),
-              0 1px 1px hsla(0,0%,0%,.1);
+              0 0 1px hsla(0,0%,0%,.1);
 }
 
 #toolbarViewer, .findbar {
@@ -271,7 +271,6 @@ html[dir='rtl'] #sidebarContent {
                     -o-linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
   background-image: url(images/texture.png),
                     linear-gradient(hsla(0,0%,32%,.99), hsla(0,0%,27%,.95));
-  border-left: 1px solid hsla(0,0%,0%,.5);
   box-shadow: inset 1px 0 0 hsla(0,0%,100%,.08),
               inset 0 1px 1px hsla(0,0%,0%,.15),
               inset 0 -1px 0 hsla(0,0%,100%,.05),
@@ -1389,9 +1388,6 @@ canvas {
     top: 32px;
     background-color: hsla(0,0%,0%,.7);
   }
-  #thumbnailView, #outlineView {
-    top: 66px;
-  }
 
   html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
     left: 0px;

diff --git a/web/viewer.html b/web/viewer.html
@@ -81,13 +81,15 @@
     <div id="outerContainer">
 
       <div id="sidebarContainer">
-        <div id="toolbarSidebar" class="splitToolbarButton toggled">
-          <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="1" data-l10n-id="thumbs">
-             <span data-l10n-id="thumbs_label">Thumbnails</span>
-          </button>
-          <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="2" data-l10n-id="outline">
-             <span data-l10n-id="outline_label">Document Outline</span>
-          </button>
+        <div id="toolbarSidebar">
+          <div class="splitToolbarButton toggled">
+            <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="1" data-l10n-id="thumbs">
+               <span data-l10n-id="thumbs_label">Thumbnails</span>
+            </button>
+            <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="2" data-l10n-id="outline">
+               <span data-l10n-id="outline_label">Document Outline</span>
+            </button>
+          </div>
         </div>
         <div id="sidebarContent">
           <div id="thumbnailView">