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

Side by Side Diff: chrome/browser/resources/settings/people_page/change_picture.html

Issue 2451373002: [MD Settings][People] Fixes picture tooltips and sizes in change picture page. (Closed)
Patch Set: Created 4 years, 1 month 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 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 2 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
4 <link rel="import" href="chrome://resources/html/util.html"> 4 <link rel="import" href="chrome://resources/html/util.html">
5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11 y-keys.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
9 <link rel="import" href="/i18n_setup.html"> 9 <link rel="import" href="/i18n_setup.html">
10 <link rel="import" href="/icons.html"> 10 <link rel="import" href="/icons.html">
11 <link rel="import" href="/people_page/camera.html"> 11 <link rel="import" href="/people_page/camera.html">
12 <link rel="import" href="/people_page/change_picture_browser_proxy.html"> 12 <link rel="import" href="/people_page/change_picture_browser_proxy.html">
13 <link rel="import" href="/settings_shared_css.html"> 13 <link rel="import" href="/settings_shared_css.html">
14 14
15 <dom-module id="settings-change-picture"> 15 <dom-module id="settings-change-picture">
16 <template> 16 <template>
17 <style include="settings-shared"> 17 <style include="settings-shared">
18 #container { 18 #container {
19 -webkit-margin-start: 16px; 19 -webkit-margin-start: 16px;
20 align-items: flex-start; 20 align-items: flex-start;
21 padding-top: 16px; 21 padding-top: 16px;
22 } 22 }
23 23
24 #availableIcons {
25 margin: -8px;
26 }
27
24 #availableIcons img, 28 #availableIcons img,
25 #availableIcons iron-icon { 29 #availableIcons iron-icon {
26 border-radius: 4px; 30 border-radius: 4px;
27 margin: 8px; 31 margin: 8px;
28 } 32 }
29 33
30 #availableIcons img { 34 #availableIcons img {
31 height: 64px; 35 height: 64px;
32 padding: 2px; 36 padding: 2px;
33 vertical-align: top; 37 vertical-align: top;
34 width: 64px; 38 width: 64px;
35 } 39 }
36 40
37 #availableIcons iron-icon { 41 #availableIcons iron-icon {
42 --iron-icon-fill-color: var(--google-grey-500);
43 --iron-icon-height: 32px;
44 --iron-icon-width: 32px;
38 border: 1px solid var(--google-grey-500); 45 border: 1px solid var(--google-grey-500);
39 padding: 17px; 46 padding: 17px;
40 } 47 }
41 48
42 #availableIcons .iron-selected { 49 #availableIcons .iron-selected {
43 border: 2px solid var(--google-blue-500); 50 border: 2px solid var(--google-blue-500);
44 } 51 }
45 52
46 #availableIcons img.iron-selected { 53 #availableIcons img.iron-selected {
47 padding: 0; 54 padding: 0;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 </style> 92 </style>
86 <div id="container" class="settings-box" tabindex="0"> 93 <div id="container" class="settings-box" tabindex="0">
87 <iron-a11y-keys keys="up down left right space enter" 94 <iron-a11y-keys keys="up down left right space enter"
88 on-keys-pressed="onKeysPress_"> 95 on-keys-pressed="onKeysPress_">
89 </iron-a11y-keys> 96 </iron-a11y-keys>
90 <div id="availableIcons" class="start"> 97 <div id="availableIcons" class="start">
91 <iron-selector id="selector" on-iron-activate="onImageActivate_" 98 <iron-selector id="selector" on-iron-activate="onImageActivate_"
92 selected-item="{{selectedItem_}}"> 99 selected-item="{{selectedItem_}}">
93 <iron-icon id="cameraImage" 100 <iron-icon id="cameraImage"
94 data-type$="[[selectionTypesEnum_.CAMERA]]" 101 data-type$="[[selectionTypesEnum_.CAMERA]]"
95 icon="settings:camera-alt" alt="$i18n{takePhoto}" 102 icon="settings:camera-alt" title="$i18n{takePhoto}"
96 hidden="[[!cameraPresent_]]"> 103 hidden="[[!cameraPresent_]]">
97 </iron-icon> 104 </iron-icon>
98 <iron-icon data-type$="[[selectionTypesEnum_.FILE]]" 105 <iron-icon data-type$="[[selectionTypesEnum_.FILE]]"
99 icon="settings:folder" alt="$i18n{chooseFile}"> 106 icon="settings:folder" title="$i18n{chooseFile}">
100 </iron-icon> 107 </iron-icon>
101 <img id="profileImage" 108 <img id="profileImage"
102 data-type$="[[selectionTypesEnum_.PROFILE]]" 109 data-type$="[[selectionTypesEnum_.PROFILE]]"
103 src="[[profileImageUrl_]]" alt="$i18n{profilePhotoLoading}"> 110 src="[[profileImageUrl_]]" title="$i18n{profilePhotoLoading}">
104 <img id="oldImage" data-type$="[[selectionTypesEnum_.OLD]]" 111 <img id="oldImage" data-type$="[[selectionTypesEnum_.OLD]]"
105 src="[[oldImageUrl_]]" hidden="[[!oldImageUrl_]]"> 112 src="[[oldImageUrl_]]" hidden="[[!oldImageUrl_]]">
106 <template is="dom-repeat" items="[[defaultImages_]]"> 113 <template is="dom-repeat" items="[[defaultImages_]]">
107 <img data-type$="[[selectionTypesEnum_.DEFAULT]]" 114 <img data-type$="[[selectionTypesEnum_.DEFAULT]]"
108 data-default-image-index$="[[index]]" src="[[item.url]]" 115 data-default-image-index$="[[index]]" src="[[item.url]]"
109 alt="[[item.title]]"> 116 title="[[item.title]]">
110 </template> 117 </template>
111 </iron-selector> 118 </iron-selector>
112 <template is="dom-if" if="[[isAuthorCreditShown_(selectedItem_)]]"> 119 <template is="dom-if" if="[[isAuthorCreditShown_(selectedItem_)]]">
113 <div id="authorCredit"> 120 <div id="authorCredit">
114 $i18n{authorCredit} 121 $i18n{authorCredit}
115 [[getAuthorName_(selectedItem_, defaultImages_)]] 122 [[getAuthorName_(selectedItem_, defaultImages_)]]
116 <a href="[[getAuthorWebsite_(selectedItem_, defaultImages_)]]" 123 <a href="[[getAuthorWebsite_(selectedItem_, defaultImages_)]]"
117 target="_blank"> 124 target="_blank">
118 [[getAuthorWebsite_(selectedItem_, defaultImages_)]] 125 [[getAuthorWebsite_(selectedItem_, defaultImages_)]]
119 </a> 126 </a>
(...skipping 11 matching lines...) Expand all
131 </paper-icon-button> 138 </paper-icon-button>
132 </div> 139 </div>
133 <settings-camera id="camera" 140 <settings-camera id="camera"
134 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]" 141 camera-active="[[isCameraActive_(cameraPresent_, selectedItem_)]]"
135 on-phototaken="onPhotoTaken_"> 142 on-phototaken="onPhotoTaken_">
136 </div> 143 </div>
137 </div> 144 </div>
138 </template> 145 </template>
139 <script src="change_picture.js"></script> 146 <script src="change_picture.js"></script>
140 </dom-module> 147 </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