| 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-styles/color.html
"> |
| 6 <link rel="import" href="../direction_delegate.html"> | 7 <link rel="import" href="../direction_delegate.html"> |
| 7 <link rel="import" href="../global_scroll_target_behavior.html"> | 8 <link rel="import" href="../global_scroll_target_behavior.html"> |
| 8 <link rel="import" href="../i18n_setup.html"> | 9 <link rel="import" href="../i18n_setup.html"> |
| 9 <link rel="import" href="../icons.html"> | 10 <link rel="import" href="../icons.html"> |
| 10 <link rel="import" href="../settings_main/settings_main.html"> | 11 <link rel="import" href="../settings_main/settings_main.html"> |
| 11 <link rel="import" href="../settings_menu/settings_menu.html"> | 12 <link rel="import" href="../settings_menu/settings_menu.html"> |
| 12 <link rel="import" href="../settings_shared_css.html"> | 13 <link rel="import" href="../settings_shared_css.html"> |
| 13 <link rel="import" href="../prefs/prefs.html"> | 14 <link rel="import" href="../prefs/prefs.html"> |
| 14 <link rel="import" href="../route.html"> | 15 <link rel="import" href="../route.html"> |
| 15 <link rel="import" href="../settings_vars_css.html"> | 16 <link rel="import" href="../settings_vars_css.html"> |
| 16 | 17 |
| 17 <if expr="chromeos"> | 18 <if expr="chromeos"> |
| 18 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> | 19 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.htm
l"> |
| 19 </if> | 20 </if> |
| 20 | 21 |
| 21 <dom-module id="settings-ui"> | 22 <dom-module id="settings-ui"> |
| 22 <template> | 23 <template> |
| 23 <style include="settings-shared"> | 24 <style include="settings-shared"> |
| 24 :host { | 25 :host { |
| 25 @apply(--layout-fit); | 26 @apply(--layout-fit); |
| 26 -webkit-user-select: none; | 27 -webkit-user-select: none; |
| 27 background-color: var(--settings-background-color); | |
| 28 color: var(--paper-grey-900); | 28 color: var(--paper-grey-900); |
| 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 { | 35 .drawer-header { |
| 36 outline: none; | 36 outline: none; |
| 37 } | 37 } |
| 38 | 38 |
| 39 .last { | 39 .last { |
| 40 display: flex; | 40 display: flex; |
| 41 justify-content: flex-end; | 41 justify-content: flex-end; |
| 42 width: 100%; | 42 width: 100%; |
| 43 } | 43 } |
| 44 | 44 |
| 45 dialog[is='cr-drawer'] { | 45 dialog[is='cr-drawer'] { |
| 46 z-index: 2; | 46 z-index: 2; |
| 47 } | 47 } |
| 48 | 48 |
| 49 cr-toolbar { | 49 cr-toolbar { |
| 50 @apply(--layout-center); | 50 @apply(--layout-center); |
| 51 --cr-toolbar-field-width: var(--settings-card-max-width); | 51 --cr-toolbar-field-width: var(--settings-card-max-width); |
| 52 --iron-icon-fill-color: white; | 52 --iron-icon-fill-color: white; |
| 53 background-color: var(--settings-title-bar-background-color); | 53 background-color: var(--google-blue-700); |
| 54 color: white; | 54 color: white; |
| 55 min-height: 56px; | 55 min-height: 56px; |
| 56 z-index: 2; | 56 z-index: 2; |
| 57 } | 57 } |
| 58 | 58 |
| 59 #container { | 59 #container { |
| 60 flex: 1; | 60 flex: 1; |
| 61 overflow: overlay; | 61 overflow: overlay; |
| 62 position: relative; | 62 position: relative; |
| 63 } | 63 } |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 <settings-main id="main" prefs="{{prefs}}" | 111 <settings-main id="main" prefs="{{prefs}}" |
| 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 113 page-visibility="[[pageVisibility_]]" | 113 page-visibility="[[pageVisibility_]]" |
| 114 show-android-apps="[[showAndroidApps_]]" | 114 show-android-apps="[[showAndroidApps_]]" |
| 115 advanced-toggle-expanded="{{advancedOpened_}}"> | 115 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 116 </settings-main> | 116 </settings-main> |
| 117 </div> | 117 </div> |
| 118 </template> | 118 </template> |
| 119 <script src="settings_ui.js"></script> | 119 <script src="settings_ui.js"></script> |
| 120 </dom-module> | 120 </dom-module> |
| OLD | NEW |