| 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="../a11y_page/a11y_page.html"> | 2 <link rel="import" href="../a11y_page/a11y_page.html"> |
| 3 <link rel="import" href="../appearance_page/appearance_page.html"> | 3 <link rel="import" href="../appearance_page/appearance_page.html"> |
| 4 <link rel="import" href="../controls/settings_idle_render.html"> | 4 <link rel="import" href="../controls/settings_idle_render.html"> |
| 5 <link rel="import" href="../downloads_page/downloads_page.html"> | 5 <link rel="import" href="../downloads_page/downloads_page.html"> |
| 6 <link rel="import" href="../languages_page/languages_page.html"> | 6 <link rel="import" href="../languages_page/languages_page.html"> |
| 7 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 7 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
| 8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht
ml"> | 8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht
ml"> |
| 9 <link rel="import" href="../people_page/people_page.html"> | 9 <link rel="import" href="../people_page/people_page.html"> |
| 10 <link rel="import" href="../printing_page/printing_page.html"> | 10 <link rel="import" href="../printing_page/printing_page.html"> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 } | 42 } |
| 43 @apply(--settings-actionable); | 43 @apply(--settings-actionable); |
| 44 align-items: center; | 44 align-items: center; |
| 45 display: flex; | 45 display: flex; |
| 46 margin-bottom: 3px; | 46 margin-bottom: 3px; |
| 47 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 47 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 48 min-height: 32px; | 48 min-height: 32px; |
| 49 padding: 0 12px; | 49 padding: 0 12px; |
| 50 } | 50 } |
| 51 | 51 |
| 52 #secondaryUserBanner { |
| 53 @apply(--shadow-elevation-2dp); |
| 54 background-color: white; |
| 55 border-radius: 2px; |
| 56 margin: 21px 0; |
| 57 } |
| 58 |
| 59 #secondaryUserIcon { |
| 60 /* TODO(stevenjb): Replace this with the correct variable or color once |
| 61 * established by UX, see crbug.com/687749. */ |
| 62 background-color : rgb(210, 210, 212); |
| 63 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS); |
| 64 background-position: center; |
| 65 background-repeat: no-repeat; |
| 66 height: 55px; |
| 67 margin: 18px; |
| 68 width: 58px; |
| 69 } |
| 70 |
| 52 #toggleContainer { | 71 #toggleContainer { |
| 53 align-items: center; | 72 align-items: center; |
| 54 display: flex; | 73 display: flex; |
| 55 font: inherit; | 74 font: inherit; |
| 56 justify-content: center; | 75 justify-content: center; |
| 57 margin-bottom: 0; | 76 margin-bottom: 0; |
| 58 margin-top: 0; | 77 margin-top: 0; |
| 59 } | 78 } |
| 60 | 79 |
| 61 #toggleSpacer { | 80 #toggleSpacer { |
| 62 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 81 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
| 63 } | 82 } |
| 64 | 83 |
| 65 iron-icon { | 84 iron-icon { |
| 66 -webkit-margin-start: 16px; | 85 -webkit-margin-start: 16px; |
| 67 } | 86 } |
| 68 </style> | 87 </style> |
| 69 <template is="dom-if" if="[[showBasicPage_( | 88 <template is="dom-if" if="[[showBasicPage_( |
| 70 currentRoute_, inSearchMode, hasExpandedSection_)]]"> | 89 currentRoute_, inSearchMode, hasExpandedSection_)]]"> |
| 71 <div id="basicPage"> | 90 <div id="basicPage"> |
| 72 <template is="dom-if" if="[[showResetProfileBanner_]]"> | 91 <template is="dom-if" if="[[showResetProfileBanner_]]"> |
| 73 <settings-reset-profile-banner on-reset-done="onResetDone_"> | 92 <settings-reset-profile-banner on-reset-done="onResetDone_"> |
| 74 </settings-reset-profile-banner> | 93 </settings-reset-profile-banner> |
| 75 </template> | 94 </template> |
| 76 <if expr="chromeos"> | 95 <if expr="chromeos"> |
| 96 <div id="secondaryUserBanner" class="layout horizontal center" |
| 97 hidden="[[!showSecondaryUserBanner_]]"> |
| 98 <div id="secondaryUserIcon"></div> |
| 99 <div class="flex">$i18n{secondaryUserBannerText}</div> |
| 100 </div> |
| 101 </if> |
| 102 <if expr="chromeos"> |
| 77 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" | 103 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" |
| 78 restamp> | 104 restamp> |
| 79 <settings-section page-title="$i18n{internetPageTitle}" | 105 <settings-section page-title="$i18n{internetPageTitle}" |
| 80 section="internet"> | 106 section="internet"> |
| 81 <settings-internet-page prefs="{{prefs}}"> | 107 <settings-internet-page prefs="{{prefs}}"> |
| 82 </settings-internet-page> | 108 </settings-internet-page> |
| 83 </settings-section> | 109 </settings-section> |
| 84 </template> | 110 </template> |
| 85 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" | 111 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" |
| 86 restamp> | 112 restamp> |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 section="reset"> | 268 section="reset"> |
| 243 <settings-reset-page></settings-reset-page> | 269 <settings-reset-page></settings-reset-page> |
| 244 </settings-section> | 270 </settings-section> |
| 245 </template> | 271 </template> |
| 246 </div> | 272 </div> |
| 247 </template> | 273 </template> |
| 248 </div> | 274 </div> |
| 249 </template> | 275 </template> |
| 250 <script src="basic_page.js"></script> | 276 <script src="basic_page.js"></script> |
| 251 </dom-module> | 277 </dom-module> |
| OLD | NEW |