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

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

Issue 2944213002: Settings: Fix alignment of secondary user warning (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="../appearance_page/appearance_page.html"> 5 <link rel="import" href="../appearance_page/appearance_page.html">
6 <link rel="import" href="../controls/settings_idle_load.html"> 6 <link rel="import" href="../controls/settings_idle_load.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="../people_page/people_page.html"> 8 <link rel="import" href="../people_page/people_page.html">
9 <link rel="import" href="../reset_page/reset_profile_banner.html"> 9 <link rel="import" href="../reset_page/reset_profile_banner.html">
10 <link rel="import" href="../search_page/search_page.html"> 10 <link rel="import" href="../search_page/search_page.html">
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 align-items: center; 47 align-items: center;
48 display: flex; 48 display: flex;
49 margin-bottom: 3px; 49 margin-bottom: 3px;
50 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */ 50 margin-top: 12px; /* Part of a 48px spacer (33px + 12px + 3px). */
51 min-height: 32px; 51 min-height: 32px;
52 padding: 0 12px; 52 padding: 0 12px;
53 } 53 }
54 54
55 #secondaryUserBanner { 55 #secondaryUserBanner {
56 @apply(--shadow-elevation-2dp); 56 @apply(--shadow-elevation-2dp);
57 align-items: center;
57 background-color: white; 58 background-color: white;
58 border-radius: 2px; 59 border-radius: 2px;
60 display: flex;
59 margin: 21px 0; 61 margin: 21px 0;
60 } 62 }
61 63
62 #secondaryUserIcon { 64 #secondaryUserIcon {
63 /* TODO(stevenjb): Replace this with the correct variable or color once 65 /* TODO(stevenjb): Replace this with the correct variable or color once
64 * established by UX, see crbug.com/687749. */ 66 * established by UX, see crbug.com/687749. */
65 background-color : rgb(210, 210, 212); 67 background-color : rgb(210, 210, 212);
66 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS); 68 background-image: url(chrome://theme/IDR_SECONDARY_USER_SETTINGS);
67 background-position: center; 69 background-position: center;
68 background-repeat: no-repeat; 70 background-repeat: no-repeat;
(...skipping 20 matching lines...) Expand all
89 } 91 }
90 </style> 92 </style>
91 <template is="dom-if" if="[[showBasicPage_( 93 <template is="dom-if" if="[[showBasicPage_(
92 currentRoute_, inSearchMode, hasExpandedSection_)]]"> 94 currentRoute_, inSearchMode, hasExpandedSection_)]]">
93 <div id="basicPage"> 95 <div id="basicPage">
94 <template is="dom-if" if="[[showResetProfileBanner_]]" restamp> 96 <template is="dom-if" if="[[showResetProfileBanner_]]" restamp>
95 <settings-reset-profile-banner on-close="onResetProfileBannerClosed_"> 97 <settings-reset-profile-banner on-close="onResetProfileBannerClosed_">
96 </settings-reset-profile-banner> 98 </settings-reset-profile-banner>
97 </template> 99 </template>
98 <if expr="chromeos"> 100 <if expr="chromeos">
99 <div id="secondaryUserBanner" class="layout horizontal center" 101 <div id="secondaryUserBanner" hidden="[[!showSecondaryUserBanner_]]">
100 hidden="[[!showSecondaryUserBanner_]]">
101 <div id="secondaryUserIcon"></div> 102 <div id="secondaryUserIcon"></div>
102 <div class="flex">$i18n{secondaryUserBannerText}</div> 103 <div class="flex">$i18n{secondaryUserBannerText}</div>
103 </div> 104 </div>
104 </if> 105 </if>
105 <if expr="chromeos"> 106 <if expr="chromeos">
106 <template is="dom-if" if="[[showPage_(pageVisibility.internet)]]" 107 <template is="dom-if" if="[[showPage_(pageVisibility.internet)]]"
107 restamp> 108 restamp>
108 <settings-section page-title="$i18n{internetPageTitle}" 109 <settings-section page-title="$i18n{internetPageTitle}"
109 section="internet"> 110 section="internet">
110 <settings-internet-page prefs="{{prefs}}"> 111 <settings-internet-page prefs="{{prefs}}">
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 section="reset"> 280 section="reset">
280 <settings-reset-page></settings-reset-page> 281 <settings-reset-page></settings-reset-page>
281 </settings-section> 282 </settings-section>
282 </template> 283 </template>
283 </div> 284 </div>
284 </template> 285 </template>
285 </template> 286 </template>
286 </template> 287 </template>
287 <script src="basic_page.js"></script> 288 <script src="basic_page.js"></script>
288 </dom-module> 289 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698