chrome/browser/resources/chromeos/wallpaper_manager/main.html - Issue 12334030: New custom wallpaper picker UI

Unified Diff: chrome/browser/resources/chromeos/wallpaper_manager/main.html

Issue 12334030: New custom wallpaper picker UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 side-by-side diff with in-line comments

« chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('K') | « chrome/browser/resources/chromeos/wallpaper_manager/js/wallpaper_manager.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/wallpaper_manager/main.html

diff --git a/chrome/browser/resources/chromeos/wallpaper_manager/main.html b/chrome/browser/resources/chromeos/wallpaper_manager/main.html

index be82a347c785d41d5c0938faf45132e809ca30af..7da60b734741ade6654b048ed8cc5e73f9f8aa38 100644

--- a/chrome/browser/resources/chromeos/wallpaper_manager/main.html

+++ b/chrome/browser/resources/chromeos/wallpaper_manager/main.html

@@ -37,13 +37,32 @@ found in the LICENSE file.

</head>

<body i18n-values=".style.fontFamily:webFontFamily;

.style.fontSize:webFontSize">

- <div id="error-container" hidden>

+ <div id="error-container" class="overlay-container" hidden>

- <div id="close-error"></div>

+ <div id="close-error" class="close-overlay"></div>

</div>

+ <div id="wallpaper-selection-container" class="overlay-container" hidden>

+ <div class="page">

+ <div id="close-wallpaper-selection" class="close-overlay"></div>

+ <div id="content">

+ <input id="file-selector" type="file" size="80" accept="image/jpeg">

+ <div i18n-content="positionLabel"></div>

+ <select id="set-wallpaper-layout" disabled>

+ <option value="CENTER" i18n-content="centerLayout"></option>

+ <option selected="selected" value="CENTER_CROPPED"

+ i18n-content="centerCroppedLayout"></option>

+ <option value="STRETCH" i18n-content="stretchLayout"></option>

+ </select>

+ <div id="warning">

+ <img class="remember-icon">

+ <span i18n-content="customWallpaperWarning"></span>

+ </div>

@@ -60,34 +79,22 @@ found in the LICENSE file.

</div>

- <img id="attribute-image" hidden>

- <div id="wallpaper-attribute" hidden>

- <div>

- <label>

- <span id="author-name"></span>

- </label>

- </div>

- <div>

- <a id="author-website" target="_blank"></a>

+ <div id="online-wallpaper-attribute">

+ <img id="attribute-image" hidden>

+ <div id="wallpaper-attribute" hidden>

+ <div>

+ <label>

+ <span id="author-name"></span>

+ </label>

+ </div>

+ <div>

+ <a id="author-website" target="_blank"></a>

+ </div>

</div>

</div>

- <div id="custom-container" hidden>

- <div i18n-content="selectCustomLabel"></div>

- <input id="file-selector" type="file" accept="image/jpeg">

- <div i18n-content="customWallpaperWarning"></div>

- <div i18n-content="positionLabel"></div>

- <select id="set-wallpaper-layout">

- <option value="CENTER" i18n-content="centerLayout"></option>

- <option selected="selected" value="CENTER_CROPPED"

- i18n-content="centerCroppedLayout"></option>

- <option value="STRETCH" i18n-content="stretchLayout"></option>

- </select>

- <div i18n-content="previewLabel"></div>

- <img id="preview">

- </div>

</div>

</body>