OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> | 3 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html
"> |
4 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 4 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
5 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html
"> |
7 <link rel="import" href="../direction_delegate.html"> | 7 <link rel="import" href="../direction_delegate.html"> |
8 <link rel="import" href="../global_scroll_target_behavior.html"> | 8 <link rel="import" href="../global_scroll_target_behavior.html"> |
9 <link rel="import" href="../i18n_setup.html"> | 9 <link rel="import" href="../i18n_setup.html"> |
10 <link rel="import" href="../icons.html"> | 10 <link rel="import" href="../icons.html"> |
(...skipping 14 matching lines...) Expand all Loading... |
25 :host { | 25 :host { |
26 @apply(--layout-fit); | 26 @apply(--layout-fit); |
27 -webkit-user-select: text; | 27 -webkit-user-select: text; |
28 color: var(--primary-text-color); | 28 color: var(--primary-text-color); |
29 display: flex; | 29 display: flex; |
30 flex-direction: column; | 30 flex-direction: column; |
31 line-height: 154%; /* Apply 20px line-height to all texts by default. */ | 31 line-height: 154%; /* Apply 20px line-height to all texts by default. */ |
32 overflow: hidden; /* Prevent double scroll bar bugs. */ | 32 overflow: hidden; /* Prevent double scroll bar bugs. */ |
33 } | 33 } |
34 | 34 |
35 .drawer-header { | |
36 outline: none; | |
37 } | |
38 | |
39 .last { | 35 .last { |
40 display: flex; | 36 display: flex; |
41 justify-content: flex-end; | 37 justify-content: flex-end; |
42 width: 100%; | 38 width: 100%; |
43 } | 39 } |
44 | 40 |
45 dialog[is='cr-drawer'] { | 41 dialog[is='cr-drawer'] { |
46 z-index: 2; | 42 z-index: 2; |
47 } | 43 } |
48 | 44 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 <cr-toolbar page-name="$i18n{settings}" | 81 <cr-toolbar page-name="$i18n{settings}" |
86 clear-label="$i18n{clearSearch}" | 82 clear-label="$i18n{clearSearch}" |
87 search-prompt="$i18n{searchPrompt}" | 83 search-prompt="$i18n{searchPrompt}" |
88 on-cr-toolbar-menu-tap="onMenuButtonTap_" | 84 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
89 spinner-active="[[toolbarSpinnerActive_]]" | 85 spinner-active="[[toolbarSpinnerActive_]]" |
90 menu-label="$i18n{menuButtonLabel}" | 86 menu-label="$i18n{menuButtonLabel}" |
91 on-search-changed="onSearchChanged_" | 87 on-search-changed="onSearchChanged_" |
92 role="none" | 88 role="none" |
93 show-menu> | 89 show-menu> |
94 </cr-toolbar> | 90 </cr-toolbar> |
95 <dialog id="drawer" is="cr-drawer" on-close="onMenuClosed_"> | 91 <dialog id="drawer" is="cr-drawer" on-close="onMenuClosed_" |
96 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> | 92 title="$i18n{settings}"> |
97 <div class="drawer-content"> | 93 <div class="drawer-content"> |
98 <template is="dom-if" id="drawerTemplate"> | 94 <template is="dom-if" id="drawerTemplate"> |
99 <settings-menu page-visibility="[[pageVisibility_]]" | 95 <settings-menu page-visibility="[[pageVisibility_]]" |
100 show-android-apps="[[showAndroidApps_]]" | 96 show-android-apps="[[showAndroidApps_]]" |
101 on-iron-activate="onIronActivate_" | 97 on-iron-activate="onIronActivate_" |
102 advanced-opened="{{advancedOpened_}}"> | 98 advanced-opened="{{advancedOpened_}}"> |
103 </settings-menu> | 99 </settings-menu> |
104 </template> | 100 </template> |
105 </div> | 101 </div> |
106 </dialog> | 102 </dialog> |
107 <div id="dropShadow"></div> | 103 <div id="dropShadow"></div> |
108 <div id="container" class="no-outline"> | 104 <div id="container" class="no-outline"> |
109 <!-- Used by IntersectionObserver, has a 0px height intentionally --> | 105 <!-- Used by IntersectionObserver, has a 0px height intentionally --> |
110 <div id="intersectionProbe"></div> | 106 <div id="intersectionProbe"></div> |
111 <settings-main id="main" prefs="{{prefs}}" | 107 <settings-main id="main" prefs="{{prefs}}" |
112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 108 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
113 page-visibility="[[pageVisibility_]]" | 109 page-visibility="[[pageVisibility_]]" |
114 show-android-apps="[[showAndroidApps_]]" | 110 show-android-apps="[[showAndroidApps_]]" |
115 advanced-toggle-expanded="{{advancedOpened_}}"> | 111 advanced-toggle-expanded="{{advancedOpened_}}"> |
116 </settings-main> | 112 </settings-main> |
117 </div> | 113 </div> |
118 </template> | 114 </template> |
119 <script src="settings_ui.js"></script> | 115 <script src="settings_ui.js"></script> |
120 </dom-module> | 116 </dom-module> |
OLD | NEW |