diff options
Diffstat (limited to 'chrome/browser/resources')
9 files changed, 62 insertions, 40 deletions
diff --git a/chrome/browser/resources/options/autofill_options.css b/chrome/browser/resources/options/autofill_options.css index 5320dd72..ab6376c 100644 --- a/chrome/browser/resources/options/autofill_options.css +++ b/chrome/browser/resources/options/autofill_options.css @@ -16,3 +16,8 @@ border-top: 1px solid #D9D9D9; padding: 5px 10px; } + +#autofill-add-address, +#autofill-add-creditcard { + margin: 2px 0; +} diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.css b/chrome/browser/resources/options/clear_browser_data_overlay.css index a6b970d..b21ea50 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.css +++ b/chrome/browser/resources/options/clear_browser_data_overlay.css @@ -12,6 +12,11 @@ found in the LICENSE file. margin: 5px 0; } +#clear-data-checkboxes { + -webkit-padding-start: 8px; + margin: 5px 0; +} + #cbdThrobber { background-image: url("../../../../app/resources/throbber.png"); display: inline-block; diff --git a/chrome/browser/resources/options/clear_browser_data_overlay.html b/chrome/browser/resources/options/clear_browser_data_overlay.html index 8b1c23e..0af25ef 100644 --- a/chrome/browser/resources/options/clear_browser_data_overlay.html +++ b/chrome/browser/resources/options/clear_browser_data_overlay.html @@ -7,36 +7,38 @@ pref="browser.clear_data.time_period" dataType="number"> </select> - <label class="checkbox"> - <input id="deleteBrowsingHistoryCheckbox" - pref="browser.clear_data.browsing_history" type="checkbox"> - <span i18n-content="deleteBrowsingHistoryCheckbox"></span> - </label> - <label class="checkbox"> - <input id="deleteDownloadHistoryCheckbox" - pref="browser.clear_data.download_history" type="checkbox"> - <span i18n-content="deleteDownloadHistoryCheckbox"></span> - </label> - <label class="checkbox"> - <input id="deleteCacheCheckbox" - pref="browser.clear_data.cache" type="checkbox"> - <span i18n-content="deleteCacheCheckbox"></span> - </label> - <label class="checkbox"> - <input id="deleteCookiesCheckbox" - pref="browser.clear_data.cookies" type="checkbox"> - <span id="deleteCookiesLabel"></span> - </label> - <label class="checkbox"> - <input id="deletePasswordsCheckbox" - pref="browser.clear_data.passwords" type="checkbox"> - <span i18n-content="deletePasswordsCheckbox"></span> - </label> - <label class="checkbox"> - <input id="deleteFormDataCheckbox" - pref="browser.clear_data.form_data" type="checkbox"> - <span i18n-content="deleteFormDataCheckbox"></span> - </label> + <div id="clear-data-checkboxes"> + <label class="checkbox"> + <input id="deleteBrowsingHistoryCheckbox" + pref="browser.clear_data.browsing_history" type="checkbox"> + <span i18n-content="deleteBrowsingHistoryCheckbox"></span> + </label> + <label class="checkbox"> + <input id="deleteDownloadHistoryCheckbox" + pref="browser.clear_data.download_history" type="checkbox"> + <span i18n-content="deleteDownloadHistoryCheckbox"></span> + </label> + <label class="checkbox"> + <input id="deleteCacheCheckbox" + pref="browser.clear_data.cache" type="checkbox"> + <span i18n-content="deleteCacheCheckbox"></span> + </label> + <label class="checkbox"> + <input id="deleteCookiesCheckbox" + pref="browser.clear_data.cookies" type="checkbox"> + <span id="deleteCookiesLabel"></span> + </label> + <label class="checkbox"> + <input id="deletePasswordsCheckbox" + pref="browser.clear_data.passwords" type="checkbox"> + <span i18n-content="deletePasswordsCheckbox"></span> + </label> + <label class="checkbox"> + <input id="deleteFormDataCheckbox" + pref="browser.clear_data.form_data" type="checkbox"> + <span i18n-content="deleteFormDataCheckbox"></span> + </label> + </div> </div> <div class="action-area"> <div> diff --git a/chrome/browser/resources/options/cookies_view.css b/chrome/browser/resources/options/cookies_view.css index 1fb0f12..3efe4e7 100644 --- a/chrome/browser/resources/options/cookies_view.css +++ b/chrome/browser/resources/options/cookies_view.css @@ -32,7 +32,6 @@ html[dir=ltr] .cookie-details-label { #cookiesTree { border: 1px solid lightgrey; - height: 200px; margin: 0; padding: 5px; } diff --git a/chrome/browser/resources/options/language_options.css b/chrome/browser/resources/options/language_options.css index 810076f..f79fc5d 100644 --- a/chrome/browser/resources/options/language_options.css +++ b/chrome/browser/resources/options/language_options.css @@ -1,6 +1,6 @@ .language-options { display: -webkit-box; - margin: 15px; + margin: 10px 0; } .language-options button { @@ -25,7 +25,7 @@ } .language-options-header, .language-options-footer { - margin: 15px; + margin: 10px 0; } .language-options-left, .language-options-right { diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index e7bec74..bb28065 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -521,7 +521,7 @@ html[dir=rtl].option-name { background-repeat: no-repeat; } -input.favicon-cell { +input[type="url"].favicon-cell { -webkit-padding-start: 22px; background-position-x: 4px; } @@ -577,7 +577,8 @@ html[os=mac] input[type='submit']:focus { /* TEXT */ input[type='password'], -input[type='text'] { +input[type='text'], +input[type='url']{ -webkit-border-radius: 2px; border: 1px solid #aaa; font-size: inherit; diff --git a/chrome/browser/resources/options/personal_options.css b/chrome/browser/resources/options/personal_options.css index af8bf83..74b65f2 100644 --- a/chrome/browser/resources/options/personal_options.css +++ b/chrome/browser/resources/options/personal_options.css @@ -14,6 +14,10 @@ margin-right: 5px; } +#themes-gallery-div { + margin: 10px 0; +} + .sync-error { background-color: #FF9A9A; } diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html index 2792c38..7e3a55e 100644 --- a/chrome/browser/resources/options/personal_options.html +++ b/chrome/browser/resources/options/personal_options.html @@ -85,8 +85,10 @@ <button id="themes-reset" i18n-content="themesSetClassic"></button> </div> - <a id="themes-gallery" i18n-content="themesGallery" - i18n-values="href:themesGalleryURL" target="_blank"></a> + <div id="themes-gallery-div"> + <a id="themes-gallery" i18n-content="themesGallery" + i18n-values="href:themesGalleryURL" target="_blank"></a> + </div> <label class="radio"> <input name="decorations_radio" pref="browser.custom_chrome_frame" @@ -109,8 +111,10 @@ <div> <button id="themes-reset" i18n-content="themesReset"></button> </div> - <a id="themes-gallery" i18n-content="themesGallery" - i18n-values="href:themesGalleryURL" target="_blank"></a> + <div id="themes-gallery-div"> + <a id="themes-gallery" i18n-content="themesGallery" + i18n-values="href:themesGalleryURL" target="_blank"></a> + </div> </div> </section> </if> diff --git a/chrome/browser/resources/options/search_engine_manager.css b/chrome/browser/resources/options/search_engine_manager.css index ed4fdf2..2568a0e 100644 --- a/chrome/browser/resources/options/search_engine_manager.css +++ b/chrome/browser/resources/options/search_engine_manager.css @@ -57,9 +57,11 @@ } .search-engine-list .url-column button { + -webkit-margin-start: 3px; + -webkit-margin-end: 5px; background: #8aaaed; color: #fff; - -webkit-margin-start: 3px; + margin-top: 0; } .search-engine-list > :not(:hover):not([editing]) .url-column button { |