summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 11:37:50 +0000
committerkaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 11:37:50 +0000
commit896459a4776780c98ae641c5c7516741911136ce (patch)
tree2ff1c772946b7b262f80e2ddd81d7df91661663b
parent5aedfa61b29de726e0dd25252156842f6d25c605 (diff)
downloadchromium_src-896459a4776780c98ae641c5c7516741911136ce.zip
chromium_src-896459a4776780c98ae641c5c7516741911136ce.tar.gz
chromium_src-896459a4776780c98ae641c5c7516741911136ce.tar.bz2
Gave 0.5 opacity to 'Loading Google Docs' spinner
BUG=chromium-os:28298 TEST= Review URL: https://chromiumcodereview.appspot.com/10025018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131346 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/css/file_manager.css16
-rw-r--r--chrome/browser/resources/file_manager/js/file_manager.js8
2 files changed, 16 insertions, 8 deletions
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index c44414e..b706ac1 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -1236,16 +1236,16 @@ div.unmounted-panel > div {
display: -webkit-box;
}
-.unmounted-panel > .gdata.loading,
-.unmounted-panel > .gdata.error {
- margin-left: -30px; /* Room for the spinner.*/
- padding-left: 30px;
+.unmounted-panel > .gdata.loading {
+ position: relative;
}
-.unmounted-panel > .gdata.loading {
- background-image: url(../images/spinner.svg);
- background-position: 0 center;
- background-repeat: no-repeat;
+.unmounted-panel > .gdata.loading .spinner-box {
+ bottom: 0;
+ position: absolute;
+ right: 100%;
+ top: 0;
+ width: 40px;
}
.unmounted-panel:not([loading]) > .gdata.loading,
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index a260248..7539fb3 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -909,6 +909,14 @@ FileManager.prototype = {
loading.textContent = strf('GDATA_LOADING', str('GDATA_PRODUCT_NAME'));
this.unmountedPanel_.appendChild(loading);
+ var spinnerBox = this.document_.createElement('div');
+ spinnerBox.className = 'spinner-box';
+ loading.appendChild(spinnerBox);
+
+ var spinner = this.document_.createElement('div');
+ spinner.className = 'spinner';
+ spinnerBox.appendChild(spinner);
+
var error = this.document_.createElement('div');
error.className = 'gdata error';
error.textContent = strf('GDATA_CANNOT_REACH', str('GDATA_PRODUCT_NAME'));