diff options
17 files changed, 70 insertions, 80 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index 96a9033..e811c3b 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -256,6 +256,8 @@ function load() { // Allow platform specific CSS rules. if (cr.isMac) document.documentElement.setAttribute('os', 'mac'); + if (cr.isViews) + document.documentElement.setAttribute('toolkit', 'views'); var end = new Date(); var total = end - start; diff --git a/chrome/browser/resources/options/add_startup_page_overlay.css b/chrome/browser/resources/options/add_startup_page_overlay.css index 54d367e..a863eb6 100644 --- a/chrome/browser/resources/options/add_startup_page_overlay.css +++ b/chrome/browser/resources/options/add_startup_page_overlay.css @@ -30,6 +30,6 @@ display: inline; } -#addStartupPageOverlay .button-strip { +#addStartupPageOverlay .action-area { margin-top: 2ex; } diff --git a/chrome/browser/resources/options/add_startup_page_overlay.html b/chrome/browser/resources/options/add_startup_page_overlay.html index c075547..c2f97d2 100644 --- a/chrome/browser/resources/options/add_startup_page_overlay.html +++ b/chrome/browser/resources/options/add_startup_page_overlay.html @@ -8,17 +8,11 @@ <list id="addStartupRecentPageList"></list> - <div class="button-strip"> - <if expr="os == 'win32'"> - <button type="submit" id="addStartupPageAddButton" disabled - i18n-content="addStartupPageAddButton"></button> - </if> + <div class="action-area button-strip"> <button type="reset" i18n-content="addStartupPageCancelButton"></button> - <if expr="os != 'win32'"> - <button type="submit" id="addStartupPageAddButton" disabled - i18n-content="addStartupPageAddButton"></button> - </if> + <button type="submit" id="addStartupPageAddButton" disabled + i18n-content="addStartupPageAddButton"></button> </div> </form> </div> diff --git a/chrome/browser/resources/options/alert_overlay.html b/chrome/browser/resources/options/alert_overlay.html index 3ab780d..7512077 100644 --- a/chrome/browser/resources/options/alert_overlay.html +++ b/chrome/browser/resources/options/alert_overlay.html @@ -1,13 +1,8 @@ <div class="page hidden" id="alertOverlay"> <h1 id="alertOverlayTitle"></h1> <div id="alertOverlayMessage"></div> - <div class="button-strip"> - <if expr="os != 'darwin'"> - <button type="submit" id="alertOverlayOk"></button> - </if> + <div class="action-area button-strip"> <button type="reset" id="alertOverlayCancel"></button> - <if expr="os == 'darwin'"> - <button type="submit" id="alertOverlayOk"></button> - </if> + <button type="submit" id="alertOverlayOk"></button> </div> </div> diff --git a/chrome/browser/resources/options/autofill_edit_address_overlay.html b/chrome/browser/resources/options/autofill_edit_address_overlay.html index be05cd3..9528ccf 100644 --- a/chrome/browser/resources/options/autofill_edit_address_overlay.html +++ b/chrome/browser/resources/options/autofill_edit_address_overlay.html @@ -94,16 +94,10 @@ </label> </div> - <div class="button-strip"> - <if expr="os == 'win32'"> - <button type="submit" id="autoFillEditAddressApplyButton" disabled - i18n-content="ok"></button> - </if> + <div class="action-area button-strip"> <button type="reset" id="autoFillEditAddressCancelButton" - i18n-content="cancel"></button> - <if expr="os != 'win32'"> - <button type="submit" id="autoFillEditAddressApplyButton" disabled - i18n-content="ok"></button> - </if> + i18n-content="cancel"></button> + <button type="submit" id="autoFillEditAddressApplyButton" disabled + i18n-content="ok"></button> </div> </div> diff --git a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html index 32d2aba..6b2f30d 100644 --- a/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html +++ b/chrome/browser/resources/options/autofill_edit_creditcard_overlay.html @@ -23,16 +23,10 @@ </label> </div> - <div class="button-strip"> - <if expr="os == 'win32'"> - <button type="submit" id="autoFillEditCreditCardApplyButton" disabled - i18n-content="ok"></button> - </if> + <div class="action-area button-strip"> <button type="reset" id="autoFillEditCreditCardCancelButton" i18n-content="cancel"></button> - <if expr="os != 'win32'"> - <button type="submit" id="autoFillEditCreditCardApplyButton" disabled - i18n-content="ok"></button> - </if> + <button type="submit" id="autoFillEditCreditCardApplyButton" disabled + i18n-content="ok"></button> </div> </div> diff --git a/chrome/browser/resources/options/certificate_backup_overlay.html b/chrome/browser/resources/options/certificate_backup_overlay.html index 0565e05..c5b5a18 100644 --- a/chrome/browser/resources/options/certificate_backup_overlay.html +++ b/chrome/browser/resources/options/certificate_backup_overlay.html @@ -32,11 +32,11 @@ <span i18n-content="certificateExportPasswordHelp"></span> </p> - <div class="button-strip"> - <button type="submit" id="certificateBackupOkButton" - i18n-content="ok" disabled></button> + <div class="action-area button-strip"> <button type="reset" id="certificateBackupCancelButton" i18n-content="cancel"></button> + <button type="submit" id="certificateBackupOkButton" + i18n-content="ok" disabled></button> </div> </div> diff --git a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html index 561c88e..e3e5f6f 100644 --- a/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html +++ b/chrome/browser/resources/options/certificate_edit_ca_trust_overlay.html @@ -22,10 +22,10 @@ </label> </p> - <div class="button-strip"> - <button type="submit" id="certificateEditCaTrustOkButton" - i18n-content="ok"></button> + <div class="action-area button-strip"> <button type="reset" id="certificateEditCaTrustCancelButton" i18n-content="cancel"></button> + <button type="submit" id="certificateEditCaTrustOkButton" + i18n-content="ok"></button> </div> </div> diff --git a/chrome/browser/resources/options/certificate_import_error_overlay.html b/chrome/browser/resources/options/certificate_import_error_overlay.html index 5ff4b5b..b686920 100644 --- a/chrome/browser/resources/options/certificate_import_error_overlay.html +++ b/chrome/browser/resources/options/certificate_import_error_overlay.html @@ -2,7 +2,7 @@ <h1 id="certificateImportErrorOverlayTitle"></h1> <div id="certificateImportErrorOverlayMessage"></div> <ul id="certificateImportErrorOverlayCertErrors"></ul> - <div class="button-strip"> + <div class="action-area button-strip"> <button type="submit" id="certificateImportErrorOverlayOk" i18n-content="ok"></button> </div> diff --git a/chrome/browser/resources/options/certificate_restore_overlay.html b/chrome/browser/resources/options/certificate_restore_overlay.html index 7985ff2..b584982 100644 --- a/chrome/browser/resources/options/certificate_restore_overlay.html +++ b/chrome/browser/resources/options/certificate_restore_overlay.html @@ -10,10 +10,10 @@ </label> </p> - <div class="button-strip"> - <button type="submit" id="certificateRestoreOkButton" - i18n-content="ok"></button> + <div class="action-area button-strip"> <button type="reset" id="certificateRestoreCancelButton" i18n-content="cancel"></button> + <button type="submit" id="certificateRestoreOkButton" + i18n-content="ok"></button> </div> </div> diff --git a/chrome/browser/resources/options/chromeos_internet_detail.html b/chrome/browser/resources/options/chromeos_internet_detail.html index de1dbf5..f738458 100644 --- a/chrome/browser/resources/options/chromeos_internet_detail.html +++ b/chrome/browser/resources/options/chromeos_internet_detail.html @@ -230,12 +230,12 @@ </table> </section> </div> - <div class="button-strip"> - <button id="detailsInternetLogin" - i18n-content="inetLogin"></button> - <button id="detailsInternetOk" - i18n-content="detailsInternetOk"></button> + <div class="action-area button-strip"> <button id="detailsInternetDismiss" i18n-content="detailsInternetDismiss"></button> + <button id="detailsInternetOk" + i18n-content="detailsInternetOk"></button> + <button id="detailsInternetLogin" + i18n-content="inetLogin"></button> </div> </div> diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index a6ae60f..7bf216a 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html @@ -44,19 +44,16 @@ <select id="clearBrowsingDataTimePeriod" pref="browser.clear_data.time_period"></select> </div> - <div class="button-strip"> + <div class="action-area"> <span id="cbdThrobber"></span> - <if expr="os == 'win32'"> + <div class="button-strip"> + <button id="clearBrowsingDataDismiss" i18n-content="cancel" + onclick="ClearBrowserDataOverlay.dismiss();"> + </button> <button id="clearBrowsingDataCommit" - i18n-content="clearBrowsingDataCommit"></button> - </if> - <button id="clearBrowsingDataDismiss" i18n-content="cancel" - onclick="ClearBrowserDataOverlay.dismiss();"> - </button> - <if expr="os != 'win32'"> - <button id="clearBrowsingDataCommit" - i18n-content="clearBrowsingDataCommit"></button> - </if> + i18n-content="clearBrowsingDataCommit"> + </button> + </div> </div> <hr> <a target="_blank" i18n-content="flash_storage_settings" diff --git a/chrome/browser/resources/options/edit_search_engine_overlay.css b/chrome/browser/resources/options/edit_search_engine_overlay.css index 8083af5..7cc2088 100644 --- a/chrome/browser/resources/options/edit_search_engine_overlay.css +++ b/chrome/browser/resources/options/edit_search_engine_overlay.css @@ -16,7 +16,7 @@ -webkit-box-sizing: border-box; } -#editSearchEngineOverlay .button-strip { +#editSearchEngineOverlay .action-area { margin-top: 2ex; } diff --git a/chrome/browser/resources/options/edit_search_engine_overlay.html b/chrome/browser/resources/options/edit_search_engine_overlay.html index 85f7096..19c425a 100644 --- a/chrome/browser/resources/options/edit_search_engine_overlay.html +++ b/chrome/browser/resources/options/edit_search_engine_overlay.html @@ -30,17 +30,11 @@ <td></td> </table> - <div class="button-strip"> - <if expr="os == 'win32'"> - <button type="submit" id="editSearchEngineOkayButton" disabled - i18n-content="editSearchEngineOkayButton"></button> - </if> + <div class="action-area button-strip"> <button type="reset" i18n-content="editSearchEngineCancelButton"></button> - <if expr="os != 'win32'"> - <button type="submit" id="editSearchEngineOkayButton" disabled - i18n-content="editSearchEngineOkayButton"></button> - </if> + <button type="submit" id="editSearchEngineOkayButton" disabled + i18n-content="editSearchEngineOkayButton"></button> </div> </form> </div> diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html index d0dd2c3..8607a0f 100644 --- a/chrome/browser/resources/options/import_data_overlay.html +++ b/chrome/browser/resources/options/import_data_overlay.html @@ -23,14 +23,11 @@ <label for="import-search" i18n-content="import_search"></label> </div> </div> - <div class="button-strip"> + <div class="action-area"> <span id="import-throbber"></span> - <if expr="os == 'win32'"> + <div class="button-strip"> + <button id="import-data-cancel" i18n-content="cancel"></button> <button id="import-data-commit" i18n-content="import_commit"></button> - </if> - <button id="import-data-cancel" i18n-content="cancel"></button> - <if expr="os != 'win32'"> - <button id="import-data-commit" i18n-content="import_commit"></button> - </if> + </div> </div> </div> diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index 3327f69..4aa545f 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -55,11 +55,28 @@ html[dir='rtl'] #close-overlay { left: -20px; } -.overlay .button-strip { +.action-area { padding: 12px; position: absolute; right: 0px; bottom: 0px; + display: -webkit-box; + -webkit-box-orient: horizontal; + -webkit-box-align: center; +} + +.button-strip { + display: -webkit-box; + -webkit-box-orient: horizontal; +} + +html[toolkit=views] .button-strip { + -webkit-box-direction: reverse; +} + +.button-strip > button { + display: block; + -webkit-margin-start: 4px; } .overlay > div { diff --git a/chrome/browser/resources/shared/js/cr.js b/chrome/browser/resources/shared/js/cr.js index 25ba498..a470234 100644 --- a/chrome/browser/resources/shared/js/cr.js +++ b/chrome/browser/resources/shared/js/cr.js @@ -23,6 +23,12 @@ const cr = (function() { const isChromeOS = /CrOS/.test(navigator.userAgent); /** + * Whether this uses the views toolkit or not. + * @type {boolean} + */ + const isViews = isWindows || isChromeOS; + + /** * Builds an object structure for the provided namespace path, * ensuring that names that already exist are not overwritten. For * example: |