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

Side by Side Diff: chrome/browser/resources/chromeos/wallpaper_manager/css/wallpaper_manager.css

Issue 10919253: Fix img misalign and hide "by" when nothing selected in new wallpaepr picker ui (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 html { 5 html {
6 height: 100%; 6 height: 100%;
7 } 7 }
8 8
9 body { 9 body {
10 background-color: #f1f1f1; 10 background-color: #f1f1f1;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 padding: 10px 2px 4px 2px; 75 padding: 10px 2px 4px 2px;
76 } 76 }
77 77
78 #category-container, 78 #category-container,
79 #custom-container { 79 #custom-container {
80 -webkit-box-flex: 1; 80 -webkit-box-flex: 1;
81 -webkit-box-orient: vertical; 81 -webkit-box-orient: vertical;
82 display: -webkit-box; 82 display: -webkit-box;
83 } 83 }
84 84
85 #category-container[hidden],
86 #custom-container[hidden] {
87 display: none;
88 }
89
90 #custom-container { 85 #custom-container {
91 background-color: #FFF; 86 background-color: #FFF;
92 margin: 10px; 87 margin: 10px;
93 padding: 10px 40px; 88 padding: 10px 40px;
94 } 89 }
95 90
96 #custom-container > div { 91 #custom-container > div {
97 margin: 10px 0 5px 0; 92 margin: 10px 0 5px 0;
98 } 93 }
99 94
(...skipping 14 matching lines...) Expand all
114 109
115 .image-picker [role=listitem] { 110 .image-picker [role=listitem] {
116 border: 1px solid rgba(0, 0, 0, 0.15); 111 border: 1px solid rgba(0, 0, 0, 0.15);
117 border-radius: 4px; 112 border-radius: 4px;
118 height: 80px; 113 height: 80px;
119 margin: 10px; 114 margin: 10px;
120 padding: 2px; 115 padding: 2px;
121 width: 128px; 116 width: 128px;
122 } 117 }
123 118
119 /* The width and height of img tag need to be set here. Otherwise, an incorrect
120 * image size may be used during layout. Some images may be misaligned as a
121 * result. See http://code.google.com/p/chromium/issues/detail?id=148480 for
122 * screen shot.
123 */
124 .image-picker img {
125 height: 80px;
126 width: 128px;
127 }
128
124 .image-picker [selected][lead] { 129 .image-picker [selected][lead] {
125 border: 2px solid rgb(0, 102, 204); 130 border: 2px solid rgb(0, 102, 204);
126 padding: 1px; 131 padding: 1px;
127 } 132 }
128 133
129 .wallpaper-attr { 134 #wallpaper-attribute {
130 -webkit-box-orient: vertical; 135 -webkit-box-orient: vertical;
131 display: -webkit-box; 136 display: -webkit-box;
132 } 137 }
133 138
134 .bottom-bar { 139 .bottom-bar {
135 -webkit-box-align: center; 140 -webkit-box-align: center;
136 -webkit-box-orient: horizontal; 141 -webkit-box-orient: horizontal;
137 -webkit-box-pack: end; 142 -webkit-box-pack: end;
138 display: -webkit-box; 143 display: -webkit-box;
139 height: 30px; 144 height: 30px;
140 padding: 10px 15px; 145 padding: 10px 15px;
141 } 146 }
142 147
143 .bottom-bar > .spacer { 148 .bottom-bar > .spacer {
144 -webkit-box-flex: 1; 149 -webkit-box-flex: 1;
145 } 150 }
146 151
147 /* Custom wallpaper thumbnail container. */ 152 /* Custom wallpaper thumbnail container. */
148 #preview { 153 #preview {
149 -webkit-box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2); 154 -webkit-box-shadow: 0 4px 16px rgba(0, 0, 0, 0.2);
150 height: 80px; 155 height: 80px;
151 width: 128px; 156 width: 128px;
152 } 157 }
153 158
159 /* [hidden] does display:none, but its priority is too low. */
160 [hidden] {
161 display: none !important;
162 }
163
154 /* The butter bar styles are copied from file_manager.css. We will revisit 164 /* The butter bar styles are copied from file_manager.css. We will revisit
155 * it to see if we can share some code after butter bar is integrated with 165 * it to see if we can share some code after butter bar is integrated with
156 * Photo Editor. 166 * Photo Editor.
157 * See http://codereview.chromium.org/10916149/ for details. 167 * See http://codereview.chromium.org/10916149/ for details.
158 */ 168 */
159 /* TODO(bshe): Remove these styles if we can share code with file manager. */ 169 /* TODO(bshe): Remove these styles if we can share code with file manager. */
160 #butter-bar-container { 170 #butter-bar-container {
161 -webkit-box-pack: center; 171 -webkit-box-pack: center;
162 display: -webkit-box; 172 display: -webkit-box;
163 left: 0; 173 left: 0;
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 background-position: 0 0; 259 background-position: 0 0;
250 background-repeat: repeat-x; 260 background-repeat: repeat-x;
251 background-size: 16px 8px; 261 background-size: 16px 8px;
252 height: 5px; 262 height: 5px;
253 } 263 }
254 264
255 @-webkit-keyframes bg { 265 @-webkit-keyframes bg {
256 0% { background-position: 0 0; } 266 0% { background-position: 0 0; }
257 100% { background-position: -16px 0; } 267 100% { background-position: -16px 0; }
258 } 268 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698