OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/hidden_style_css.html"> |
4 <link rel="import" href="../appearance_page/appearance_page.html"> | 4 <link rel="import" href="../appearance_page/appearance_page.html"> |
5 <link rel="import" href="../controls/settings_idle_load.html"> | 5 <link rel="import" href="../controls/settings_idle_load.html"> |
6 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 6 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
7 <link rel="import" href="../people_page/people_page.html"> | 7 <link rel="import" href="../people_page/people_page.html"> |
8 <link rel="import" href="../reset_page/reset_profile_banner.html"> | 8 <link rel="import" href="../reset_page/reset_profile_banner.html"> |
9 <link rel="import" href="../search_page/search_page.html"> | 9 <link rel="import" href="../search_page/search_page.html"> |
10 <link rel="import" href="../settings_page/main_page_behavior.html"> | 10 <link rel="import" href="../settings_page/main_page_behavior.html"> |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 align-items: center; | 42 align-items: center; |
43 display: flex; | 43 display: flex; |
44 margin-bottom: 3px; | 44 margin-bottom: 3px; |
45 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ | 45 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ |
46 min-height: 32px; | 46 min-height: 32px; |
47 padding: 0 12px; | 47 padding: 0 12px; |
48 } | 48 } |
49 | 49 |
50 #secondaryUserBanner { | 50 #secondaryUserBanner { |
51 @apply(--shadow-elevation-2dp); | 51 @apply(--shadow-elevation-2dp); |
| 52 align-items: center; |
52 background-color: white; | 53 background-color: white; |
53 border-radius: 2px; | 54 border-radius: 2px; |
| 55 display: flex; |
54 margin: 21px 0; | 56 margin: 21px 0; |
55 } | 57 } |
56 | 58 |
57 #secondaryUserIcon { | 59 #secondaryUserIcon { |
58 /* TODO(stevenjb): Replace this with the correct variable or color once | 60 /* TODO(stevenjb): Replace this with the correct variable or color once |
59 * established by UX, see crbug.com/687749. */ | 61 * established by UX, see crbug.com/687749. */ |
60 background-color : rgb(210, 210, 212); | 62 background-color : rgb(210, 210, 212); |
61 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS); | 63 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS); |
62 background-position: center; | 64 background-position: center; |
63 background-repeat: no-repeat; | 65 background-repeat: no-repeat; |
(...skipping 20 matching lines...) Expand all Loading... |
84 } | 86 } |
85 </style> | 87 </style> |
86 <template is="dom-if" if="[[showBasicPage_( | 88 <template is="dom-if" if="[[showBasicPage_( |
87 currentRoute_, inSearchMode, hasExpandedSection_)]]"> | 89 currentRoute_, inSearchMode, hasExpandedSection_)]]"> |
88 <div id="basicPage"> | 90 <div id="basicPage"> |
89 <template is="dom-if" if="[[showResetProfileBanner_]]" restamp> | 91 <template is="dom-if" if="[[showResetProfileBanner_]]" restamp> |
90 <settings-reset-profile-banner on-close="onResetProfileBannerClosed_"> | 92 <settings-reset-profile-banner on-close="onResetProfileBannerClosed_"> |
91 </settings-reset-profile-banner> | 93 </settings-reset-profile-banner> |
92 </template> | 94 </template> |
93 <if expr="chromeos"> | 95 <if expr="chromeos"> |
94 <div id="secondaryUserBanner" class="layout horizontal center" | 96 <div id="secondaryUserBanner" hidden="[[!showSecondaryUserBanner_]]"> |
95 hidden="[[!showSecondaryUserBanner_]]"> | |
96 <div id="secondaryUserIcon"></div> | 97 <div id="secondaryUserIcon"></div> |
97 <div class="flex">$i18n{secondaryUserBannerText}</div> | 98 <div class="flex">$i18n{secondaryUserBannerText}</div> |
98 </div> | 99 </div> |
99 </if> | 100 </if> |
100 <if expr="chromeos"> | 101 <if expr="chromeos"> |
101 <template is="dom-if" if="[[showPage_(pageVisibility.internet)]]" | 102 <template is="dom-if" if="[[showPage_(pageVisibility.internet)]]" |
102 restamp> | 103 restamp> |
103 <settings-section page-title="$i18n{internetPageTitle}" | 104 <settings-section page-title="$i18n{internetPageTitle}" |
104 section="internet"> | 105 section="internet"> |
105 <settings-internet-page prefs="{{prefs}}"> | 106 <settings-internet-page prefs="{{prefs}}"> |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
267 section="reset"> | 268 section="reset"> |
268 <settings-reset-page></settings-reset-page> | 269 <settings-reset-page></settings-reset-page> |
269 </settings-section> | 270 </settings-section> |
270 </template> | 271 </template> |
271 </div> | 272 </div> |
272 </template> | 273 </template> |
273 </template> | 274 </template> |
274 </template> | 275 </template> |
275 <script src="basic_page.js"></script> | 276 <script src="basic_page.js"></script> |
276 </dom-module> | 277 </dom-module> |
OLD | NEW |