Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(443)

Side by Side Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 2687643004: MD Settings: CrOS: Add secondary user banner (Closed)
Patch Set: Rebase + feedback Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 background-color: rgb(210, 210, 212);
dschuyler 2017/02/13 21:45:59 Is there an MD color we can use here (maybe grey 2
dschuyler 2017/02/13 22:18:47 To give more options, any of these would be ok wit
stevenjb 2017/02/13 22:59:24 TODO added. I wanted to avoid an arbitrary change
61 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS);
62 background-position: center;
63 background-repeat: no-repeat;
64 height: 55px;
65 margin: 18px;
66 width: 58px;
67 }
68
52 #toggleContainer { 69 #toggleContainer {
53 align-items: center; 70 align-items: center;
54 display: flex; 71 display: flex;
55 font: inherit; 72 font: inherit;
56 justify-content: center; 73 justify-content: center;
57 margin-bottom: 0; 74 margin-bottom: 0;
58 margin-top: 0; 75 margin-top: 0;
59 } 76 }
60 77
61 #toggleSpacer { 78 #toggleSpacer {
62 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */ 79 padding-top: 33px; /* Part of a 48px spacer (33px + 12px + 3px). */
63 } 80 }
64 81
65 iron-icon { 82 iron-icon {
66 -webkit-margin-start: 16px; 83 -webkit-margin-start: 16px;
67 } 84 }
68 </style> 85 </style>
69 <template is="dom-if" if="[[showBasicPage_( 86 <template is="dom-if" if="[[showBasicPage_(
70 currentRoute_, inSearchMode, hasExpandedSection_)]]"> 87 currentRoute_, inSearchMode, hasExpandedSection_)]]">
71 <div id="basicPage"> 88 <div id="basicPage">
72 <template is="dom-if" if="[[showResetProfileBanner_]]"> 89 <template is="dom-if" if="[[showResetProfileBanner_]]">
73 <settings-reset-profile-banner on-reset-done="onResetDone_"> 90 <settings-reset-profile-banner on-reset-done="onResetDone_">
74 </settings-reset-profile-banner> 91 </settings-reset-profile-banner>
75 </template> 92 </template>
76 <if expr="chromeos"> 93 <if expr="chromeos">
94 <div id="secondaryUserBanner" class="layout horizontal center"
95 hidden="[[!showSecondaryUserBanner_]]">
96 <div id="secondaryUserIcon"></div>
97 <div class="flex">$i18n{secondaryUserBannerText}</div>
98 </div>
99 </if>
100 <if expr="chromeos">
dschuyler 2017/02/13 21:51:50 Can lines 99 and 100 be deleted?
stevenjb 2017/02/13 21:58:27 In theory, yes, in practice, the blocks are unrela
77 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]" 101 <template is="dom-if" if="[[showPage(pageVisibility.internet)]]"
78 restamp> 102 restamp>
79 <settings-section page-title="$i18n{internetPageTitle}" 103 <settings-section page-title="$i18n{internetPageTitle}"
80 section="internet"> 104 section="internet">
81 <settings-internet-page prefs="{{prefs}}"> 105 <settings-internet-page prefs="{{prefs}}">
82 </settings-internet-page> 106 </settings-internet-page>
83 </settings-section> 107 </settings-section>
84 </template> 108 </template>
85 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]" 109 <template is="dom-if" if="[[showPage(pageVisibility.bluetooth)]]"
86 restamp> 110 restamp>
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 section="reset"> 266 section="reset">
243 <settings-reset-page></settings-reset-page> 267 <settings-reset-page></settings-reset-page>
244 </settings-section> 268 </settings-section>
245 </template> 269 </template>
246 </div> 270 </div>
247 </template> 271 </template>
248 </div> 272 </div>
249 </template> 273 </template>
250 <script src="basic_page.js"></script> 274 <script src="basic_page.js"></script>
251 </dom-module> 275 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/basic_page/basic_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698