| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape
r-drawer-panel.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/pape
r-drawer-panel.html"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input
.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too
lbar.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-too
lbar.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe
s/iron-flex-layout.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm
l"> |
| 9 <link rel="import" href="chrome://md-settings/direction_delegate.html"> | 9 <link rel="import" href="chrome://md-settings/direction_delegate.html"> |
| 10 <link rel="import" href="chrome://md-settings/i18n_setup.html"> | 10 <link rel="import" href="chrome://md-settings/i18n_setup.html"> |
| 11 <link rel="import" href="chrome://md-settings/icons.html"> | 11 <link rel="import" href="chrome://md-settings/icons.html"> |
| 12 <link rel="import" href="chrome://md-settings/settings_main/settings_main.html"> | 12 <link rel="import" href="chrome://md-settings/settings_main/settings_main.html"> |
| 13 <link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html"> | 13 <link rel="import" href="chrome://md-settings/settings_menu/settings_menu.html"> |
| 14 <link rel="import" href="chrome://md-settings/settings_page/settings_router.html
"> | 14 <link rel="import" href="chrome://md-settings/settings_page/settings_router.html
"> |
| 15 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> | 15 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> |
| 16 | 16 |
| 17 <dom-module id="settings-ui"> | 17 <dom-module id="settings-ui"> |
| 18 <template> | 18 <template> |
| 19 <style include="settings-shared"> | 19 <style include="settings-shared"> |
| 20 :host { | 20 :host { |
| 21 @apply(--layout-vertical); | 21 @apply(--layout-vertical); |
| 22 @apply(--layout-fit); | 22 @apply(--layout-fit); |
| 23 -webkit-user-select: none; | 23 -webkit-user-select: none; |
| 24 background-color: var(--settings-background-color); | 24 background-color: var(--settings-background-color); |
| 25 } | 25 } |
| 26 | 26 |
| 27 paper-drawer-panel { | 27 paper-drawer-panel { |
| 28 @apply(--layout-center); | 28 @apply(--layout-center); |
| 29 --paper-drawer-panel-left-drawer-container: { | 29 --paper-drawer-panel-drawer-container: { |
| 30 background-color: var(--settings-background-color); | 30 background: none; /* Remove default background styling. */ |
| 31 }; | |
| 32 --paper-drawer-panel-right-drawer-container: { | |
| 33 background-color: var(--settings-background-color); | |
| 34 }; | 31 }; |
| 35 position: relative; | 32 position: relative; |
| 36 } | 33 } |
| 37 | 34 |
| 35 #drawer { |
| 36 /* Explicitly set this so that transitions work and look good. */ |
| 37 background-color: var(--settings-background-color); |
| 38 } |
| 39 |
| 40 #drawer, |
| 41 #drawer .toolbar { |
| 42 transition: background-color .3s, color .3s; |
| 43 } |
| 44 |
| 45 :host(:not(.narrowing)) [narrow] #drawer, |
| 46 :host(:not(.narrowing)) [narrow] #drawer .toolbar { |
| 47 background-color: white; |
| 48 transition: none; /* Transition only when removing [narrow]. */ |
| 49 } |
| 50 |
| 51 :host(:not(.narrowing)) [narrow] #drawer .toolbar { |
| 52 color: black; |
| 53 } |
| 54 |
| 38 paper-icon-button { | 55 paper-icon-button { |
| 39 --iron-icon-fill-color: var(--settings-title-bar-color); | 56 --iron-icon-fill-color: var(--settings-title-bar-color); |
| 40 } | 57 } |
| 41 | 58 |
| 42 paper-icon-button[suffix] { | 59 paper-icon-button[suffix] { |
| 43 --iron-icon-fill-color: var(--settings-title-search-color); | 60 --iron-icon-fill-color: var(--settings-title-search-color); |
| 44 height: 32px; /* After padding, the icon size is 16px. */ | 61 height: 32px; /* After padding, the icon size is 16px. */ |
| 45 width: 32px; | 62 width: 32px; |
| 46 } | 63 } |
| 47 | 64 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 --paper-toolbar-content: { | 100 --paper-toolbar-content: { |
| 84 font-size: 123.08%; /* go to 16px from 13px */ | 101 font-size: 123.08%; /* go to 16px from 13px */ |
| 85 } | 102 } |
| 86 --paper-toolbar: { | 103 --paper-toolbar: { |
| 87 background-color: var(--settings-title-bar-background-color); | 104 background-color: var(--settings-title-bar-background-color); |
| 88 }; | 105 }; |
| 89 } | 106 } |
| 90 | 107 |
| 91 /* Prevent paper-toolbar from setting the margin-right to 24px. */ | 108 /* Prevent paper-toolbar from setting the margin-right to 24px. */ |
| 92 paper-icon-button#menu-button { | 109 paper-icon-button#menu-button { |
| 93 /* | 110 flex-shrink: 0; |
| 94 * TODO(dschuyler): this margin is on the right regardless of language | 111 /* TODO(dschuyler): this margin is on the right regardless of language |
| 95 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. | 112 * direction (e.g. rtl). Make a patch for paper-toolbar in Polymer. */ |
| 96 */ | |
| 97 margin-right: 0; | 113 margin-right: 0; |
| 98 } | 114 } |
| 99 | 115 |
| 100 .heading { | 116 .heading { |
| 101 -webkit-margin-start: 8px; | 117 -webkit-margin-start: 8px; |
| 102 } | 118 } |
| 103 | 119 |
| 104 paper-drawer-panel:not([narrow]) #main-title { | 120 paper-drawer-panel:not([narrow]) #main-title { |
| 105 display: none; | 121 display: none; |
| 106 } | 122 } |
| 107 | 123 |
| 108 paper-icon-button[toggles]:not([active]) + #search-input { | 124 paper-icon-button[toggles]:not([active]) + #search-input { |
| 109 display: none; | 125 display: none; |
| 110 } | 126 } |
| 111 | 127 |
| 112 .last { | 128 .last { |
| 113 display: flex; | 129 display: flex; |
| 114 justify-content: flex-end; | 130 justify-content: flex-end; |
| 115 width: 100%; | 131 width: 100%; |
| 116 } | 132 } |
| 117 </style> | 133 </style> |
| 118 <settings-router current-route="{{currentRoute}}" | 134 <settings-router current-route="{{currentRoute}}" |
| 119 current-route-titles="{{currentRouteTitles}}"> | 135 current-route-titles="{{currentRouteTitles}}"> |
| 120 </settings-router> | 136 </settings-router> |
| 121 <paper-drawer-panel drawer-width="256px" id="panel" narrow="{{isNarrow_}}" | 137 <paper-drawer-panel drawer-width="256px" id="panel" narrow="{{isNarrow_}}" |
| 122 responsive-width="900px"> | 138 responsive-width="900px"> |
| 123 <paper-header-panel drawer> | 139 <paper-header-panel drawer id="drawer"> |
| 124 <paper-toolbar class="toolbar"> | 140 <paper-toolbar class="toolbar"> |
| 125 <div class="heading flex">$i18n{settings}</div> | 141 <div class="heading flex">$i18n{settings}</div> |
| 126 </paper-toolbar> | 142 </paper-toolbar> |
| 127 <settings-menu current-route="{{currentRoute}}"> | 143 <settings-menu current-route="{{currentRoute}}"> |
| 128 </settings-menu> | 144 </settings-menu> |
| 129 </paper-header-panel> | 145 </paper-header-panel> |
| 130 <paper-header-panel main> | 146 <paper-header-panel main> |
| 131 <paper-toolbar class="toolbar"> | 147 <paper-toolbar class="toolbar"> |
| 132 <paper-icon-button icon="menu" id="menu-button" paper-drawer-toggle> | 148 <paper-icon-button icon="menu" id="menu-button" paper-drawer-toggle> |
| 133 </paper-icon-button> | 149 </paper-icon-button> |
| (...skipping 11 matching lines...) Expand all Loading... |
| 145 </paper-input> | 161 </paper-input> |
| 146 </div> | 162 </div> |
| 147 </paper-toolbar> | 163 </paper-toolbar> |
| 148 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 164 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 149 </paper-icon-button> | 165 </paper-icon-button> |
| 150 </paper-header-panel> | 166 </paper-header-panel> |
| 151 </paper-drawer-panel> | 167 </paper-drawer-panel> |
| 152 </template> | 168 </template> |
| 153 <script src="settings_ui.js"></script> | 169 <script src="settings_ui.js"></script> |
| 154 </dom-module> | 170 </dom-module> |
| OLD | NEW |