From 83cbc0eb332701e4cf15061326a129a0155f02b4 Mon Sep 17 00:00:00 2001 From: vitalybuka Date: Tue, 30 Sep 2014 13:37:45 -0700 Subject: Move html.height=100% from uber.css to chrome_shared.css. Now settings page from Chrome OS does not apply uber.css. BUG=178819,412272 Review URL: https://codereview.chromium.org/613683004 Cr-Commit-Position: refs/heads/master@{#297493} --- chrome/browser/resources/uber/uber.css | 4 ---- ui/webui/resources/css/chrome_shared.css | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chrome/browser/resources/uber/uber.css b/chrome/browser/resources/uber/uber.css index 26ed744..76ba333 100644 --- a/chrome/browser/resources/uber/uber.css +++ b/chrome/browser/resources/uber/uber.css @@ -2,10 +2,6 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -html { - height: 100%; /* For printing. */ -} - body { /* http://crbug.com/129406 --- horizontal scrollbars flicker when changing * sections. */ diff --git a/ui/webui/resources/css/chrome_shared.css b/ui/webui/resources/css/chrome_shared.css index c5dc338..d2f6890 100644 --- a/ui/webui/resources/css/chrome_shared.css +++ b/ui/webui/resources/css/chrome_shared.css @@ -15,6 +15,10 @@ display: none !important; } +html { + height: 100%; /* For printing. */ +} + html.loading * { -webkit-transition-delay: 0 !important; -webkit-transition-duration: 0 !important; -- cgit v1.1