summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 04:58:34 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 04:58:34 +0000
commiteff55bbd1aadf352a00626c7245e063e1145db39 (patch)
tree922583900b887b19b666332cf70829e2e040519b /chrome/browser
parent3db936aaf8797c2278755645b8a746fb20ed03bd (diff)
downloadchromium_src-eff55bbd1aadf352a00626c7245e063e1145db39.zip
chromium_src-eff55bbd1aadf352a00626c7245e063e1145db39.tar.gz
chromium_src-eff55bbd1aadf352a00626c7245e063e1145db39.tar.bz2
Make the width of overlay pages flexible.
Before the change, overlays take up the whole width of the page except padding, thus overlays are very wide. With this change, overlays only take up the width that is necessary to show the contents inside. The individual overlays can control the width using CSS as needed. If you want the original behavior (taking up the whole width), you could add "-webkit-box-flex: 1" to the overlay's CSS. If you want to set a fixed width, you could add something like "width: 600px" in the overlay's CSS. Note that the ability to set the fixed with is necessary to follow a suggestion from Cole regarding the size of the overlay for adding languages. See before.png and after.png in crosbug.com/4573 for details. TEST=manually BUG=chromium-os:4573 Review URL: http://codereview.chromium.org/3056042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/options.html18
-rw-r--r--chrome/browser/resources/options/options_page.css7
2 files changed, 13 insertions, 12 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 029f37e..bf65369 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -161,16 +161,14 @@ window.onpopstate = function(e) {
<div class="header">
</div>
<div id="overlay" class="overlay hidden">
- <div id="overlayview">
- <include src="options/add_startup_page_overlay.html">
- <include src="options/clear_browser_data_overlay.html">
- <include src="options/font_settings_overlay.html">
- <include src="options/import_data_overlay.html">
- <include src="options/stop_syncing_overlay.html">
- <if expr="pp_ifdef('chromeos')">
- <include src="options/chromeos_language_add_language_overlay.html">
- </if>
- </div>
+ <include src="options/add_startup_page_overlay.html">
+ <include src="options/clear_browser_data_overlay.html">
+ <include src="options/font_settings_overlay.html">
+ <include src="options/import_data_overlay.html">
+ <include src="options/stop_syncing_overlay.html">
+ <if expr="pp_ifdef('chromeos')">
+ <include src="options/chromeos_language_add_language_overlay.html">
+ </if>
</div>
<div id="main-content">
<div id="navbar-container">
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 901dc5b..180eeaf 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -32,6 +32,9 @@ body {
bottom: 0;
z-index: 10;
padding: 20px;
+ display: -webkit-box;
+ -webkit-box-align: start;
+ -webkit-box-pack: center;
}
#close-overlay {
@@ -51,11 +54,11 @@ html[dir='rtl'] #close-overlay {
left: -20px;
}
-#overlayview .button-strip {
+.overlay .button-strip {
text-align: end;
}
-#overlayview {
+.overlay > div {
background: white;
border-radius: 5px;
padding: 30px;