OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht ml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht ml"> |
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.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/app-layout/app-drawer/a pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a pp-drawer.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/iron-icon/iron-icon.htm l"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape r-header-panel.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
dpapad
2016/06/27 22:32:19
No longer needed.
tsergeant
2016/06/30 05:09:05
Done.
| |
9 <link rel="import" href="/direction_delegate.html"> | 9 <link rel="import" href="/direction_delegate.html"> |
10 <link rel="import" href="/i18n_setup.html"> | 10 <link rel="import" href="/i18n_setup.html"> |
11 <link rel="import" href="/icons.html"> | 11 <link rel="import" href="/icons.html"> |
12 <link rel="import" href="/settings_main/settings_main.html"> | 12 <link rel="import" href="/settings_main/settings_main.html"> |
13 <link rel="import" href="/settings_menu/settings_menu.html"> | 13 <link rel="import" href="/settings_menu/settings_menu.html"> |
14 <link rel="import" href="/settings_page/settings_router.html"> | 14 <link rel="import" href="/settings_page/settings_router.html"> |
15 <link rel="import" href="/settings_shared_css.html"> | 15 <link rel="import" href="/settings_shared_css.html"> |
16 | 16 |
17 <dom-module id="settings-ui"> | 17 <dom-module id="settings-ui"> |
18 <template> | 18 <template> |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
56 | 56 |
57 app-drawer .drawer-header { | 57 app-drawer .drawer-header { |
58 align-items: center; | 58 align-items: center; |
59 display: flex; | 59 display: flex; |
60 font-size: 123.08%; /* go to 16px from 13px */ | 60 font-size: 123.08%; /* go to 16px from 13px */ |
61 min-height: 56px; | 61 min-height: 56px; |
62 } | 62 } |
63 | 63 |
64 cr-toolbar { | 64 cr-toolbar { |
65 @apply(--layout-center); | 65 @apply(--layout-center); |
66 --side-bar-width: 256px; | |
67 background-color: var(--settings-title-bar-background-color); | 66 background-color: var(--settings-title-bar-background-color); |
68 color: white; | 67 color: white; |
69 min-height: 56px; | 68 min-height: 56px; |
70 } | 69 } |
71 | 70 |
72 cr-toolbar, | 71 cr-toolbar, |
73 paper-icon-button { | 72 paper-icon-button { |
74 --iron-icon-fill-color: white; | 73 --iron-icon-fill-color: white; |
75 } | 74 } |
76 | 75 |
77 app-drawer .drawer-header { | 76 app-drawer .drawer-header { |
78 -webkit-padding-start: 24px; | 77 -webkit-padding-start: 24px; |
79 border-bottom: var(--settings-separator-line); | 78 border-bottom: var(--settings-separator-line); |
80 } | 79 } |
81 | 80 |
82 app-drawer .drawer-content { | 81 app-drawer .drawer-content { |
83 height: calc(100% - 56px); | 82 height: calc(100% - 56px); |
84 overflow: auto; | 83 overflow: auto; |
85 } | 84 } |
86 </style> | 85 </style> |
87 <settings-router current-route="{{currentRoute}}" | 86 <settings-router current-route="{{currentRoute}}" |
88 current-route-titles="{{currentRouteTitles}}"> | 87 current-route-titles="{{currentRouteTitles}}"> |
89 </settings-router> | 88 </settings-router> |
90 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully | 89 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully |
91 addressed --> | 90 addressed --> |
92 <cr-toolbar page-name="$i18n{settings}" | 91 <cr-toolbar page-name="$i18n{settings}" |
93 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} | 92 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
94 (coming soon!)"> | 93 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_"> |
95 <paper-icon-button icon="settings:menu" on-tap="onMenuButtonTap_"> | |
96 </paper-icon-button> | |
97 </cr-toolbar> | 94 </cr-toolbar> |
98 <app-drawer swipe-open> | 95 <app-drawer swipe-open> |
99 <div class="drawer-header">$i18n{settings}</div> | 96 <div class="drawer-header">$i18n{settings}</div> |
100 <div class="drawer-content"> | 97 <div class="drawer-content"> |
101 <settings-menu current-route="{{currentRoute}}" id="sideNav"> | 98 <settings-menu current-route="{{currentRoute}}" id="sideNav"> |
102 </settings-menu> | 99 </settings-menu> |
103 </div> | 100 </div> |
104 </app-drawer> | 101 </app-drawer> |
105 <paper-header-panel mode="waterfall"> | 102 <paper-header-panel mode="waterfall"> |
106 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 103 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
107 </settings-main> | 104 </settings-main> |
108 </paper-header-panel> | 105 </paper-header-panel> |
109 </template> | 106 </template> |
110 <script src="settings_ui.js"></script> | 107 <script src="settings_ui.js"></script> |
111 </dom-module> | 108 </dom-module> |
OLD | NEW |