| 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="../direction_delegate.html"> | 6 <link rel="import" href="../direction_delegate.html"> |
| 7 <link rel="import" href="../global_scroll_target_behavior.html"> | 7 <link rel="import" href="../global_scroll_target_behavior.html"> |
| 8 <link rel="import" href="../i18n_setup.html"> | 8 <link rel="import" href="../i18n_setup.html"> |
| 9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
| 10 <link rel="import" href="../settings_main/settings_main.html"> | 10 <link rel="import" href="../settings_main/settings_main.html"> |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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(--settings-title-bar-background-color); |
| 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 } | 63 } |
| 63 | 64 |
| 64 #dropShadow { | 65 #dropShadow { |
| 65 /* TODO(dpapad): This box-shadow is repeated in Settings, History and | 66 /* TODO(dpapad): This box-shadow is repeated in Settings, History and |
| 66 Downloads. Define a CSS variable instead and re-use. */ | 67 Downloads. Define a CSS variable instead and re-use. */ |
| 67 box-shadow: inset 0 5px 6px -3px rgba(0, 0, 0, 0.4); | 68 box-shadow: inset 0 5px 6px -3px rgba(0, 0, 0, 0.4); |
| 68 height: 6px; | 69 height: 6px; |
| 69 left: 0; | 70 left: 0; |
| 70 opacity: 0; | 71 opacity: 0; |
| 71 pointer-events: none; | 72 pointer-events: none; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 <settings-main id="main" prefs="{{prefs}}" | 111 <settings-main id="main" prefs="{{prefs}}" |
| 111 toolbar-spinner-active="{{toolbarSpinnerActive_}}" | 112 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 112 page-visibility="[[pageVisibility_]]" | 113 page-visibility="[[pageVisibility_]]" |
| 113 show-android-apps="[[showAndroidApps_]]" | 114 show-android-apps="[[showAndroidApps_]]" |
| 114 advanced-toggle-expanded="{{advancedOpened_}}"> | 115 advanced-toggle-expanded="{{advancedOpened_}}"> |
| 115 </settings-main> | 116 </settings-main> |
| 116 </div> | 117 </div> |
| 117 </template> | 118 </template> |
| 118 <script src="settings_ui.js"></script> | 119 <script src="settings_ui.js"></script> |
| 119 </dom-module> | 120 </dom-module> |
| OLD | NEW |