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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/js/file_manager.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. */ 3 * found in the LICENSE file. */
4 4
5 html { 5 html {
6 height: 100%; 6 height: 100%;
7 } 7 }
8 8
9 html.col-resize * { 9 html.col-resize * {
10 cursor: col-resize !important; 10 cursor: col-resize !important;
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 margin-top: 7px; 526 margin-top: 7px;
527 } 527 }
528 528
529 body[new-ui] .dialog-header { 529 body[new-ui] .dialog-header {
530 -webkit-app-region: drag; 530 -webkit-app-region: drag;
531 -webkit-margin-end: 10px; 531 -webkit-margin-end: 10px;
532 -webkit-margin-start: 10px; 532 -webkit-margin-start: 10px;
533 height: 45px; 533 height: 45px;
534 } 534 }
535 535
536 body[new-ui] .search-box-wrapper {
537 -webkit-box-flex: 1;
538 display: -webkit-box;
539 }
540
541 body[new-ui] .decoration-buttons-wrapper {
542 -webkit-box-flex: 0;
543 -webkit-box-pack: end;
544 display: -webkit-box;
545 }
546
536 body[new-ui] .dialog-header #search-box, 547 body[new-ui] .dialog-header #search-box,
537 body[new-ui] .dialog-header #autocomplete-list, 548 body[new-ui] .dialog-header #autocomplete-list,
538 body[new-ui] .dialog-header .buttonbar button { 549 body[new-ui] .dialog-header .buttonbar button {
539 -webkit-app-region: no-drag; 550 -webkit-app-region: no-drag;
540 } 551 }
541 552
542 body[new-ui] .dialog-header #gear-button { 553 body[new-ui] .dialog-header #gear-button {
543 background-image: -webkit-image-set( 554 background-image: -webkit-image-set(
544 url('../images/files/ui/new-ui/topbar_button_settings.png') 1x, 555 url('../images/files/ui/new-ui/topbar_button_settings.png') 1x,
545 url('../images/files/ui/new-ui/2x/topbar_button_settings.png') 2x); 556 url('../images/files/ui/new-ui/2x/topbar_button_settings.png') 2x);
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 background-repeat: no-repeat; 774 background-repeat: no-repeat;
764 color: #333; 775 color: #333;
765 display: -webkit-box; 776 display: -webkit-box;
766 height: 29px; 777 height: 29px;
767 line-height: 27px; 778 line-height: 27px;
768 margin-right: 10px; 779 margin-right: 10px;
769 padding: 1px 6px 2px 23px; 780 padding: 1px 6px 2px 23px;
770 width: 150px; 781 width: 150px;
771 } 782 }
772 783
784 #search-box[hidden] {
785 display: none; // Required, since overriden by #search-box.
786 }
787
773 body[new-ui] #search-box { 788 body[new-ui] #search-box {
789 -webkit-transition: max-width 200ms;
774 background: -webkit-image-set( 790 background: -webkit-image-set(
775 url('../images/files/ui/new-ui/search_icon_active.png') 1x, 791 url('../images/files/ui/new-ui/search_icon_active.png') 1x,
776 url('../images/files/ui/new-ui/2x/search_icon_active.png') 2x); 792 url('../images/files/ui/new-ui/2x/search_icon_active.png') 2x);
777 background-position: center left; 793 background-position: center left;
778 background-repeat: no-repeat; 794 background-repeat: no-repeat;
779 border-color: white; 795 border-color: white;
796 max-width: 150px;
780 padding: 0 0 0 30px; 797 padding: 0 0 0 30px;
798 width: 100%;
781 } 799 }
782 800
783 #search-box:hover { 801 #search-box:hover {
784 border: 1px solid #b9b9b9; 802 border: 1px solid #b9b9b9;
785 border-top: 1px solid #a0a0a0; 803 border-top: 1px solid #a0a0a0;
786 box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); 804 box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
787 } 805 }
788 806
789 body[new-ui] #search-box:hover { 807 body[new-ui] #search-box:hover {
790 border-color: white; 808 border-color: white;
791 } 809 }
792 810
793 #search-box:focus, 811 #search-box:focus,
794 body[new-ui] #search-box:focus { 812 body[new-ui] #search-box:focus {
795 border: 1px solid rgb(77, 144, 254); 813 border: 1px solid rgb(77, 144, 254);
796 box-shadow: inset 0 1px 2px rgba(0,0,0,0.3); 814 box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
815 max-width: 240px;
797 outline: none; 816 outline: none;
798 width: 240px; 817 width: 100%;
799 } 818 }
800 819
801 #search-box::-webkit-search-cancel-button { 820 #search-box::-webkit-search-cancel-button {
802 -webkit-appearance: none; 821 -webkit-appearance: none;
803 background-image: -webkit-image-set( 822 background-image: -webkit-image-set(
804 url('../images/files/ui/search_clear.png') 1x, 823 url('../images/files/ui/search_clear.png') 1x,
805 url('../images/files/ui/2x/search_clear.png') 2x); 824 url('../images/files/ui/2x/search_clear.png') 2x);
806 height: 16px; 825 height: 16px;
807 width: 16px; 826 width: 16px;
808 } 827 }
(...skipping 1396 matching lines...) Expand 10 before | Expand all | Expand 10 after
2205 body[new-ui] #iframe-drag-area { 2224 body[new-ui] #iframe-drag-area {
2206 -webkit-app-region: drag; 2225 -webkit-app-region: drag;
2207 height: 45px; 2226 height: 45px;
2208 left: 64px; 2227 left: 64px;
2209 position: absolute; 2228 position: absolute;
2210 right: 70px; 2229 right: 70px;
2211 top: 0; 2230 top: 0;
2212 width: auto; 2231 width: auto;
2213 z-index: 101; 2232 z-index: 101;
2214 } 2233 }
OLDNEW
« 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