Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(262)

Side by Side Diff: chrome/browser/resources/settings/settings_menu/settings_menu.html

Issue 2651293003: Make MD Settings side bar keyboard accessible. (Closed)
Patch Set: Selectable Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/assert.html"> 2 <link rel="import" href="chrome://resources/html/assert.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-menu.h tml">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-menu/paper-submen u.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html">
8 <link rel="import" href="/icons.html"> 7 <link rel="import" href="/icons.html">
9 <link rel="import" href="/route.html"> 8 <link rel="import" href="/route.html">
10 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
11 10
12 <dom-module id="settings-menu"> 11 <dom-module id="settings-menu">
13 <template> 12 <template>
14 <style include="settings-shared"> 13 <style include="settings-shared">
15 #about-menu[about-selected] { 14 #about-menu[about-selected] {
16 color: var(--google-blue-700); 15 color: var(--google-blue-700);
17 } 16 }
18 17
19 iron-icon { 18 iron-icon {
20 --iron-icon-fill-color: var(--settings-nav-grey); 19 --iron-icon-fill-color: var(--settings-nav-grey);
21 -webkit-margin-end: 24px; 20 -webkit-margin-end: 24px;
22 } 21 }
23 22
23 .menu-trigger > iron-icon {
24 -webkit-margin-end: 22px; /* 24px - 2px from margin for outline. */
25 }
26
27 paper-button span {
28 -webkit-margin-end: 16px;
29 flex: 1;
30 }
31
24 .iron-selected:not(.menu-trigger) > iron-icon { 32 .iron-selected:not(.menu-trigger) > iron-icon {
25 fill: var(--google-blue-700); 33 fill: var(--google-blue-700);
26 } 34 }
27 35
28 .menu-trigger span { 36 paper-menu {
29 -webkit-margin-end: 16px; 37 padding: 0;
30 flex: 1;
31 } 38 }
32 39
33 paper-menu { 40 paper-button {
34 --paper-menu-selected-item: { 41 @apply(--settings-actionable);
42 --paper-menu-focused-item: {
43 outline: auto 5px -webkit-focus-ring-color;
44 };
45 --paper-button-flat-keyboard-focus: {
46 background: none;
35 font-weight: 500; 47 font-weight: 500;
36 }; 48 };
37 --paper-menu-focused-item-after: { 49 --paper-menu-focused-item-after: {
38 background: none; 50 background: none;
39 }; 51 };
52 --paper-menu-selected-item: {
53 color: var(--settings-nav-grey);
54 font-weight: 500;
55 };
56 -webkit-margin-end: 2px; /* Margin so selected outline is visible. */
57 -webkit-margin-start: 1px;
40 color: var(--settings-nav-grey); 58 color: var(--settings-nav-grey);
41 font-size: 100%; 59 display: flex;
42 padding: 0; 60 padding: 0;
43 } 61 }
44 62
45 div[data-path] {
46 @apply(--settings-actionable);
47 }
48
49 #basicPage { 63 #basicPage {
50 margin-top: 8px; 64 margin-top: 8px;
51 } 65 }
52 66
53 .page-menu > div { 67 .page-menu > paper-button {
68 -webkit-padding-end: 0;
54 margin-top: 8px; 69 margin-top: 8px;
55 } 70 }
56 71
57 .page-menu {
58 --paper-menu-selected-item: {
59 font-weight: 500;
60 };
61 }
62
63 paper-menu div {
64 position: relative; /* Needed for paper-ripple. */
65 }
66
67 paper-ripple {
68 color: var(--google-blue-700);
69 opacity: .5;
70 }
71
72 .page-menu paper-menu { 72 .page-menu paper-menu {
73 --paper-menu-selected-item: { 73 --paper-menu-selected-item: {
74 color: var(--google-blue-700); 74 color: var(--google-blue-700);
75 font-weight: 500; 75 font-weight: 500;
76 }; 76 };
77 } 77 }
78 78
79 .page-menu div { 79 .page-menu paper-button {
80 -webkit-padding-start: 24px; 80 -webkit-padding-start: 23px; /* 24px - 1px from margin for outline. */
81 align-items: center;
82 display: flex;
83 font-size: 100%; 81 font-size: 100%;
84 font-weight: 500; 82 font-weight: 500;
85 min-height: 40px; 83 min-height: 40px;
84 text-transform: none;
86 word-break: break-word; 85 word-break: break-word;
87 } 86 }
88 87
89 .page-menu div iron-icon {
90 flex-shrink: 0;
91 }
92
93 .separator { 88 .separator {
94 /* Per Alan@, this line is different from the other separator lines. */ 89 /* Per Alan@, this line is different from the other separator lines. */
95 border-bottom: 1px solid rgba(0, 0, 0, 0.08); 90 border-bottom: 1px solid rgba(0, 0, 0, 0.08);
96 margin-top: 8px; 91 margin-top: 8px;
97 } 92 }
98 </style> 93 </style>
99 <paper-menu name="root-menu"> 94 <div class="page-menu" id="basicPage">
100 <div class="page-menu" id="basicPage"> 95 <paper-menu attr-for-selected="data-path" class="menu-content"
101 <paper-menu attr-for-selected="data-path" class="menu-content" 96 id="basicMenu" selected="[[currentRoute.path]]">
102 id="basicMenu" selected="[[currentRoute.path]]">
103 <if expr="chromeos"> 97 <if expr="chromeos">
104 <div data-path="/internet" on-tap="openPage_"> 98 <paper-button data-path="/internet" on-tap="openPage_">
dschuyler 2017/01/27 00:25:28 How much of a performance difference is there from
hcarmona 2017/01/27 22:54:51 Ok, ran Tommy's testing and change is negligible a
hcarmona 2017/01/30 19:01:43 Tested on my beefy dev machine and without change
hcarmona 2017/02/01 00:39:48 Changed to action-link and removed ripple after ou
105 <iron-icon icon="settings:network-wifi"></iron-icon> 99 <iron-icon icon="settings:network-wifi"></iron-icon>
106 $i18n{internetPageTitle} 100 <span>$i18n{internetPageTitle}</span>
107 </div> 101 </paper-button>
108 </if> 102 </if>
109 <div id="people" data-path="/people" on-tap="openPage_" 103 <paper-button id="people" data-path="/people" on-tap="openPage_"
110 hidden="[[!pageVisibility.people]]"> 104 hidden="[[!pageVisibility.people]]">
111 <iron-icon icon="settings:people"></iron-icon> 105 <iron-icon icon="settings:people"></iron-icon>
112 $i18n{peoplePageTitle} 106 <span>$i18n{peoplePageTitle}</span>
113 </div> 107 </paper-button>
114 <div data-path="/appearance" on-tap="openPage_" 108 <paper-button data-path="/appearance" on-tap="openPage_"
115 hidden="[[!pageVisibility.appearance]]"> 109 hidden="[[!pageVisibility.appearance]]">
116 <iron-icon icon="settings:palette"></iron-icon> 110 <iron-icon icon="settings:palette"></iron-icon>
117 $i18n{appearancePageTitle} 111 <span>$i18n{appearancePageTitle}</span>
118 </div> 112 </paper-button>
119 <if expr="chromeos"> 113 <if expr="chromeos">
120 <div data-path="/device" on-tap="openPage_"> 114 <paper-button data-path="/device" on-tap="openPage_">
121 <iron-icon icon="settings:laptop-chromebook"></iron-icon> 115 <iron-icon icon="settings:laptop-chromebook"></iron-icon>
122 $i18n{devicePageTitle} 116 <span>$i18n{devicePageTitle}</span>
123 </div> 117 </paper-button>
124 </if> 118 </if>
125 <div data-path="/search" on-tap="openPage_"> 119 <paper-button data-path="/search" on-tap="openPage_">
126 <iron-icon icon="cr:search"></iron-icon> 120 <iron-icon icon="cr:search"></iron-icon>
127 $i18n{searchPageTitle} 121 <span>$i18n{searchPageTitle}</span>
128 </div> 122 </paper-button>
129 <if expr="chromeos"> 123 <if expr="chromeos">
130 <div data-path="/androidApps" on-tap="openPage_" 124 <paper-button data-path="/androidApps" on-tap="openPage_"
131 hidden="[[!showAndroidApps]]"> 125 hidden="[[!showAndroidApps]]">
132 <iron-icon icon="settings:android"></iron-icon> 126 <iron-icon icon="settings:android"></iron-icon>
133 $i18n{androidAppsPageTitle} 127 <span>$i18n{androidAppsPageTitle}</span>
134 </div> 128 </paper-button>
135 </if> 129 </if>
136 <if expr="not chromeos"> 130 <if expr="not chromeos">
137 <div data-path="/defaultBrowser" on-tap="openPage_" 131 <paper-button data-path="/defaultBrowser" on-tap="openPage_"
138 hidden="[[!pageVisibility.defaultBrowser]]"> 132 hidden="[[!pageVisibility.defaultBrowser]]">
139 <iron-icon icon="settings:web"></iron-icon> 133 <iron-icon icon="settings:web"></iron-icon>
140 $i18n{defaultBrowser} 134 <span>$i18n{defaultBrowser}</span>
141 </div> 135 </paper-button>
142 </if> 136 </if>
143 <div data-path="/onStartup" on-tap="openPage_" 137 <paper-button data-path="/onStartup" on-tap="openPage_"
144 hidden="[[!pageVisibility.onStartup]]"> 138 hidden="[[!pageVisibility.onStartup]]">
145 <iron-icon icon="settings:power-settings-new"></iron-icon> 139 <iron-icon icon="settings:power-settings-new"></iron-icon>
146 $i18n{onStartup} 140 <span>$i18n{onStartup}</span>
147 </div> 141 </paper-button>
148 </paper-menu> 142 </paper-menu>
149 </div>
150 <paper-submenu class="page-menu" id="advancedSubmenu" actionable 143 <paper-submenu class="page-menu" id="advancedSubmenu" actionable
151 opened="{{advancedOpened}}" 144 opened="{{advancedOpened}}"
152 hidden="[[!pageVisibility.advancedSettings]]"> 145 hidden="[[!pageVisibility.advancedSettings]]">
153 <div class="menu-trigger"> 146 <paper-button class="menu-trigger" tabindex="0">
154 <span>$i18n{advancedPageTitle}</span> 147 <span>$i18n{advancedPageTitle}</span>
155 <iron-icon icon="[[arrowState_(advancedOpened)]]"></iron-icon> 148 <iron-icon icon="[[arrowState_(advancedOpened)]]"></iron-icon>
156 <paper-ripple></paper-ripple> 149 </paper-button>
157 </div>
158 <paper-menu attr-for-selected="data-path" class="menu-content" 150 <paper-menu attr-for-selected="data-path" class="menu-content"
159 id="advancedMenu" selected="[[currentRoute.path]]"> 151 id="advancedMenu" selected="[[currentRoute.path]]">
160 <if expr="chromeos"> 152 <if expr="chromeos">
161 <div data-path="/dateTime" on-tap="openPage_"> 153 <paper-button data-path="/dateTime" on-tap="openPage_">
162 <iron-icon icon="settings:access-time"></iron-icon> 154 <iron-icon icon="settings:access-time"></iron-icon>
163 $i18n{dateTimePageTitle} 155 <span>$i18n{dateTimePageTitle}</span>
164 </div> 156 </paper-button>
165 </if> 157 </if>
166 <div data-path="/privacy" on-tap="openPage_"> 158 <paper-button data-path="/privacy" on-tap="openPage_">
167 <iron-icon icon="settings:security"></iron-icon> 159 <iron-icon icon="settings:security"></iron-icon>
168 $i18n{privacyPageTitle} 160 <span>$i18n{privacyPageTitle}</span>
169 </div> 161 </paper-button>
170 <if expr="chromeos"> 162 <if expr="chromeos">
171 <div data-path="/bluetooth" on-tap="openPage_"> 163 <paper-button data-path="/bluetooth" on-tap="openPage_">
172 <iron-icon icon="settings:bluetooth"></iron-icon> 164 <iron-icon icon="settings:bluetooth"></iron-icon>
173 $i18n{bluetoothPageTitle} 165 <span>$i18n{bluetoothPageTitle}</span>
174 </div> 166 </paper-button>
175 </if> 167 </if>
176 <div data-path="/passwordsAndForms" on-tap="openPage_" 168 <paper-button data-path="/passwordsAndForms" on-tap="openPage_"
177 hidden="[[!pageVisibility.passwordsAndForms]]"> 169 hidden="[[!pageVisibility.passwordsAndForms]]">
178 <iron-icon icon="settings:assignment"></iron-icon> 170 <iron-icon icon="settings:assignment"></iron-icon>
179 $i18n{passwordsAndAutofillPageTitle} 171 <span>$i18n{passwordsAndAutofillPageTitle}</span>
180 </div> 172 </paper-button>
181 <div data-path="/languages" on-tap="openPage_"> 173 <paper-button data-path="/languages" on-tap="openPage_">
182 <iron-icon icon="settings:language"></iron-icon> 174 <iron-icon icon="settings:language"></iron-icon>
183 $i18n{languagesPageTitle} 175 <span>$i18n{languagesPageTitle}</span>
184 </div> 176 </paper-button>
185 <div data-path="/downloads" on-tap="openPage_"> 177 <paper-button data-path="/downloads" on-tap="openPage_">
186 <iron-icon icon="cr:file-download"></iron-icon> 178 <iron-icon icon="cr:file-download"></iron-icon>
187 $i18n{downloadsPageTitle} 179 <span>$i18n{downloadsPageTitle}</span>
188 </div> 180 </paper-button>
189 <div data-path="/printing" on-tap="openPage_"> 181 <paper-button data-path="/printing" on-tap="openPage_">
190 <iron-icon icon="cr:print"></iron-icon> 182 <iron-icon icon="cr:print"></iron-icon>
191 $i18n{printingPageTitle} 183 <span>$i18n{printingPageTitle}</span>
192 </div> 184 </paper-button>
193 <div data-path="/accessibility" on-tap="openPage_"> 185 <paper-button data-path="/accessibility" on-tap="openPage_">
194 <iron-icon icon="settings:accessibility"></iron-icon> 186 <iron-icon icon="settings:accessibility"></iron-icon>
195 $i18n{a11yPageTitle} 187 <span>$i18n{a11yPageTitle}</span>
196 </div> 188 </paper-button>
197 <if expr="not chromeos"> 189 <if expr="not chromeos">
198 <div data-path="/system" on-tap="openPage_"> 190 <paper-button data-path="/system" on-tap="openPage_">
199 <iron-icon icon="settings:build"></iron-icon> 191 <iron-icon icon="settings:build"></iron-icon>
200 $i18n{systemPageTitle} 192 <span>$i18n{systemPageTitle}</span>
201 </div> 193 </paper-button>
202 </if> 194 </if>
203 <div data-path="/reset" on-tap="openPage_" 195 <paper-button data-path="/reset" on-tap="openPage_"
204 hidden="[[!pageVisibility.reset]]"> 196 hidden="[[!pageVisibility.reset]]">
205 <iron-icon icon="settings:restore"></iron-icon> 197 <iron-icon icon="settings:restore"></iron-icon>
206 $i18n{resetPageTitle} 198 <span>$i18n{resetPageTitle}</span>
207 </div> 199 </paper-button>
208 </paper-menu> 200 </paper-menu>
209 </paper-submenu> 201 </paper-submenu>
210 <div class="separator"></div> 202 </div>
211 <paper-submenu class="page-menu"> 203 <div class="separator"></div>
212 <div about-selected$="[[aboutSelected_]]" class="menu-trigger" 204 <paper-menu class="page-menu">
213 id="about-menu" on-tap="openPage_" data-path="/help"> 205 <paper-button about-selected$="[[aboutSelected_]]"
214 $i18n{aboutPageTitle} 206 id="about-menu" on-tap="openPage_" data-path="/help">
215 </div> 207 <span>$i18n{aboutPageTitle}</span>
216 </paper-submenu> 208 </paper-button>
217 </paper-menu> 209 </paper-menu>
218 </template> 210 </template>
219 <script src="settings_menu.js"></script> 211 <script src="settings_menu.js"></script>
220 </dom-module> 212 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698