diff options
| author | vitalybuka <vitalybuka@chromium.org> | 2014-09-30 13:37:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 20:38:02 +0000 |
| commit | 83cbc0eb332701e4cf15061326a129a0155f02b4 (patch) | |
| tree | 562a873d51cb99e406e4bb6f65c51f5fc90edc69 | |
| parent | c08f89f552f6f94384e54a53a25b0016c34fbed5 (diff) | |
| download | chromium_src-83cbc0eb332701e4cf15061326a129a0155f02b4.zip chromium_src-83cbc0eb332701e4cf15061326a129a0155f02b4.tar.gz chromium_src-83cbc0eb332701e4cf15061326a129a0155f02b4.tar.bz2 | |
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}
| -rw-r--r-- | chrome/browser/resources/uber/uber.css | 4 | ||||
| -rw-r--r-- | 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; |