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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/chromeos/wallpaper_manager/main.html

Issue 12042095: Move wallpaper progress bar on top of thumbnails (completely remove butter bar) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | 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 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <!-- 2 <!--
3 ------ 3 ------
4 Copyright (c) 2013 The Chromium Authors. All rights reserved. 4 Copyright (c) 2013 The Chromium Authors. All rights reserved.
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 <html i18n-values="dir:textdirection;"> 8 <html i18n-values="dir:textdirection;">
9 <head> 9 <head>
10 <title>Wallpaper Picker</title> 10 <title>Wallpaper Picker</title>
(...skipping 11 matching lines...) Expand all
22 <script src="../../../../../ui/webui/resources/js/cr/ui.js"></script> 22 <script src="../../../../../ui/webui/resources/js/cr/ui.js"></script>
23 <script src="../../../../../ui/webui/resources/js/cr/event_target.js"></scri pt> 23 <script src="../../../../../ui/webui/resources/js/cr/event_target.js"></scri pt>
24 <script src="../../../../../ui/webui/resources/js/cr/ui/touch_handler.js"></ script> 24 <script src="../../../../../ui/webui/resources/js/cr/ui/touch_handler.js"></ script>
25 <script src="../../../../../ui/webui/resources/js/cr/ui/array_data_model.js" ></script> 25 <script src="../../../../../ui/webui/resources/js/cr/ui/array_data_model.js" ></script>
26 <script src="../../../../../ui/webui/resources/js/cr/ui/list_item.js"></scri pt> 26 <script src="../../../../../ui/webui/resources/js/cr/ui/list_item.js"></scri pt>
27 <script src="../../../../../ui/webui/resources/js/cr/ui/list_selection_model .js"></script> 27 <script src="../../../../../ui/webui/resources/js/cr/ui/list_selection_model .js"></script>
28 <script src="../../../../../ui/webui/resources/js/cr/ui/list_single_selectio n_model.js"></script> 28 <script src="../../../../../ui/webui/resources/js/cr/ui/list_single_selectio n_model.js"></script>
29 <script src="../../../../../ui/webui/resources/js/cr/ui/list_selection_contr oller.js"></script> 29 <script src="../../../../../ui/webui/resources/js/cr/ui/list_selection_contr oller.js"></script>
30 <script src="../../../../../ui/webui/resources/js/cr/ui/list.js"></script> 30 <script src="../../../../../ui/webui/resources/js/cr/ui/list.js"></script>
31 <script src="../../../../../ui/webui/resources/js/cr/ui/grid.js"></script> 31 <script src="../../../../../ui/webui/resources/js/cr/ui/grid.js"></script>
32 <script src="js/butter_bar.js"></script> 32 <script src="js/progress_manager.js"></script>
33 <script src="js/wallpaper_images_grid.js"></script> 33 <script src="js/wallpaper_images_grid.js"></script>
34 <script src="js/wallpaper_manager.js"></script> 34 <script src="js/wallpaper_manager.js"></script>
35 <script src="js/main.js"></script> 35 <script src="js/main.js"></script>
36 </if> 36 </if>
37 </head> 37 </head>
38 <body i18n-values=".style.fontFamily:webFontFamily; 38 <body i18n-values=".style.fontFamily:webFontFamily;
39 .style.fontSize:webFontSize"> 39 .style.fontSize:webFontSize">
40 <div class="dialog-container"> 40 <div class="dialog-container">
41 <div class="dialog-topbar"> 41 <div class="dialog-topbar">
42 <div id="navstrip"> 42 <div id="navstrip">
43 <list id="categories-list"></list> 43 <list id="categories-list"></list>
44 <div id="bar"></div> 44 <div id="bar"></div>
45 </div> 45 </div>
46 <div class="spacer"></div> 46 <div class="spacer"></div>
47 <img id="close" src="images/ui/close-white.png"> 47 <div id="close"></div>
48 </div> 48 </div>
49 <div class="dialog-main"> 49 <div class="dialog-main">
50 <div id="category-container"> 50 <div id="category-container">
51 <grid id="wallpaper-grid" class="image-picker"></grid> 51 <grid id="wallpaper-grid" class="image-picker"></grid>
52 <div class="progress-bar" hidden>
53 <div class="progress-track"></div>
54 </div>
52 <div class="bottom-bar"> 55 <div class="bottom-bar">
53 <img id="attribute-image" hidden> 56 <img id="attribute-image" hidden>
54 <div id="wallpaper-attribute" hidden> 57 <div id="wallpaper-attribute" hidden>
55 <div> 58 <div>
56 <label> 59 <label>
57 <span id="author-name"></span> 60 <span id="author-name"></span>
58 </label> 61 </label>
59 </div> 62 </div>
60 <div> 63 <div>
61 <a id="author-website" target="_blank"></a> 64 <a id="author-website" target="_blank"></a>
(...skipping 11 matching lines...) Expand all
73 <option value="CENTER" i18n-content="centerLayout"></option> 76 <option value="CENTER" i18n-content="centerLayout"></option>
74 <option selected="selected" value="CENTER_CROPPED" 77 <option selected="selected" value="CENTER_CROPPED"
75 i18n-content="centerCroppedLayout"></option> 78 i18n-content="centerCroppedLayout"></option>
76 <option value="STRETCH" i18n-content="stretchLayout"></option> 79 <option value="STRETCH" i18n-content="stretchLayout"></option>
77 </select> 80 </select>
78 <div i18n-content="previewLabel"></div> 81 <div i18n-content="previewLabel"></div>
79 <img id="preview"> 82 <img id="preview">
80 </div> 83 </div>
81 </div> 84 </div>
82 </div> 85 </div>
83 <div id="butter-bar-container">
84 <div id="butter-bar">
85 <div class="content">
86 <div>
87 <span class="butter-message"></span>
88 <a class="learn-more" i18n-content="learnMore" target="_blank"></a>
89 </div>
90 <div class="progress-bar" hidden>
91 <div class="progress-track"></div>
92 </div>
93 </div>
94 <div class="actions" hidden></div>
95 </div>
96 </div>
97 </body> 86 </body>
98 </html> 87 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698