summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 19:28:05 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-18 19:28:05 +0000
commit09f8a991249547c790ce2ee3549cbd4685d8eefc (patch)
tree92ae4338b7cb69c6474c7b3e5226418613427c41 /chrome/browser/resources
parentae72fc3331cd109e409adfd47ae648f27c04d549 (diff)
downloadchromium_src-09f8a991249547c790ce2ee3549cbd4685d8eefc.zip
chromium_src-09f8a991249547c790ce2ee3549cbd4685d8eefc.tar.gz
chromium_src-09f8a991249547c790ce2ee3549cbd4685d8eefc.tar.bz2
DOMUI: Polish the navbar-container.
* Don't bold selected navbar-items. * Add transparent 1px border to unselected navbar-items to prevent shifting. * Clicking on the Settings title takes you to the 'Basics' page. * Only show the pointer when hovering navbar-items. * Fix navbar-container background in RTL. * Fix linear-gradient of navbar-item-selected. BUG=69721 TEST=none Review URL: http://codereview.chromium.org/6350005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/options/options.js5
-rw-r--r--chrome/browser/resources/options/options_page.css26
2 files changed, 12 insertions, 19 deletions
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index d1efac5..9ee3f88 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -171,6 +171,11 @@ function load() {
document.documentElement.setAttribute('toolkit', 'gtk');
if (cr.isViews)
document.documentElement.setAttribute('toolkit', 'views');
+
+ // Clicking on the Settings title brings up the 'Basics' page.
+ $('settings-title').onclick = function() {
+ OptionsPage.showPageByName(BrowserOptions.getInstance().name);
+ };
}
document.addEventListener('DOMContentLoaded', load);
diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css
index 29123cb..be6c6b1 100644
--- a/chrome/browser/resources/options/options_page.css
+++ b/chrome/browser/resources/options/options_page.css
@@ -6,6 +6,7 @@ body {
#settings-title {
-webkit-padding-end: 24px;
color: #53637d;
+ cursor: pointer;
font-size: 200%;
font-weight: normal;
margin: 0;
@@ -120,7 +121,6 @@ html[toolkit=views] .button-strip {
background: -webkit-linear-gradient(rgba(234, 238, 243, 0), #eaeef3),
-webkit-linear-gradient(left, #eaeef3, #eaeef3 97%, #d3d7db);
bottom: 0;
- cursor: pointer;
display: none;
left: 0;
position: fixed;
@@ -130,10 +130,8 @@ html[toolkit=views] .button-strip {
}
html[dir='rtl'] #navbar-container {
- background: -webkit-linear-gradient(rgba(255, 255, 255, 0)),
- rgba(255, 255, 255, 0) 70%,
- white),
- -webkit-linear-gradient(right, white, white 80%, #f3f3f3);
+ background: -webkit-linear-gradient(rgba(234, 238, 243, 0), #EAEEF3),
+ -webkit-linear-gradient(right, #EAEEF3, #EAEEF3 97%, #D3D7DB);
left: auto;
right: 0;
}
@@ -142,14 +140,6 @@ html[hide-menu=false] #navbar-container {
display: block;
}
-#navbar-container > hr {
- -webkit-margin-start: 35%;
- background-color: #dbdbdb;
- border: 0;
- height: 1px;
- width: 65%;
-}
-
#navbar-container > ul {
list-style-type: none;
margin: 0;
@@ -157,7 +147,10 @@ html[hide-menu=false] #navbar-container {
}
.navbar-item, .navbar-item2 {
+ border-bottom: 1px solid transparent;
+ border-top: 1px solid transparent;
color: #426dc9;
+ cursor: pointer;
display: block;
font-size: 105%;
outline: none;
@@ -167,15 +160,10 @@ html[hide-menu=false] #navbar-container {
}
.navbar-item-selected {
- background: #bbcee9;
+ background: -webkit-linear-gradient(left, #bbcee9, #bbcee9 97%, #96b1cd);
border-bottom: 1px solid #8faad9;
border-top: 1px solid #8faad9;
color: black;
- font-weight: bold;
-}
-
-.navbar-item-normal {
- background-color: #dfdfdf;
}
#mainview {