Merge 198708 "Fix overlapping labels in Files.app's gallery new UI."

chrome/browser/resources/file_manager/css/gallery.css

 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file. */
 
 body {
   -webkit-user-select: none;
   font-family: Open Sans, Droid Sans Fallback, sans-serif;
   font-size: 84%;
   margin: 0;
 }
@@ skipping 581 matching lines @@
   width: 40px;
   z-index: 10;
 }
 
 /* By default, labels are hidden. */
 .gallery > .toolbar button span {
   display: none;
 }
 
 /* Show labels if there is enough space. */
-@media (min-width: 1000px) {
+@media (min-width: 1050px) {
 
-  .gallery .edit-main button {
+  body .gallery .edit-main button {
     background-position: 5px center;
     min-width: 0;  /* Reset. */
     padding: 0 10px 0 35px;
     width: auto;
   }
 
-  .gallery > .toolbar button span {
+  body .gallery > .toolbar button span {
     display: inline;
   }
 
 }
 
 .gallery > .toolbar button:hover {
   background-color: rgba(31, 31, 31, 1);
   color: white;
 }
 
@@ skipping 716 matching lines @@
     url('../images/gallery/slideshow-pause.png') 1x,
     url('../images/gallery/2x/slideshow-pause.png') 2x);
 }
 
 .slideshow-toolbar > .slideshow-end {
   background-image: -webkit-image-set(
     url('../images/gallery/slideshow-end.png') 1x,
     url('../images/gallery/2x/slideshow-end.png') 2x);
   margin-left: -2px;
 }