diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 17:20:48 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 17:20:48 +0000 |
| commit | 4fa29c288ad2fce8dd03cab6f0be1b9380a107d4 (patch) | |
| tree | c240712cd357281397d12a28b9def8b4b9f8ef57 /chrome/browser/resources | |
| parent | d2dc448ab98035308bc0b1566ad742d9353e5e24 (diff) | |
| download | chromium_src-4fa29c288ad2fce8dd03cab6f0be1b9380a107d4.zip chromium_src-4fa29c288ad2fce8dd03cab6f0be1b9380a107d4.tar.gz chromium_src-4fa29c288ad2fce8dd03cab6f0be1b9380a107d4.tar.bz2 | |
Proxy settings dialog improvements.
- Removes DomUI title.
- Instead, sets dialog title.
- CSS styles are preserved from chrome://settings proxy settings page.
BUG=110030
TEST=Open the proxy settings dialog and verify that it appears the same as settings.
Review URL: http://codereview.chromium.org/9112038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117859 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/chromeos/proxy_settings.css | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/proxy_settings.html | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/chrome/browser/resources/chromeos/proxy_settings.css b/chrome/browser/resources/chromeos/proxy_settings.css index 5b7849d..8537de5 100644 --- a/chrome/browser/resources/chromeos/proxy_settings.css +++ b/chrome/browser/resources/chromeos/proxy_settings.css @@ -14,3 +14,8 @@ body { #proxyPage { height: 100%; } + +#proxy-page-title { + /* We have a title on the window, so the title in domui should be hidden. */ + display: none; +} diff --git a/chrome/browser/resources/chromeos/proxy_settings.html b/chrome/browser/resources/chromeos/proxy_settings.html index aa9762d..6c67023 100644 --- a/chrome/browser/resources/chromeos/proxy_settings.html +++ b/chrome/browser/resources/chromeos/proxy_settings.html @@ -2,9 +2,12 @@ <html i18n-values="dir:textdirection"> <head> <link rel="stylesheet" href="chrome://resources/css/button.css"> +<link rel="stylesheet" href="chrome://resources/css/checkbox.css"> <link rel="stylesheet" href="chrome://resources/css/list.css"> <link rel="stylesheet" href="chrome://resources/css/select.css"> +<link rel="stylesheet" href="chrome://resources/css/chrome_shared.css"> <link rel="stylesheet" href="../options/options_page.css"> +<link rel="stylesheet" href="../options/chromeos/internet_options_page.css"> <link rel="stylesheet" href="../options/chromeos/proxy.css"> <link rel="stylesheet" href="proxy_settings.css"> @@ -27,7 +30,9 @@ <script src="proxy_settings.js"></script> </head> -<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> +<!-- We do not override the fontSize because it is defined in + internet_options_page.css. --> +<body i18n-values=".style.fontFamily:fontfamily"> <include src="../options/chromeos/proxy.html"> </body> </html> |