OLD | NEW |
---|---|
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"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-ripple/paper-ripp le.html"> |
8 <link rel="import" href="/icons.html"> | 8 <link rel="import" href="/icons.html"> |
9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
(...skipping 20 matching lines...) Expand all Loading... | |
31 font-weight: 500; | 31 font-weight: 500; |
32 }; | 32 }; |
33 --paper-menu-focused-item-after: { | 33 --paper-menu-focused-item-after: { |
34 background: none; | 34 background: none; |
35 }; | 35 }; |
36 color: var(--settings-nav-grey); | 36 color: var(--settings-nav-grey); |
37 font-size: 13px; | 37 font-size: 13px; |
38 padding: 0; | 38 padding: 0; |
39 } | 39 } |
40 | 40 |
41 div[data-section] { | 41 div[data-path] { |
Dan Beam
2016/08/01 19:37:02
this used to make the advanced toggle cursor: poin
| |
42 @apply(--settings-actionable); | 42 @apply(--settings-actionable); |
43 } | 43 } |
44 | 44 |
45 #basicPage { | 45 #basicPage { |
46 margin-top: 8px; | 46 margin-top: 8px; |
47 } | 47 } |
48 | 48 |
49 .page-menu > div { | 49 .page-menu > div { |
50 margin-top: 8px; | 50 margin-top: 8px; |
51 } | 51 } |
(...skipping 29 matching lines...) Expand all Loading... | |
81 min-height: 40px; | 81 min-height: 40px; |
82 } | 82 } |
83 | 83 |
84 .separator { | 84 .separator { |
85 /* Per Alan@, this line is different from the other separator lines. */ | 85 /* Per Alan@, this line is different from the other separator lines. */ |
86 border-bottom: 1px solid rgba(0, 0, 0, 0.08); | 86 border-bottom: 1px solid rgba(0, 0, 0, 0.08); |
87 margin-top: 8px; | 87 margin-top: 8px; |
88 } | 88 } |
89 </style> | 89 </style> |
90 <paper-menu name="root-menu"> | 90 <paper-menu name="root-menu"> |
91 <div class="page-menu" data-page="basic" id="basicPage"> | 91 <div class="page-menu" id="basicPage"> |
92 <paper-menu attr-for-selected="data-section" class="menu-content" | 92 <paper-menu attr-for-selected="data-path" class="menu-content" |
93 data-page="basic" id="basicMenu"> | 93 id="basicMenu" selected="[[currentRoute.path]]"> |
94 <if expr="chromeos"> | 94 <if expr="chromeos"> |
95 <div data-section="internet" on-tap="openPage_"> | 95 <div data-path="/internet" on-tap="openPage_"> |
96 <iron-icon icon="settings:network-wifi"></iron-icon> | 96 <iron-icon icon="settings:network-wifi"></iron-icon> |
97 $i18n{internetPageTitle} | 97 $i18n{internetPageTitle} |
98 </div> | 98 </div> |
99 </if> | 99 </if> |
100 <div data-section="people" on-tap="openPage_" | 100 <div data-path="/people" on-tap="openPage_" |
101 hidden="[[!pageVisibility.people]]"> | 101 hidden="[[!pageVisibility.people]]"> |
102 <iron-icon icon="settings:people"></iron-icon> | 102 <iron-icon icon="settings:people"></iron-icon> |
103 $i18n{peoplePageTitle} | 103 $i18n{peoplePageTitle} |
104 </div> | 104 </div> |
105 <div data-section="appearance" on-tap="openPage_" | 105 <div data-path="/appearance" on-tap="openPage_" |
106 hidden="[[!pageVisibility.appearance]]"> | 106 hidden="[[!pageVisibility.appearance]]"> |
107 <iron-icon icon="settings:palette"></iron-icon> | 107 <iron-icon icon="settings:palette"></iron-icon> |
108 $i18n{appearancePageTitle} | 108 $i18n{appearancePageTitle} |
109 </div> | 109 </div> |
110 <if expr="chromeos"> | 110 <if expr="chromeos"> |
111 <div data-section="device" on-tap="openPage_"> | 111 <div data-path="/device" on-tap="openPage_"> |
112 <iron-icon icon="settings:laptop-chromebook"></iron-icon> | 112 <iron-icon icon="settings:laptop-chromebook"></iron-icon> |
113 $i18n{devicePageTitle} | 113 $i18n{devicePageTitle} |
114 </div> | 114 </div> |
115 </if> | 115 </if> |
116 <div data-section="search" on-tap="openPage_"> | 116 <div data-path="/search" on-tap="openPage_"> |
117 <iron-icon icon="cr:search"></iron-icon> | 117 <iron-icon icon="cr:search"></iron-icon> |
118 $i18n{searchPageTitle} | 118 $i18n{searchPageTitle} |
119 </div> | 119 </div> |
120 <if expr="not chromeos"> | 120 <if expr="not chromeos"> |
121 <div data-section="defaultBrowser" on-tap="openPage_" | 121 <div data-path="/defaultBrowser" on-tap="openPage_" |
122 hidden="[[!pageVisibility.defaultBrowser]]"> | 122 hidden="[[!pageVisibility.defaultBrowser]]"> |
123 <iron-icon icon="settings:web"></iron-icon> | 123 <iron-icon icon="settings:web"></iron-icon> |
124 $i18n{defaultBrowser} | 124 $i18n{defaultBrowser} |
125 </div> | 125 </div> |
126 </if> | 126 </if> |
127 <div data-section="onStartup" on-tap="openPage_" | 127 <div data-path="/onStartup" on-tap="openPage_" |
128 hidden="[[!pageVisibility.onStartup]]"> | 128 hidden="[[!pageVisibility.onStartup]]"> |
129 <iron-icon icon="settings:power-settings-new"></iron-icon> | 129 <iron-icon icon="settings:power-settings-new"></iron-icon> |
130 $i18n{onStartup} | 130 $i18n{onStartup} |
131 </div> | 131 </div> |
132 </paper-menu> | 132 </paper-menu> |
133 </div> | 133 </div> |
134 <paper-submenu class="page-menu" id="advancedPage" data-page="advanced" | 134 <paper-submenu class="page-menu" id="advancedPage" |
135 opened="{{advancedOpened_}}" | 135 opened="{{advancedOpened_}}" hidden="[[!pageVisibility.advancedSetting s]]"> |
136 hidden="[[!pageVisibility.advancedSettings]]"> | 136 <div class="menu-trigger"> |
137 <div class="menu-trigger" data-section="" on-tap="openPage_"> | |
Dan Beam
2016/08/01 19:37:02
but you removed data-section="" here
can you fix?
tommycli
2016/08/01 20:06:10
Ah, I see. I will fix.
| |
138 <span>$i18n{advancedPageTitle}</span> | 137 <span>$i18n{advancedPageTitle}</span> |
139 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> | 138 <iron-icon icon="[[arrowState_(advancedOpened_)]]"></iron-icon> |
140 </div> | 139 </div> |
141 <paper-menu attr-for-selected="data-section" class="menu-content" | 140 <paper-menu attr-for-selected="data-path" class="menu-content" |
142 data-page="advanced" id="advancedMenu"> | 141 id="advancedMenu" selected="[[currentRoute.path]]"> |
143 <if expr="chromeos"> | 142 <if expr="chromeos"> |
144 <div data-section="dateTime" on-tap="openPage_"> | 143 <div data-path="/dateTime" on-tap="openPage_"> |
145 <iron-icon icon="settings:access-time"></iron-icon> | 144 <iron-icon icon="settings:access-time"></iron-icon> |
146 $i18n{dateTimePageTitle} | 145 $i18n{dateTimePageTitle} |
147 </div> | 146 </div> |
148 </if> | 147 </if> |
149 <div data-section="privacy" on-tap="openPage_"> | 148 <div data-path="/privacy" on-tap="openPage_"> |
150 <iron-icon icon="settings:security"></iron-icon> | 149 <iron-icon icon="settings:security"></iron-icon> |
151 $i18n{privacyPageTitle} | 150 $i18n{privacyPageTitle} |
152 </div> | 151 </div> |
153 <if expr="chromeos"> | 152 <if expr="chromeos"> |
154 <div data-section="bluetooth" on-tap="openPage_"> | 153 <div data-path="/bluetooth" on-tap="openPage_"> |
155 <iron-icon icon="settings:bluetooth"></iron-icon> | 154 <iron-icon icon="settings:bluetooth"></iron-icon> |
156 $i18n{bluetoothPageTitle} | 155 $i18n{bluetoothPageTitle} |
157 </div> | 156 </div> |
158 </if> | 157 </if> |
159 <div data-section="passwordsAndForms" on-tap="openPage_" | 158 <div data-path="/passwords" on-tap="openPage_" |
160 hidden="[[!pageVisibility.passwordsAndForms]]"> | 159 hidden="[[!pageVisibility.passwordsAndForms]]"> |
161 <iron-icon icon="settings:assignment"></iron-icon> | 160 <iron-icon icon="settings:assignment"></iron-icon> |
162 $i18n{passwordsAndAutofillPageTitle} | 161 $i18n{passwordsAndAutofillPageTitle} |
163 </div> | 162 </div> |
164 <div data-section="languages" on-tap="openPage_"> | 163 <div data-path="/languages" on-tap="openPage_"> |
165 <iron-icon icon="settings:language"></iron-icon> | 164 <iron-icon icon="settings:language"></iron-icon> |
166 $i18n{languagesPageTitle} | 165 $i18n{languagesPageTitle} |
167 </div> | 166 </div> |
168 <div data-section="downloads" on-tap="openPage_"> | 167 <div data-path="/downloadsDirectory" on-tap="openPage_"> |
169 <iron-icon icon="cr:file-download"></iron-icon> | 168 <iron-icon icon="cr:file-download"></iron-icon> |
170 $i18n{downloadsPageTitle} | 169 $i18n{downloadsPageTitle} |
171 </div> | 170 </div> |
172 <div data-section="printing" on-tap="openPage_"> | 171 <div data-path="/printing" on-tap="openPage_"> |
173 <iron-icon icon="cr:print"></iron-icon> | 172 <iron-icon icon="cr:print"></iron-icon> |
174 $i18n{printingPageTitle} | 173 $i18n{printingPageTitle} |
175 </div> | 174 </div> |
176 <div data-section="a11y" on-tap="openPage_"> | 175 <div data-path="/accessibility" on-tap="openPage_"> |
177 <iron-icon icon="settings:accessibility"></iron-icon> | 176 <iron-icon icon="settings:accessibility"></iron-icon> |
178 $i18n{a11yPageTitle} | 177 $i18n{a11yPageTitle} |
179 </div> | 178 </div> |
180 <if expr="not chromeos"> | 179 <if expr="not chromeos"> |
181 <div data-section="system" on-tap="openPage_"> | 180 <div data-path="/system" on-tap="openPage_"> |
182 <iron-icon icon="settings:build"></iron-icon> | 181 <iron-icon icon="settings:build"></iron-icon> |
183 $i18n{systemPageTitle} | 182 $i18n{systemPageTitle} |
184 </div> | 183 </div> |
185 </if> | 184 </if> |
186 <div data-section="reset" on-tap="openPage_" | 185 <div data-path="/reset" on-tap="openPage_" |
187 hidden="[[!pageVisibility.reset]]"> | 186 hidden="[[!pageVisibility.reset]]"> |
188 <iron-icon icon="settings:restore"></iron-icon> | 187 <iron-icon icon="settings:restore"></iron-icon> |
189 $i18n{resetPageTitle} | 188 $i18n{resetPageTitle} |
190 </div> | 189 </div> |
191 </paper-menu> | 190 </paper-menu> |
192 </paper-submenu> | 191 </paper-submenu> |
193 <div class="separator"></div> | 192 <div class="separator"></div> |
194 <paper-submenu class="page-menu" data-page="about"> | 193 <paper-submenu class="page-menu"> |
195 <div class="menu-trigger" on-tap="openPage_" data-section=""> | 194 <div class="menu-trigger" on-tap="openPage_" data-path="/help"> |
196 $i18n{aboutPageTitle} | 195 $i18n{aboutPageTitle} |
197 </div> | 196 </div> |
198 </paper-submenu> | 197 </paper-submenu> |
199 </paper-menu> | 198 </paper-menu> |
200 </template> | 199 </template> |
201 <script src="settings_menu.js"></script> | 200 <script src="settings_menu.js"></script> |
202 </dom-module> | 201 </dom-module> |
OLD | NEW |