summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 10:31:16 +0000
committeryoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 10:31:16 +0000
commitcc42242540894c42c79fcc0819804820d376ed64 (patch)
tree9e0faee5095e84bbb1c6e2079c1a4ebaae6f48ef
parent4945cb5c0d6c33acfa7030c04b570ac02a826f00 (diff)
downloadchromium_src-cc42242540894c42c79fcc0819804820d376ed64.zip
chromium_src-cc42242540894c42c79fcc0819804820d376ed64.tar.gz
chromium_src-cc42242540894c42c79fcc0819804820d376ed64.tar.bz2
Fiels.app: Claen-up css of the preview panel and the footer.
This patch moves the left-aligned items into the single div, and cleans-up css around the panels. BUG=none TEST=manual Review URL: https://chromiumcodereview.appspot.com/18080011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209660 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/css/common.css4
-rw-r--r--chrome/browser/resources/file_manager/css/file_manager.css18
-rw-r--r--chrome/browser/resources/file_manager/main.html45
3 files changed, 43 insertions, 24 deletions
diff --git a/chrome/browser/resources/file_manager/css/common.css b/chrome/browser/resources/file_manager/css/common.css
index a003896..03eea6c 100644
--- a/chrome/browser/resources/file_manager/css/common.css
+++ b/chrome/browser/resources/file_manager/css/common.css
@@ -120,10 +120,6 @@ input.common[type='checkbox']::after {
height: 31px;
}
-.buttonbar.right {
- -webkit-box-pack: end;
-}
-
.buttonbar button:active img {
opacity: 1.0;
}
diff --git a/chrome/browser/resources/file_manager/css/file_manager.css b/chrome/browser/resources/file_manager/css/file_manager.css
index e321c60..80679d4 100644
--- a/chrome/browser/resources/file_manager/css/file_manager.css
+++ b/chrome/browser/resources/file_manager/css/file_manager.css
@@ -489,6 +489,7 @@ div.splitter {
}
.dialog-footer .progress-bar {
+ -webkit-box-flex: 1;
-webkit-margin-end: 20px;
-webkit-margin-start: 20px;
}
@@ -1093,6 +1094,19 @@ input.rename {
opacity: 0;
}
+.preview-panel > .left,
+.dialog-footer > .left {
+ -webkit-box-align: center;
+ -webkit-box-flex: 1;
+ -webkit-box-orient: horizontal;
+ display: -webkit-box;
+}
+
+.preview-panel > .right,
+.dialog-footer > .right {
+ -webkit-box-pack: end;
+}
+
.preview-thumbnails {
-webkit-box-orient: horizontal;
display: -webkit-box;
@@ -1423,6 +1437,10 @@ list .detail-name > .file-checkbox::before,
padding-right: 4px;
}
+body:not([type='saveas-file']) #filename-input-box {
+ display: none;
+}
+
/* A vertical spring. */
.vertical-spacer {
-webkit-box-flex: 1;
diff --git a/chrome/browser/resources/file_manager/main.html b/chrome/browser/resources/file_manager/main.html
index 4d24aa1..ac79272 100644
--- a/chrome/browser/resources/file_manager/main.html
+++ b/chrome/browser/resources/file_manager/main.html
@@ -320,15 +320,17 @@
</div>
</div>
<div class="preview-panel" visibility="hidden">
- <div>
- <div class="preview-thumbnails"></div>
- </div>
- <div id="preview-lines">
- <div class="preview-summary">
- <span class="preview-text"></span>
- <span class="calculating-size" hidden></span>
+ <div class="left">
+ <div>
+ <div class="preview-thumbnails"></div>
+ </div>
+ <div id="preview-lines">
+ <div class="preview-summary">
+ <span class="preview-text"></span>
+ <span class="calculating-size" hidden></span>
+ </div>
+ <div id="search-breadcrumbs" class="breadcrumbs"></div>
</div>
- <div id="search-breadcrumbs" class="breadcrumbs"></div>
</div>
<div class="right buttonbar" visibleif="full-page">
<button id="tasks" class="combobutton" menu="#tasks-menu"
@@ -340,23 +342,26 @@
</div>
<div id="unmounted-panel"></div>
<div id="format-panel">
- <div class="error"></div>
- <button id="format-button" command="#format"></button>
+ <div class="error"></div>
+ <button id="format-button" command="#format"></button>
</div>
</div>
</div>
</div>
<div class=dialog-footer invisibleif="full-page">
- <button id="new-folder" i18n-content=NEW_FOLDER_BUTTON_LABEL
- visibleif="saveas-file folder" command="#newfolder" tabindex="4">
- </button>
- <div id="filename-input-box" visibleif="saveas-file">
- <div class=filename-label i18n-content=FILENAME_LABEL></div>
- <input type=text spellcheck=false tabindex="5">
- </div>
- <div class=preparing-label i18n-content=PREPARING_LABEL></div>
- <div class=progress-bar>
- <div class=progress-track></div>
+ <div class="left">
+ <button id="new-folder" i18n-content=NEW_FOLDER_BUTTON_LABEL
+ visibleif="saveas-file folder" command="#newfolder"
+ tabindex="4">
+ </button>
+ <div id="filename-input-box">
+ <div class=filename-label i18n-content=FILENAME_LABEL></div>
+ <input type=text spellcheck=false tabindex="5">
+ </div>
+ <div class=preparing-label i18n-content=PREPARING_LABEL></div>
+ <div class=progress-bar>
+ <div class=progress-track></div>
+ </div>
</div>
<div class="right buttonbar">
<select id="file-type"></select>