diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:30:20 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:30:20 +0000 |
| commit | 7e90c1aebfadd9aa71a3dda8909ba3c62c140138 (patch) | |
| tree | 0ef20bfe491694f75ee17c4d822a23448ca15198 /chrome/browser/resources/shared/css | |
| parent | 4672c6c2168c34722d5dc9dd09d864dc4d77d77d (diff) | |
| download | chromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.zip chromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.tar.gz chromium_src-7e90c1aebfadd9aa71a3dda8909ba3c62c140138.tar.bz2 | |
rename chrome_shared2.css to chrome_shared.css
BUG=103688
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10444043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/shared/css')
| -rw-r--r-- | chrome/browser/resources/shared/css/chrome_shared.css (renamed from chrome/browser/resources/shared/css/chrome_shared2.css) | 3 | ||||
| -rw-r--r-- | chrome/browser/resources/shared/css/chrome_shared_touch.css (renamed from chrome/browser/resources/shared/css/chrome_shared2_touch.css) | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/resources/shared/css/chrome_shared2.css b/chrome/browser/resources/shared/css/chrome_shared.css index 23b18b9..134e3dc 100644 --- a/chrome/browser/resources/shared/css/chrome_shared2.css +++ b/chrome/browser/resources/shared/css/chrome_shared.css @@ -3,8 +3,7 @@ * found in the LICENSE file. */ /* This file holds CSS that should be shared, in theory, by all user-visible - * chrome:// pages. This contrasts chrome_shared.css, which it is meant to - * replace, but has CSS specific to options and options-like pages. */ + * chrome:// pages. */ @import url("chrome://resources/css/widgets.css"); <if expr="pp_ifdef('chromeos')"> diff --git a/chrome/browser/resources/shared/css/chrome_shared2_touch.css b/chrome/browser/resources/shared/css/chrome_shared_touch.css index cd9207f..50f5412 100644 --- a/chrome/browser/resources/shared/css/chrome_shared2_touch.css +++ b/chrome/browser/resources/shared/css/chrome_shared_touch.css @@ -2,11 +2,11 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -/* NB: do not include this file directly. Include chrome_shared2.css. If touch +/* NB: do not include this file directly. Include chrome_shared.css. If touch * optimization is enabled, these rules will be automatically loaded by the * SharedResourceDataSource. */ -<include src="chrome_shared2.css"> +<include src="chrome_shared.css"> input[type='input'], input[type='password'], |