OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_drawer/cr_drawer.html "> |
2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht ml"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht ml"> |
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.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 19 matching lines...) Expand all Loading... | |
30 }; | 30 }; |
31 -webkit-user-select: none; | 31 -webkit-user-select: none; |
32 background-color: var(--settings-background-color); | 32 background-color: var(--settings-background-color); |
33 color: var(--paper-grey-800); | 33 color: var(--paper-grey-800); |
34 display: flex; | 34 display: flex; |
35 flex-direction: column; | 35 flex-direction: column; |
36 line-height: 154%; /* Apply 20px line-height to all texts by default. */ | 36 line-height: 154%; /* Apply 20px line-height to all texts by default. */ |
37 overflow: hidden; /* Prevent double scroll bar bugs. */ | 37 overflow: hidden; /* Prevent double scroll bar bugs. */ |
38 } | 38 } |
39 | 39 |
40 .drawer-header { | |
41 outline: none; | |
42 } | |
43 | |
40 paper-header-panel { | 44 paper-header-panel { |
41 flex: 1; | 45 flex: 1; |
42 } | 46 } |
43 | 47 |
44 .paper-header { | 48 .paper-header { |
45 -webkit-padding-start: 24px; | 49 -webkit-padding-start: 24px; |
46 align-items: center; | 50 align-items: center; |
47 border-bottom: var(--settings-separator-line); | 51 border-bottom: var(--settings-separator-line); |
48 display: flex; | 52 display: flex; |
49 font-size: 123.08%; /* go to 16px from 13px */ | 53 font-size: 123.08%; /* go to 16px from 13px */ |
(...skipping 24 matching lines...) Expand all Loading... | |
74 <cr-toolbar page-name="$i18n{settings}" | 78 <cr-toolbar page-name="$i18n{settings}" |
75 clear-label="$i18n{clearSearch}" | 79 clear-label="$i18n{clearSearch}" |
76 search-prompt="$i18n{searchPrompt}" | 80 search-prompt="$i18n{searchPrompt}" |
77 on-cr-toolbar-menu-tap="onMenuButtonTap_" | 81 on-cr-toolbar-menu-tap="onMenuButtonTap_" |
78 spinner-active="[[toolbarSpinnerActive_]]" | 82 spinner-active="[[toolbarSpinnerActive_]]" |
79 menu-label="$i18n{menuButtonLabel}" | 83 menu-label="$i18n{menuButtonLabel}" |
80 on-search-changed="onSearchChanged_" | 84 on-search-changed="onSearchChanged_" |
81 show-menu> | 85 show-menu> |
82 </cr-toolbar> | 86 </cr-toolbar> |
83 <dialog id="drawer" is="cr-drawer"> | 87 <dialog id="drawer" is="cr-drawer"> |
84 <div class="drawer-header">$i18n{settings}</div> | 88 <div class="drawer-header" tabindex="-1">$i18n{settings}</div> |
Dan Beam
2017/03/06 20:37:58
the difference is that .drawer-header actually liv
| |
85 <div class="drawer-content"> | 89 <div class="drawer-content"> |
86 <template is="dom-if" id="drawerTemplate"> | 90 <template is="dom-if" id="drawerTemplate"> |
87 <settings-menu page-visibility="[[pageVisibility_]]" | 91 <settings-menu page-visibility="[[pageVisibility_]]" |
88 show-android-apps="[[showAndroidApps_]]" | 92 show-android-apps="[[showAndroidApps_]]" |
89 on-iron-activate="onIronActivate_" | 93 on-iron-activate="onIronActivate_" |
90 advanced-opened="{{advancedOpened_}}"> | 94 advanced-opened="{{advancedOpened_}}"> |
91 </settings-menu> | 95 </settings-menu> |
92 </template> | 96 </template> |
93 </div> | 97 </div> |
94 </dialog> | 98 </dialog> |
95 <paper-header-panel id="headerPanel" mode="waterfall"> | 99 <paper-header-panel id="headerPanel" mode="waterfall"> |
96 <settings-main id="main" prefs="{{prefs}}" | 100 <settings-main id="main" prefs="{{prefs}}" |
97 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 101 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
98 page-visibility="[[pageVisibility_]]" | 102 page-visibility="[[pageVisibility_]]" |
99 show-android-apps="[[showAndroidApps_]]" | 103 show-android-apps="[[showAndroidApps_]]" |
100 advanced-toggle-expanded="{{advancedOpened_}}"> | 104 advanced-toggle-expanded="{{advancedOpened_}}"> |
101 </settings-main> | 105 </settings-main> |
102 </paper-header-panel> | 106 </paper-header-panel> |
103 </template> | 107 </template> |
104 <script src="settings_ui.js"></script> | 108 <script src="settings_ui.js"></script> |
105 </dom-module> | 109 </dom-module> |
OLD | NEW |