summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 17:50:25 +0000
committerdpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 17:50:25 +0000
commit566aae7370507db35cc3791d0bebc83daadc5945 (patch)
treeb10136b1329d5dac8f36879271b351da21a82e8f /chrome
parent3f775ff98ef1a9585a3d1fc1ba2aad9a1d40c1ff (diff)
downloadchromium_src-566aae7370507db35cc3791d0bebc83daadc5945.zip
chromium_src-566aae7370507db35cc3791d0bebc83daadc5945.tar.gz
chromium_src-566aae7370507db35cc3791d0bebc83daadc5945.tar.bz2
Print Preview: Removing double column format in left pane header.
Removing unnecessary "To be printed" label and moving the print/ cancel buttons in the center. Also in this CL: 1) Restricting the width of the printer drop-down list. It was overflowing the available space when a printer with a long named existed (e.g. "Microsoft XPS Document Writer"). 2) Making print/cancel button size equal. 3) Removing localized string that is not used anymore. BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/6883292 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/generated_resources.grd3
-rw-r--r--chrome/browser/resources/print_preview.css29
-rw-r--r--chrome/browser/resources/print_preview.html3
-rw-r--r--chrome/browser/ui/webui/print_preview_ui_html_source.cc2
4 files changed, 16 insertions, 21 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d23bb08..e2d5c48 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5595,9 +5595,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PRINT_PREVIEW_SYSTEM_DIALOG_OPTION" desc="Option allowing the user to use the native print system dialog instead of printing through the print preview mechanism.">
Print using system dialog…
</message>
- <message name="IDS_PRINT_PREVIEW_TO_BE_PRINTED" desc="Label shown in front on the print summary.">
- To be printed
- </message>
<message name="IDS_PRINT_PREVIEW_PAGE_RANGE_INSTRUCTION" desc="Instruction shown when the user enters an invalid page range.">
Use page ranges, e.g. 1-5, 8, 11-13.
</message>
diff --git a/chrome/browser/resources/print_preview.css b/chrome/browser/resources/print_preview.css
index 9130c9b..deccc7eb 100644
--- a/chrome/browser/resources/print_preview.css
+++ b/chrome/browser/resources/print_preview.css
@@ -84,8 +84,6 @@ header {
}
body header {
- margin-bottom: -153px;
- min-height: 152px;
position: absolute;
}
@@ -118,6 +116,17 @@ body header > h1 {
position: relative;
}
+#print-header {
+ -webkit-padding-end: 16px;
+ font-size: 13px;
+ line-height: 22px;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ max-width: 616px;
+ position: relative;
+ text-align: center;
+}
+
p {
-webkit-line-box-contain: block;
margin: 0;
@@ -210,8 +219,6 @@ button.default {
border-color: #808080;
border-width: 2px;
font-weight: 600;
- padding-bottom: 7px;
- padding-top: 7px;
}
button.default:disabled {
@@ -267,12 +274,6 @@ button.active {
text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
}
-button.default:not(:disabled):not(.disabled):active,
-button.default.active {
- padding-bottom: 6px;
- padding-top: 8px;
-}
-
input[type='text'] + button {
-webkit-margin-start: 0;
}
@@ -500,6 +501,7 @@ select {
padding-bottom: 3px;
padding-top: 3px;
text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+ width: 100%;
}
html[dir='rtl'] select {
@@ -604,17 +606,16 @@ input[type='radio']:focus {
}
body #main:before {
- height: 152px;
+ height: 120px;
}
body #individual-pages {
width: 75%;
}
-body #print-summary {
+#print-summary {
display: block;
- height: 40px;
- margin-bottom: 20px;
+ height: 30px;
}
#collate-option {
diff --git a/chrome/browser/resources/print_preview.html b/chrome/browser/resources/print_preview.html
index c724940..a3786a1 100644
--- a/chrome/browser/resources/print_preview.html
+++ b/chrome/browser/resources/print_preview.html
@@ -16,8 +16,7 @@
<form id="controls">
<header>
<h1 i18n-content="title"></h1>
- <div class="two-column">
- <h1 i18n-content="toBePrinted"></h1>
+ <div id="print-header">
<span id="print-summary"></span>
<button id="print-button" i18n-content="printButton" class="default"
autofocus></button>
diff --git a/chrome/browser/ui/webui/print_preview_ui_html_source.cc b/chrome/browser/ui/webui/print_preview_ui_html_source.cc
index b91a187..75c7136 100644
--- a/chrome/browser/ui/webui/print_preview_ui_html_source.cc
+++ b/chrome/browser/ui/webui/print_preview_ui_html_source.cc
@@ -96,8 +96,6 @@ void SetLocalizedStrings(DictionaryValue* localized_strings) {
l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_PAGE_LABEL_PLURAL));
localized_strings->SetString(std::string("systemDialogOption"),
l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_SYSTEM_DIALOG_OPTION));
- localized_strings->SetString(std::string("toBePrinted"),
- l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_TO_BE_PRINTED));
localized_strings->SetString(std::string("pageRangeInstruction"),
l10n_util::GetStringUTF8(IDS_PRINT_PREVIEW_PAGE_RANGE_INSTRUCTION));
localized_strings->SetString(std::string("copiesInstruction"),