Commit 8b1b94bc authored by Michael Checo's avatar Michael Checo Committed by Commit Bot

Scanning: Style scan button and add localized string for button text

Screenshot: http://shortn/_OHS9E7XPgF

Bug: 1059779
Test: browser_tests --gtest_filter=ScanningAppBrowserTest.All
Change-Id: Ida6b9bccfeb781d353ccb944713e4c95b1735387
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2506304
Commit-Queue: Michael Checo <michaelcheco@google.com>
Reviewed-by: default avatarZentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823667}
parent 3365abc9
...@@ -516,6 +516,9 @@ Try tapping the mic to ask me anything. ...@@ -516,6 +516,9 @@ Try tapping the mic to ask me anything.
<message name="IDS_SCANNING_APP_SCAN_PREVIEW_HELPER_TEXT" desc="The text displayed in the scan preview that explains how to scan a document."> <message name="IDS_SCANNING_APP_SCAN_PREVIEW_HELPER_TEXT" desc="The text displayed in the scan preview that explains how to scan a document.">
Place your document, and click Scan to get started Place your document, and click Scan to get started
</message> </message>
<message name="IDS_SCANNING_APP_SCAN_BUTTON_TEXT" desc="The text displayed for the button that starts a scan.">
Scan
</message>
<!-- Diagnostics App --> <!-- Diagnostics App -->
<!-- TODO(michaelcheco): Update with finalized copies of the strings --> <!-- TODO(michaelcheco): Update with finalized copies of the strings -->
......
060cd6b0821e9366279825855946c1f925853044
\ No newline at end of file
...@@ -62,6 +62,12 @@ ...@@ -62,6 +62,12 @@
margin-bottom: var(--panel-container-margin-bottom); margin-bottom: var(--panel-container-margin-bottom);
margin-top: var(--panel-container-margin-top); margin-top: var(--panel-container-margin-top);
} }
.scan-button-container {
display: flex;
justify-content: flex-end;
width: 289px;
}
</style> </style>
<div id="scanningContainer"> <div id="scanningContainer">
<div class="panel-container"> <div class="panel-container">
...@@ -105,11 +111,12 @@ ...@@ -105,11 +111,12 @@
selected-resolution="{{selectedResolution}}"> selected-resolution="{{selectedResolution}}">
</resolution-select> </resolution-select>
</iron-collapse> </iron-collapse>
<!-- TODO(jschettler): Replace button label with finalized i18n string. --> <div class="scan-button-container">
<cr-button id="scanButton" on-click="onScanClick_" <cr-button id="scanButton" class="action-button" on-click="onScanClick_"
disabled$="[[scanButtonDisabled_]]"> disabled$="[[scanButtonDisabled_]]">
Scan [[i18n('scanButtonText')]]
</cr-button> </cr-button>
</div>
<p id="statusText">[[statusText_]]</p> <p id="statusText">[[statusText_]]</p>
</div> </div>
</div> </div>
...@@ -61,6 +61,7 @@ void AddScanningAppStrings(content::WebUIDataSource* html_source) { ...@@ -61,6 +61,7 @@ void AddScanningAppStrings(content::WebUIDataSource* html_source) {
{"pageSizeDropdownLabel", IDS_SCANNING_APP_PAGE_SIZE_DROPDOWN_LABEL}, {"pageSizeDropdownLabel", IDS_SCANNING_APP_PAGE_SIZE_DROPDOWN_LABEL},
{"resolutionDropdownLabel", IDS_SCANNING_APP_RESOLUTION_DROPDOWN_LABEL}, {"resolutionDropdownLabel", IDS_SCANNING_APP_RESOLUTION_DROPDOWN_LABEL},
{"resolutionOptionText", IDS_SCANNING_APP_RESOLUTION_OPTION_TEXT}, {"resolutionOptionText", IDS_SCANNING_APP_RESOLUTION_OPTION_TEXT},
{"scanButtonText", IDS_SCANNING_APP_SCAN_BUTTON_TEXT},
{"scanPreviewHelperText", IDS_SCANNING_APP_SCAN_PREVIEW_HELPER_TEXT}, {"scanPreviewHelperText", IDS_SCANNING_APP_SCAN_PREVIEW_HELPER_TEXT},
{"scanToDropdownLabel", IDS_SCANNING_APP_SCAN_TO_DROPDOWN_LABEL}, {"scanToDropdownLabel", IDS_SCANNING_APP_SCAN_TO_DROPDOWN_LABEL},
{"scannerDropdownLabel", IDS_SCANNING_APP_SCANNER_DROPDOWN_LABEL}, {"scannerDropdownLabel", IDS_SCANNING_APP_SCANNER_DROPDOWN_LABEL},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment