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

Unified Diff: chrome/browser/resources/file_manager/css/file_manager.css

Issue 14599004: Merge 199418 "Fix wrapping window decoration buttons in the File..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 7 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
Download patch
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/css/file_manager.css
===================================================================
--- chrome/browser/resources/file_manager/css/file_manager.css (revision 199675)
+++ chrome/browser/resources/file_manager/css/file_manager.css (working copy)
@@ -533,6 +533,17 @@
height: 45px;
}
+body[new-ui] .search-box-wrapper {
+ -webkit-box-flex: 1;
+ display: -webkit-box;
+}
+
+body[new-ui] .decoration-buttons-wrapper {
+ -webkit-box-flex: 0;
+ -webkit-box-pack: end;
+ display: -webkit-box;
+}
+
body[new-ui] .dialog-header #search-box,
body[new-ui] .dialog-header #autocomplete-list,
body[new-ui] .dialog-header .buttonbar button {
@@ -770,14 +781,21 @@
width: 150px;
}
+#search-box[hidden] {
+ display: none; // Required, since overriden by #search-box.
+}
+
body[new-ui] #search-box {
+ -webkit-transition: max-width 200ms;
background: -webkit-image-set(
url('../images/files/ui/new-ui/search_icon_active.png') 1x,
url('../images/files/ui/new-ui/2x/search_icon_active.png') 2x);
background-position: center left;
background-repeat: no-repeat;
border-color: white;
+ max-width: 150px;
padding: 0 0 0 30px;
+ width: 100%;
}
#search-box:hover {
@@ -794,8 +812,9 @@
body[new-ui] #search-box:focus {
border: 1px solid rgb(77, 144, 254);
box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
+ max-width: 240px;
outline: none;
- width: 240px;
+ width: 100%;
}
#search-box::-webkit-search-cancel-button {
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698