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

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

Issue 2668163002: MD Settings: Fix styles in several places. (Closed)
Patch Set: remove ugly for-unit-test-only class 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> 2 <link rel="import" href="chrome://resources/html/md_select_css.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/neon-animation/neon-ani matable.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="../controls/extension_controlled_indicator.html"> 7 <link rel="import" href="../controls/extension_controlled_indicator.html">
8 <link rel="import" href="../controls/settings_toggle_button.html"> 8 <link rel="import" href="../controls/settings_toggle_button.html">
9 <link rel="import" href="../icons.html"> 9 <link rel="import" href="../icons.html">
10 <link rel="import" href="../i18n_setup.html"> 10 <link rel="import" href="../i18n_setup.html">
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 76
77 <template is="dom-if" if="[[hotwordInfo_.allowed]]"> 77 <template is="dom-if" if="[[hotwordInfo_.allowed]]">
78 <!-- Hotword (OK Google) --> 78 <!-- Hotword (OK Google) -->
79 <div class="settings-box two-line continuation"> 79 <div class="settings-box two-line continuation">
80 <settings-toggle-button id="hotwordSearchEnable" class="start" 80 <settings-toggle-button id="hotwordSearchEnable" class="start"
81 pref="{{hotwordSearchEnablePref_}}" 81 pref="{{hotwordSearchEnablePref_}}"
82 label="$i18n{searchOkGoogleLabel}" 82 label="$i18n{searchOkGoogleLabel}"
83 sub-label="[[getHotwordSearchEnableSubLabel_( 83 sub-label="[[getHotwordSearchEnableSubLabel_(
84 hotwordInfo_.alwaysOn)]]" 84 hotwordInfo_.alwaysOn)]]"
85 on-change="onHotwordSearchEnableChange_"> 85 on-change="onHotwordSearchEnableChange_">
86 <a href="$i18nRaw{hotwordLearnMoreUrl}" target="_blank"
87 class="label-controls" on-tap="doNothing_">
88 $i18n{searchOkGoogleLearnMore}
89 </a>
90 </settings-toggle-button> 86 </settings-toggle-button>
91 <div class="secondary-action" 87 <div class="secondary-action"
92 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]"> 88 hidden$="[[!getShowHotwordSearchRetrain_(hotwordInfo_.*)]]">
93 <paper-button on-tap="onRetrainTap_" class="secondary-button"> 89 <paper-button on-tap="onRetrainTap_" class="secondary-button">
94 $i18n{searchOkGoogleRetrain} 90 $i18n{searchOkGoogleRetrain}
95 </paper-button> 91 </paper-button>
96 </div> 92 </div>
97 </div> 93 </div>
98 94
99 <template is="dom-if" 95 <template is="dom-if"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 <settings-subpage 135 <settings-subpage
140 associated-control="[[$$('#subpage-trigger')]]" 136 associated-control="[[$$('#subpage-trigger')]]"
141 page-title="$i18n{searchEnginesManage}"> 137 page-title="$i18n{searchEnginesManage}">
142 <settings-search-engines-page></settings-search-engines-page> 138 <settings-search-engines-page></settings-search-engines-page>
143 </settings-subpage> 139 </settings-subpage>
144 </template> 140 </template>
145 </settings-animated-pages> 141 </settings-animated-pages>
146 </template> 142 </template>
147 <script src="search_page.js"></script> 143 <script src="search_page.js"></script>
148 </dom-module> 144 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698