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