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

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

Issue 1692103002: [MD settings] propagating no-label-float from settings-dropdown-menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | chrome/browser/resources/settings/controls/settings_dropdown_menu.html » ('j') | 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 3 <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/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-radio-button/pape r-radio-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-radio-button/pape r-radio-button.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml"> 8 <link rel="import" href="chrome://md-settings/controls/settings_dropdown_menu.ht ml">
9 <link rel="import" href="chrome://md-settings/controls/settings_input.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_input.html">
10 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html "> 10 <link rel="import" href="chrome://md-settings/controls/settings_radio_group.html ">
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 </template> 73 </template>
74 <div class="settings-box"> 74 <div class="settings-box">
75 <settings-checkbox class="start" i18n-values="label:showBookmarksBar" 75 <settings-checkbox class="start" i18n-values="label:showBookmarksBar"
76 pref="{{prefs.bookmark_bar.show_on_all_tabs}}"> 76 pref="{{prefs.bookmark_bar.show_on_all_tabs}}">
77 </settings-checkbox> 77 </settings-checkbox>
78 </div> 78 </div>
79 <div class="settings-box"> 79 <div class="settings-box">
80 <div class="start" i18n-content="fontSize"></div> 80 <div class="start" i18n-content="fontSize"></div>
81 <settings-dropdown-menu id="defaultFontSize" 81 <settings-dropdown-menu id="defaultFontSize"
82 pref="{{prefs.webkit.webprefs.default_font_size}}" 82 pref="{{prefs.webkit.webprefs.default_font_size}}"
83 menu-options="[[fontSizeOptions_]]"> 83 menu-options="[[fontSizeOptions_]]" no-label-float>
84 </settings-dropdown-menu> 84 </settings-dropdown-menu>
85 </div> 85 </div>
86 <div class="settings-box"> 86 <div class="settings-box">
87 <div class="start" i18n-content="customizeFonts"></div> 87 <div class="start" i18n-content="customizeFonts"></div>
88 <paper-button on-tap="onCustomizeFontsTap_" 88 <paper-button on-tap="onCustomizeFontsTap_"
89 i18n-content="customizeFonts"></paper-button> 89 i18n-content="customizeFonts"></paper-button>
90 </div> 90 </div>
91 <div class="settings-box"> 91 <div class="settings-box">
92 <div class="start" i18n-content="pageZoom"></div> 92 <div class="start" i18n-content="pageZoom"></div>
93 <settings-dropdown-menu id="pageZoom" 93 <settings-dropdown-menu id="pageZoom" pref="{{defaultZoomLevel_}}"
94 pref="{{defaultZoomLevel_}}" 94 menu-options="[[pageZoomOptions_]]" no-label-float>
95 menu-options="[[pageZoomOptions_]]">
96 </settings-dropdown-menu> 95 </settings-dropdown-menu>
97 </div> 96 </div>
98 </neon-animatable> 97 </neon-animatable>
99 <neon-animatable id="appearance-fonts"> 98 <neon-animatable id="appearance-fonts">
100 <settings-subheader i18n-values="page-title:customizeFonts"> 99 <settings-subheader i18n-values="page-title:customizeFonts">
101 </settings-subheader> 100 </settings-subheader>
102 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]" 101 <template is="dom-if" if="[[showFontsPage_(currentRoute.subpage.*)]]"
103 restamp> 102 restamp>
104 <settings-appearance-fonts-page prefs="{{prefs}}"> 103 <settings-appearance-fonts-page prefs="{{prefs}}">
105 </settings-appearance-fonts-page> 104 </settings-appearance-fonts-page>
106 </template> 105 </template>
107 </neon-animatable> 106 </neon-animatable>
108 </settings-animated-pages> 107 </settings-animated-pages>
109 </template> 108 </template>
110 <script src="appearance_page.js"></script> 109 <script src="appearance_page.js"></script>
111 </dom-module> 110 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/controls/settings_dropdown_menu.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698