diff options
4 files changed, 90 insertions, 53 deletions
diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html index e20d988..79a170d 100644 --- a/chrome/browser/resources/options/advanced_options.html +++ b/chrome/browser/resources/options/advanced_options.html @@ -32,7 +32,6 @@ </if> </div> </section> -<if expr="not pp_ifdef('chromeos')"> <section> <h3 i18n-content="advancedSectionTitleNetwork"></h3> <div> @@ -41,7 +40,6 @@ i18n-content="proxiesConfigureButton"></button> </div> </section> -</if> <section> <h3 i18n-content="advancedSectionTitleTranslate"></h3> <div> diff --git a/chrome/browser/resources/options/content_settings.html b/chrome/browser/resources/options/content_settings.html index 2743512..c5911b7 100644 --- a/chrome/browser/resources/options/content_settings.html +++ b/chrome/browser/resources/options/content_settings.html @@ -8,18 +8,18 @@ <!-- Navigation tabs --> <div id="content-settings-nav-tabs"> <span i18n-content="cookies_tab_label" id="cookies-nav-tab" - class="inactive-tab" tab-contents="cookiesFilterTab"></span> - <span i18n-content="images_tab_label" id="images-nav-tab" - class="inactive-tab" tab-contents="imagesFilterTab"></span> - <span i18n-content="javascript_tab_label" id="javascript-nav-tab" - class="inactive-tab" tab-contents="javascriptFilterTab"></span> - <span i18n-content="plugins_tab_label" id="plugins-nav-tab" - class="inactive-tab" tab-contents="pluginsFilterTab"></span> - <span i18n-content="popups_tab_label" id="popups-nav-tab" - class="inactive-tab" tab-contents="popupsFilterTab"></span> - <span i18n-content="location_tab_label" id="location-nav-tab" - class="inactive-tab" tab-contents="locationFilterTab"></span> - <span i18n-content="notifications_tab_label" id="notifications-nav-tab" + class="inactive-tab" tab-contents="cookiesFilterTab"></span><span + i18n-content="images_tab_label" id="images-nav-tab" + class="inactive-tab" tab-contents="imagesFilterTab"></span><span + i18n-content="javascript_tab_label" id="javascript-nav-tab" + class="inactive-tab" tab-contents="javascriptFilterTab"></span><span + i18n-content="plugins_tab_label" id="plugins-nav-tab" + class="inactive-tab" tab-contents="pluginsFilterTab"></span><span + i18n-content="popups_tab_label" id="popups-nav-tab" + class="inactive-tab" tab-contents="popupsFilterTab"></span><span + i18n-content="location_tab_label" id="location-nav-tab" + class="inactive-tab" tab-contents="locationFilterTab"></span><span + i18n-content="notifications_tab_label" id="notifications-nav-tab" class="inactive-tab" tab-contents="notificationsFilterTab"></span> </div> <br> diff --git a/chrome/browser/resources/options/content_settings_page.css b/chrome/browser/resources/options/content_settings_page.css index 239093e..08facfb 100644 --- a/chrome/browser/resources/options/content_settings_page.css +++ b/chrome/browser/resources/options/content_settings_page.css @@ -5,16 +5,31 @@ found in the LICENSE file. */ #content-settings-nav-tabs .inactive-tab { - background-color: #FFFFFF; + background: -webkit-gradient(linear, + left top, + left bottom, + from(white), + to(#f3f3f3)); + border-bottom: 1px solid #a0a0a0; + padding: 4px 8px; } #content-settings-nav-tabs .active-tab { - background-color: #DFDFDF; + background: white; + border: 1px solid #a0a0a0; + border-bottom: 0; + -webkit-border-top-left-radius: 3px; + -webkit-border-top-right-radius: 3px; font-weight: bold; } +#content-settings-nav-tabs { + margin-bottom: 15px; +} + .content-settings-tab-contents { display: none; + -webkit-padding-start: 10px; } .active-tab-contents { diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index d268ada..21062f1 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -1,10 +1,17 @@ +body { + font-size: 100%; + -webkit-user-select: none; +} + #settings-title { - height: 30px; - -webkit-padding-end: 15px; - padding-top: 20px; + -webkit-padding-end: 24px; + padding-top: 1em; + padding-bottom: 1em; text-align: end; - font-size: 140%; - color: #c7c7c7; + font-size: 125%; + font-weight: normal; + color: #53627d; + margin: 0; } #main-content { @@ -54,20 +61,23 @@ html[dir='rtl'] #close-overlay { padding: 30px; } +#navbar { + margin: 0; +} + #navbar-container { background: -webkit-gradient(linear, left top, left bottom, - from(rgba(255,255,255,0)), - color-stop(0.7, rgba(255,255,255,0)), - to(white)), + from(rgba(234, 238, 243, 0)), + to(#eaeef3)), -webkit-gradient(linear, left top, right top, - from(white), - color-stop(0.8, white), - to(#f3f3f3)); - -webkit-border-end: 1px solid #dbdbdb; + from(#eaeef3), + color-stop(0.97, #eaeef3), + to(#d3d7db)); + -webkit-border-end: 1px solid #c6c9ce; cursor: pointer; position: relative; width: 250px; @@ -77,8 +87,8 @@ html[dir='rtl'] #navbar-container { background: -webkit-gradient(linear, left top, left bottom, - from(rgba(255,255,255,0)), - color-stop(0.7, rgba(255,255,255,0)), + from(rgba(255, 255, 255, 0)), + color-stop(0.7, rgba(255, 255, 255, 0)), to(white)), -webkit-gradient(linear, right top, @@ -97,20 +107,30 @@ html[dir='rtl'] #navbar-container { } .navbar-item, .navbar-item2 { - padding-top: 10px; - padding-bottom: 10px; - -webkit-padding-end: 20px; + padding: 0.5em 0; + -webkit-padding-end: 24px; text-align: end; - display: block + display: block; + color: #426dc9; } .navbar-item-selected { - background: -webkit-gradient(linear, left top, right top, from(white), to(#d6def3)); + background: -webkit-gradient(linear, + left top, + right top, + from(#eaeef3), + color-stop(0.97, #b4c8ea), + to(#a2b5b4)); font-weight: bold; + color: black; } html[dir='rtl'] .navbar-item-selected { - background: -webkit-gradient(linear, right top, left top, from(white), to(#d6def3)); + background: -webkit-gradient(linear, + right top, + left top, + from(white), + to(#d6def3)); } .navbar-item-normal { @@ -120,42 +140,46 @@ html[dir='rtl'] .navbar-item-selected { #mainview { -webkit-box-align: stretch; width: 600px; - padding: 10px; + padding: 0px 24px 24px; position: relative; } .page > h1 { - height: 30px; - -webkit-padding-end: 15px; - padding-top: 12px; - -webkit-padding-start: 15px; - font-size: 140%; - color: #7c90d8; + -webkit-padding-end: 24px; + padding-top: 1em; + padding-bottom: 1em; + border-bottom: 1px solid #eeeeee; + -webkit-padding-start: 0; + font-size: 125%; + color: #54637f; + margin: 0; } section { - margin-top: 10px; - border-bottom: 1px solid #ededed; - padding-bottom: 10px; display: -webkit-box; -webkit-box-orient: horizontal; + border-bottom: 1px solid #eeeeee; + margin-top: 1em; + margin-bottom: 1em; + padding-bottom: 0.5em; } section > h3 { - font-weight: bold; - width: 150px; - font-size: 75%; - -webkit-padding-start: 15px; + width: 100px; + font-weight: normal; + -webkit-padding-start: 0; vertical-align: top; + margin: 0; + font-size: 100%; } .option { - margin-top: 5px; + margin-top: 0; } .option-control-table, section > div:only-of-type { - margin-top: 5px; -webkit-padding-start: 10px; + border-spacing: 0px 0px; } .suboption { @@ -178,7 +202,7 @@ section > div:only-of-type label { } input[type="checkbox"] { - margin-top: 6px; + margin-top: 0; } .link-button { |