diff options
Diffstat (limited to 'chromium/chrome/browser/resources/chromeos/first_run')
9 files changed, 76 insertions, 29 deletions
diff --git a/chromium/chrome/browser/resources/chromeos/first_run/app/background.js b/chromium/chrome/browser/resources/chromeos/first_run/app/background.js index 08cb158f78e..5d1ba842e5d 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/app/background.js +++ b/chromium/chrome/browser/resources/chromeos/first_run/app/background.js @@ -4,12 +4,9 @@ chrome.app.runtime.onLaunched.addListener(function() { chrome.app.window.create('main.html', { - 'bounds': { - 'width': 800, - 'height': 555 - }, 'frame': 'none', 'resizable': false, + 'hidden': true, }, function(appWindow) { appWindow.contentWindow.appWindow = appWindow; }); diff --git a/chromium/chrome/browser/resources/chromeos/first_run/app/greeting_image_enabled.html b/chromium/chrome/browser/resources/chromeos/first_run/app/greeting_image_enabled.html index 9b05da5eb66..28ae197e27d 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/app/greeting_image_enabled.html +++ b/chromium/chrome/browser/resources/chromeos/first_run/app/greeting_image_enabled.html @@ -1,5 +1,5 @@ <div style="background-image: url(chrome://theme/IDR_FIRST_RUN_GREETING); display: inline-block; height: 235px; - width: 662px;"> + width: 662px;" class="greeting-image"> </div> diff --git a/chromium/chrome/browser/resources/chromeos/first_run/app/main.html b/chromium/chrome/browser/resources/chromeos/first_run/app/main.html index 0810b76d957..2931dc5e152 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/app/main.html +++ b/chromium/chrome/browser/resources/chromeos/first_run/app/main.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="chrome://resources/css/apps/common.css"> <link rel="stylesheet" href="chrome://resources/css/apps/topbutton_bar.css"> <link rel="stylesheet" href="../step.css"> + <link rel="stylesheet" href="../preload.css"> <link rel="stylesheet" href="style.css"> <script src="chrome://resources/js/load_time_data.js"></script> <script src="chrome://resources/js/util.js"></script> @@ -30,11 +31,9 @@ <span i18n-content="greetingText2"></span> </p> <div class="controls"> - <div class="margin-top"></div> <button i18n-content="greetingButton" class="next-button custom-appearance blue-button" tabindex="0"> </button> - <div class="margin-bottom"></div> </div> <include src="greeting_image_[GREETING_IMAGE].html"> </div> diff --git a/chromium/chrome/browser/resources/chromeos/first_run/app/main.js b/chromium/chrome/browser/resources/chromeos/first_run/app/main.js index 5b7c1d14601..e1afc5b29d0 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/app/main.js +++ b/chromium/chrome/browser/resources/chromeos/first_run/app/main.js @@ -2,17 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -/** - * Global wallpaperManager reference useful for poking at from the console. - */ -var wallpaperManager; - function init() { + var content = $('greeting'); chrome.firstRunPrivate.getLocalizedStrings(function(strings) { loadTimeData.data = strings; i18nTemplate.process(document, loadTimeData); + // Resizing and centering app's window. + var bounds = {}; + bounds.width = content.offsetWidth; + bounds.height = content.offsetHeight; + bounds.left = Math.round(0.5 * (window.screen.availWidth - bounds.width)); + bounds.top = Math.round(0.5 * (window.screen.availHeight - bounds.height)); + appWindow.setBounds(bounds); + appWindow.show(); }); - var content = $('greeting'); var closeButton = content.getElementsByClassName('close-button')[0]; // Make close unfocusable by mouse. closeButton.addEventListener('mousedown', function(e) { diff --git a/chromium/chrome/browser/resources/chromeos/first_run/app/style.css b/chromium/chrome/browser/resources/chromeos/first_run/app/style.css index 33cce94564b..399b29ada46 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/app/style.css +++ b/chromium/chrome/browser/resources/chromeos/first_run/app/style.css @@ -13,7 +13,6 @@ body { align-items: center; display: flex; flex-direction: column; - height: 475px; padding: 40px; text-align: center; width: 720px; @@ -28,20 +27,12 @@ body { .step.dialog p { font-size: 15px; margin-bottom: 0; + margin-top: 0; } .step.dialog .controls { - display: flex; - flex-direction: column; - flex-grow: 1; -} - -.step.dialog .controls .margin-top { - flex-grow: 8; -} - -.step.dialog .controls .margin-bottom { - flex-grow: 5; + margin-bottom: 0; + margin-top: 40px; } .step.dialog .controls button { @@ -76,3 +67,8 @@ body { -webkit-margin-end: 0; display: inline; } + +.step.dialog .greeting-image { + margin-bottom: 49px; + margin-top: 64px; +} diff --git a/chromium/chrome/browser/resources/chromeos/first_run/first_run.html b/chromium/chrome/browser/resources/chromeos/first_run/first_run.html index b7735c6b9af..e4d129b3247 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/first_run.html +++ b/chromium/chrome/browser/resources/chromeos/first_run/first_run.html @@ -7,6 +7,7 @@ <link rel="stylesheet" href="chrome://resources/css/apps/common.css"> <link rel="stylesheet" href="bubble.css"> <link rel="stylesheet" href="first_run.css"> + <link rel="stylesheet" href="preload.css"> <link rel="stylesheet" href="step.css"> <link rel="stylesheet" href="step_bubble.css"> <script src="chrome://resources/js/cr.js"></script> diff --git a/chromium/chrome/browser/resources/chromeos/first_run/help_step.html b/chromium/chrome/browser/resources/chromeos/first_run/help_step.html index 0888d15e159..0a9c513079e 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/help_step.html +++ b/chromium/chrome/browser/resources/chromeos/first_run/help_step.html @@ -2,10 +2,7 @@ <div id="completion-image"></div> <h1 i18n-content="helpHeader"></h1> <p i18n-content="helpText1"></p> - <p> - <span i18n-content="helpText2"></span><br> - <span i18n-content="helpText3"></span> - </p> + <p i18n-content="helpText2"></p> <div class="controls"> <button i18n-content="helpKeepExploringButton" class="help-button custom-appearance blue-button"></button> diff --git a/chromium/chrome/browser/resources/chromeos/first_run/preload.css b/chromium/chrome/browser/resources/chromeos/first_run/preload.css new file mode 100644 index 00000000000..78e74c0f48e --- /dev/null +++ b/chromium/chrome/browser/resources/chromeos/first_run/preload.css @@ -0,0 +1,53 @@ +/** + * Copyright 2014 The Chromium Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +/** + * Preloads images. Without preloading, background image starts loading in + * the moment when CSS property is applied. Image loading has visible delay and + * looks like defect. + */ + +@media all and (-webkit-max-device-pixel-ratio: 1.5) { + body::after { + content: + url('chrome://resources/images/apps/button.png') + url('chrome://resources/images/apps/button_hover.png') + url('chrome://resources/images/apps/button_pressed.png') + url('chrome://resources/images/apps/button_focused.png') + url('chrome://resources/images/apps/button_focused_hover.png') + url('chrome://resources/images/apps/button_focused_pressed.png') + url('chrome://resources/images/apps/button_inactive.png') + url('chrome://resources/images/apps/blue_button.png') + url('chrome://resources/images/apps/blue_button_hover.png') + url('chrome://resources/images/apps/blue_button_pressed.png') + url('chrome://resources/images/apps/blue_button_focused.png') + url('chrome://resources/images/apps/blue_button_focused_hover.png') + url('chrome://resources/images/apps/blue_button_focused_pressed.png') + url('chrome://resources/images/apps/blue_button_inactive.png'); + display: none; + } +} + +@media all and (-webkit-min-device-pixel-ratio: 1.5) { + body::after { + content: + url('chrome://resources/images/2x/apps/button.png') + url('chrome://resources/images/2x/apps/button_hover.png') + url('chrome://resources/images/2x/apps/button_pressed.png') + url('chrome://resources/images/2x/apps/button_focused.png') + url('chrome://resources/images/2x/apps/button_focused_hover.png') + url('chrome://resources/images/2x/apps/button_focused_pressed.png') + url('chrome://resources/images/2x/apps/button_inactive.png') + url('chrome://resources/images/2x/apps/blue_button.png') + url('chrome://resources/images/2x/apps/blue_button_hover.png') + url('chrome://resources/images/2x/apps/blue_button_pressed.png') + url('chrome://resources/images/2x/apps/blue_button_focused.png') + url('chrome://resources/images/2x/apps/blue_button_focused_hover.png') + url('chrome://resources/images/2x/apps/blue_button_focused_pressed.png') + url('chrome://resources/images/2x/apps/blue_button_inactive.png'); + display: none; + } +} diff --git a/chromium/chrome/browser/resources/chromeos/first_run/step_bubble.css b/chromium/chrome/browser/resources/chromeos/first_run/step_bubble.css index 1e99a970dfc..202a2de24ac 100644 --- a/chromium/chrome/browser/resources/chromeos/first_run/step_bubble.css +++ b/chromium/chrome/browser/resources/chromeos/first_run/step_bubble.css @@ -7,6 +7,7 @@ .step.bubble { border: 1px solid; border-radius: 3px; + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); display: inline-block; position: absolute; width: 400px; |