Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <div id="settings" class="page" hidden> | 1 <div id="settings" class="page" hidden> |
| 2 <header> | 2 <header> |
| 3 <h1 i18n-content="settingsTitle"></h1> | 3 <h1 i18n-content="settingsTitle"></h1> |
| 4 </header> | 4 </header> |
| 5 <include src="reset_profile_settings_banner.html"> | 5 <include src="reset_profile_settings_banner.html"> |
| 6 <if expr="not pp_ifdef('chromeos')"> | 6 <if expr="not pp_ifdef('chromeos')"> |
| 7 <include src="sync_section.html"> | 7 <include src="sync_section.html"> |
| 8 </if> | 8 </if> |
| 9 <if expr="pp_ifdef('chromeos')"> | 9 <if expr="pp_ifdef('chromeos')"> |
| 10 <section> | 10 <section> |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 132 <div class="settings-row"> | 132 <div class="settings-row"> |
| 133 <select id="default-search-engine" class="weakrtl"></select> | 133 <select id="default-search-engine" class="weakrtl"></select> |
| 134 <span class="controlled-setting-indicator" | 134 <span class="controlled-setting-indicator" |
| 135 pref="default_search_provider.enabled"> | 135 pref="default_search_provider.enabled"> |
| 136 </span> | 136 </span> |
| 137 <button id="manage-default-search-engines" | 137 <button id="manage-default-search-engines" |
| 138 i18n-content="defaultSearchManageEngines"> | 138 i18n-content="defaultSearchManageEngines"> |
| 139 </button> | 139 </button> |
| 140 </div> | 140 </div> |
| 141 </div> | 141 </div> |
| 142 <div id ="hotword-search" hidden> | |
| 143 <div class="checkbox"> | |
| 144 <span class="controlled-setting-with-label"> | |
| 145 <input id="hotword-search-enable" pref="hotword.search_enabled" | |
| 146 type="checkbox"> | |
| 147 <span> | |
| 148 <label for="hotword-search-enable" | |
| 149 i18n-values=".innerHTML:hotwordSearchEnable"> | |
| 150 </label> | |
| 151 <span class="controlled-setting-indicator" | |
| 152 pref="hotword.search_enabled"> | |
| 153 </span> | |
| 154 </span> | |
| 155 </span> | |
| 156 <div id="hotword-search-description" class="hotword-settings"> | |
| 157 <span i18n-content="hotwordSearchDescription"></span> | |
|
rpetterson
2014/01/14 21:54:18
This line is actually supposed to be a light gray
samarth
2014/01/17 01:26:41
You're probably entering a "css specificity war".
rpetterson
2014/01/17 23:53:24
So I actually had this right before, but I just ha
| |
| 158 </div> | |
| 159 </div> | |
| 160 <div id="hotword-settings-section" class="hotword-settings" hidden> | |
| 161 <div id="hotword-settings-section-container"> | |
| 162 <div class="checkbox"> | |
| 163 <span class="controlled-setting-with-label"> | |
| 164 <input id="hotword-search-timeout" | |
| 165 pref="hotword.search_timeout_enabled" type="checkbox"> | |
| 166 <span> | |
| 167 <label for="hotword-search-timeout" | |
| 168 i18n-content="hotwordSearchTimeout"> | |
| 169 </label> | |
| 170 <span class="controlled-setting-indicator" | |
| 171 pref="hotword.search_timeout_enabled"> | |
| 172 </span> | |
| 173 </span> | |
| 174 </span> | |
| 175 <div id="hotword-search-timeout-description" | |
| 176 class="hotword-settings"> | |
| 177 <span i18n-content="hotwordSearchTimeoutDescription"></span> | |
| 178 </div> | |
| 179 </div> | |
| 180 <div class="checkbox"> | |
| 181 <span class="controlled-setting-with-label"> | |
| 182 <input id="hotword-search-incognito-enable" | |
| 183 pref="hotword.incognito_search_enabled" type="checkbox"> | |
| 184 <span> | |
| 185 <label for="hotword-search-incognito-enable" | |
| 186 i18n-content="hotwordSearchIncognito"> | |
| 187 </label> | |
| 188 <span class="controlled-setting-indicator" | |
| 189 pref="hotword.incognito_search_enabled"> | |
| 190 </span> | |
| 191 </span> | |
| 192 </span> | |
| 193 </div> | |
| 194 </div> | |
| 195 </div> | |
| 196 </div> | |
| 142 </section> | 197 </section> |
| 143 <section id="sync-users-section" guest-visibility="hidden"> | 198 <section id="sync-users-section" guest-visibility="hidden"> |
| 144 <h3 i18n-content="sectionTitleUsers"></h3> | 199 <h3 i18n-content="sectionTitleUsers"></h3> |
| 145 <if expr="pp_ifdef('chromeos')"> | 200 <if expr="pp_ifdef('chromeos')"> |
| 146 <include src="sync_section.html"> | 201 <include src="sync_section.html"> |
| 147 </if> | 202 </if> |
| 148 <div id="profiles-section" hidden> | 203 <div id="profiles-section" hidden> |
| 149 <list id="profiles-list" class="settings-list" hidden></list> | 204 <list id="profiles-list" class="settings-list" hidden></list> |
| 150 <div id="profiles-single-message" class="settings-row" | 205 <div id="profiles-single-message" class="settings-row" |
| 151 i18n-content="profilesSingleUser"> | 206 i18n-content="profilesSingleUser"> |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 856 </div> | 911 </div> |
| 857 </section> | 912 </section> |
| 858 </div> <!-- advanced-settings-container --> | 913 </div> <!-- advanced-settings-container --> |
| 859 </div> <!-- advanced-settings --> | 914 </div> <!-- advanced-settings --> |
| 860 <footer> | 915 <footer> |
| 861 <button id="advanced-settings-expander" class="link-button" | 916 <button id="advanced-settings-expander" class="link-button" |
| 862 i18n-content="showAdvancedSettings"> | 917 i18n-content="showAdvancedSettings"> |
| 863 </button> | 918 </button> |
| 864 </footer> | 919 </footer> |
| 865 </div> | 920 </div> |
| OLD | NEW |