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

Side by Side Diff: chrome/browser/resources/file_manager/css/file_manager.css

Issue 14631008: Files.app: Make the design of search box match the spec. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/images/files/ui/new-ui/2x/search_clear.png » ('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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
523 body:not([new-ui]) .dialog-header { 523 body:not([new-ui]) .dialog-header {
524 -webkit-margin-end: 7px; 524 -webkit-margin-end: 7px;
525 height: 30px; 525 height: 30px;
526 margin-bottom: 7px; 526 margin-bottom: 7px;
527 margin-top: 7px; 527 margin-top: 7px;
528 } 528 }
529 529
530 body[new-ui] .dialog-header { 530 body[new-ui] .dialog-header {
531 -webkit-app-region: drag; 531 -webkit-app-region: drag;
532 -webkit-margin-end: 10px; 532 -webkit-margin-end: 10px;
533 -webkit-margin-start: 10px; 533 -webkit-margin-start: 0;
534 height: 45px; 534 height: 45px;
535 } 535 }
536 536
537 body[new-ui] .search-box-wrapper { 537 body[new-ui] .search-box-wrapper {
538 -webkit-box-flex: 1; 538 -webkit-box-flex: 1;
539 display: -webkit-box; 539 display: -webkit-box;
540 } 540 }
541 541
542 body[new-ui] .decoration-buttons-wrapper { 542 body[new-ui] .decoration-buttons-wrapper {
543 -webkit-box-flex: 0; 543 -webkit-box-flex: 0;
544 -webkit-box-pack: end; 544 -webkit-box-pack: end;
545 display: -webkit-box; 545 display: -webkit-box;
546 } 546 }
547 547
548 body[new-ui] .dialog-header #search-box, 548 body[new-ui] .dialog-header #search-box,
549 body[new-ui] .dialog-header #autocomplete-list, 549 body[new-ui] .dialog-header #autocomplete-list,
550 body[new-ui] .dialog-header .buttonbar button { 550 body[new-ui] .dialog-header .buttonbar button {
551 -webkit-app-region: no-drag; 551 -webkit-app-region: no-drag;
552 } 552 }
553 553
554 body[new-ui] .dialog-header #autocomplete-list {
555 max-width: 240px;
556 }
557
554 body[new-ui] .dialog-header #gear-button { 558 body[new-ui] .dialog-header #gear-button {
555 background-image: -webkit-image-set( 559 background-image: -webkit-image-set(
556 url('../images/files/ui/new-ui/topbar_button_settings.png') 1x, 560 url('../images/files/ui/new-ui/topbar_button_settings.png') 1x,
557 url('../images/files/ui/new-ui/2x/topbar_button_settings.png') 2x); 561 url('../images/files/ui/new-ui/2x/topbar_button_settings.png') 2x);
558 } 562 }
559 563
560 body[new-ui] .dialog-header #maximize-button { 564 body[new-ui] .dialog-header #maximize-button {
561 background-image: -webkit-image-set( 565 background-image: -webkit-image-set(
562 url('../images/files/ui/new-ui/topbar_button_maximize.png') 1x, 566 url('../images/files/ui/new-ui/topbar_button_maximize.png') 1x,
563 url('../images/files/ui/new-ui/2x/topbar_button_maximize.png') 2x); 567 url('../images/files/ui/new-ui/2x/topbar_button_maximize.png') 2x);
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 773
770 #search-box, 774 #search-box,
771 #filename-input-box input { 775 #filename-input-box input {
772 border: 1px solid #d9d9d9; 776 border: 1px solid #d9d9d9;
773 border-radius: 1px; 777 border-radius: 1px;
774 border-top: 1px solid #c0c0c0; 778 border-top: 1px solid #c0c0c0;
775 box-sizing: border-box; 779 box-sizing: border-box;
776 } 780 }
777 781
778 #search-box { 782 #search-box {
779 -webkit-transition: width 200ms; 783 -webkit-margin-end: 10px;
784 -webkit-padding-after: 2px;
785 -webkit-padding-before: 1px;
786 -webkit-padding-end: 24px;
787 -webkit-padding-start: 23px;
788 -webkit-transition: max-width 200ms;
780 background: -webkit-image-set( 789 background: -webkit-image-set(
781 url('../images/files/ui/icon_search.png') 1x, 790 url('../images/files/ui/icon_search.png') 1x,
782 url('../images/files/ui/2x/icon_search.png') 2x); 791 url('../images/files/ui/2x/icon_search.png') 2x);
783 background-color: #fff; 792 background-color: #fff;
784 background-position: 4px 5.5px; 793 background-position: 4px 5.5px;
785 background-repeat: no-repeat; 794 background-repeat: no-repeat;
786 color: #333; 795 color: #333;
787 display: -webkit-box; 796 display: -webkit-box;
788 height: 29px; 797 height: 29px;
789 line-height: 27px; 798 line-height: 27px;
790 margin-right: 10px; 799 max-width: 150px;
791 padding: 1px 6px 2px 23px; 800 width: 100%;
792 width: 150px;
793 } 801 }
794 802
795 #search-box[hidden] { 803 #search-box[hidden] {
796 display: none; /* Required, since overriden by #search-box. */ 804 display: none; /* Required, since overriden by #search-box. */
797 } 805 }
798 806
799 body[new-ui] #search-box { 807 body[new-ui] #search-box {
800 -webkit-transition: max-width 200ms; 808 -webkit-margin-end: 0;
809 -webkit-padding-after: 0;
810 -webkit-padding-before: 0;
811 -webkit-padding-end: 26px;
812 -webkit-padding-start: 46px;
813 -webkit-transition: width 0;
801 background: -webkit-image-set( 814 background: -webkit-image-set(
802 url('../images/files/ui/new-ui/search_icon_active.png') 1x, 815 url('../images/files/ui/new-ui/search_icon_inactive.png') 1x,
803 url('../images/files/ui/new-ui/2x/search_icon_active.png') 2x); 816 url('../images/files/ui/new-ui/2x/search_icon_inactive.png') 2x);
804 background-position: center left; 817 background-position: 13px center;
805 background-repeat: no-repeat; 818 background-repeat: no-repeat;
806 border-color: white; 819 border-style: none;
820 height: 45px;
807 line-height: 1em; 821 line-height: 1em;
808 max-width: 150px; 822 max-width: none;
809 padding: 0 0 0 30px; 823 position: relative;
810 width: 100%; 824 width: 58px;
825 }
826
827 html[dir='rtl'] #search-box {
828 background-position: right 4px top 5.5px;
829 }
830
831 html[dir='rtl'] body[new-ui] #search-box {
832 background-position: right 13px center;
811 } 833 }
812 834
813 #search-box:hover { 835 #search-box:hover {
814 border: 1px solid #b9b9b9; 836 border: 1px solid #b9b9b9;
815 border-top: 1px solid #a0a0a0; 837 border-top: 1px solid #a0a0a0;
816 box-shadow: inset 0 1px 2px rgba(0,0,0,0.1); 838 box-shadow: inset 0 1px 2px rgba(0,0,0,0.1);
817 } 839 }
818 840
819 body[new-ui] #search-box:hover { 841 #search-box:focus {
820 border-color: white;
821 }
822
823 #search-box:focus,
824 body[new-ui] #search-box:focus {
825 border: 1px solid rgb(77, 144, 254); 842 border: 1px solid rgb(77, 144, 254);
826 box-shadow: inset 0 1px 2px rgba(0,0,0,0.3); 843 box-shadow: inset 0 1px 2px rgba(0,0,0,0.3);
827 max-width: 240px; 844 max-width: 240px;
828 outline: none; 845 outline: none;
829 width: 100%; 846 width: 100%;
830 } 847 }
831 848
849 body[new-ui] #search-box.has-text,
850 body[new-ui] #search-box:focus {
851 max-width: none;
852 width: 100%;
853 }
854
855 body[new-ui] #search-box:hover,
856 body[new-ui] #search-box:focus {
857 background: -webkit-image-set(
858 url('../images/files/ui/new-ui/search_icon_active.png') 1x,
859 url('../images/files/ui/new-ui/2x/search_icon_active.png') 2x);
860 background-position: 13px center;
861 background-repeat: no-repeat;
862 border-style: none;
863 box-shadow: none;
864 }
865
832 #search-box::-webkit-search-cancel-button { 866 #search-box::-webkit-search-cancel-button {
833 -webkit-appearance: none; 867 -webkit-appearance: none;
834 background-image: -webkit-image-set( 868 background-image: -webkit-image-set(
869 url('../images/files/ui/new-ui/search_clear.png') 1x,
870 url('../images/files/ui/new-ui/2x/search_clear.png') 2x);
871 height: 12px;
872 position: absolute;
873 top: 17px;
874 width: 12px;
875 }
876
877 body:not([new-ui]) #search-box::-webkit-search-cancel-button {
878 background-image: -webkit-image-set(
835 url('../images/files/ui/search_clear.png') 1x, 879 url('../images/files/ui/search_clear.png') 1x,
836 url('../images/files/ui/2x/search_clear.png') 2x); 880 url('../images/files/ui/2x/search_clear.png') 2x);
837 height: 16px; 881 height: 16px;
882 top: 6px;
838 width: 16px; 883 width: 16px;
839 } 884 }
840 885
886 html:not([dir='rtl']) #search-box::-webkit-search-cancel-button {
887 right: 10px;
888 }
889
890 html[dir='rtl'] #search-box::-webkit-search-cancel-button {
891 left: 10px;
892 }
893
894 html[dir='rtl'] body:not([new-ui]) #search-box::-webkit-search-cancel-button {
895 left: 2px;
896 }
897
898 html:not([dir='rtl']) body:not([new-ui])
899 #search-box::-webkit-search-cancel-button {
900 right: 2px;
901 }
902
841 #search-box::-webkit-search-cancel-button:hover { 903 #search-box::-webkit-search-cancel-button:hover {
842 background-image: -webkit-image-set( 904 background-image: -webkit-image-set(
905 url('../images/files/ui/new-ui/search_clear_hover.png') 1x,
906 url('../images/files/ui/new-ui/2x/search_clear_hover.png') 2x);
907 }
908
909 body:not([new-ui]) #search-box::-webkit-search-cancel-button:hover {
910 background-image: -webkit-image-set(
843 url('../images/files/ui/search_clear_hover.png') 1x, 911 url('../images/files/ui/search_clear_hover.png') 1x,
844 url('../images/files/ui/2x/search_clear_hover.png') 2x); 912 url('../images/files/ui/2x/search_clear_hover.png') 2x);
845 } 913 }
846 914
847 #search-box::-webkit-search-cancel-button:active { 915 #search-box::-webkit-search-cancel-button:active {
848 background-image: -webkit-image-set( 916 background-image: -webkit-image-set(
917 url('../images/files/ui/new-ui/search_clear_pressed.png') 1x,
918 url('../images/files/ui/new-ui/2x/search_clear_pressed.png') 2x);
919 }
920
921 body:not([new-ui]) #search-box::-webkit-search-cancel-button:active {
922 background-image: -webkit-image-set(
849 url('../images/files/ui/search_clear_pressed.png') 1x, 923 url('../images/files/ui/search_clear_pressed.png') 1x,
850 url('../images/files/ui/2x/search_clear_pressed.png') 2x); 924 url('../images/files/ui/2x/search_clear_pressed.png') 2x);
851 } 925 }
852 926
853 body:not([new-ui]) button#detail-view::before { 927 body:not([new-ui]) button#detail-view::before {
854 background-image: -webkit-image-set( 928 background-image: -webkit-image-set(
855 url('../images/files/ui/view_list_black.png') 1x, 929 url('../images/files/ui/view_list_black.png') 1x,
856 url('../images/files/ui/2x/view_list_black.png') 2x); 930 url('../images/files/ui/2x/view_list_black.png') 2x);
857 } 931 }
858 932
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 background-color: white; 2203 background-color: white;
2130 border: 1px solid #aaa; 2204 border: 1px solid #aaa;
2131 box-sizing: border-box; /* To match the width with the search box's. */ 2205 box-sizing: border-box; /* To match the width with the search box's. */
2132 min-height: 0; 2206 min-height: 0;
2133 position: fixed; 2207 position: fixed;
2134 z-index: 3; 2208 z-index: 3;
2135 } 2209 }
2136 2210
2137 body[new-ui] list.autocomplete-suggestions { 2211 body[new-ui] list.autocomplete-suggestions {
2138 -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, .5); 2212 -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, .5);
2213 -webkit-margin-start: 10px;
2139 background-color: rgb(250, 250, 250); 2214 background-color: rgb(250, 250, 250);
2140 border: 1px solid rgb(255, 255, 255); 2215 border: 1px solid rgb(255, 255, 255);
2141 border-radius: 3px; 2216 border-radius: 3px;
2142 box-sizing: border-box; /* To match the width with the search box's. */ 2217 box-sizing: border-box; /* To match the width with the search box's. */
2143 color: rgb(34, 34, 34); 2218 color: rgb(34, 34, 34);
2144 overflow: hidden; 2219 overflow: hidden;
2145 padding: 5px 0; 2220 padding: 5px 0;
2146 position: fixed; 2221 position: fixed;
2147 z-index: 3; 2222 z-index: 3;
2148 } 2223 }
(...skipping 10 matching lines...) Expand all
2159 background-color: white; 2234 background-color: white;
2160 border: 1px solid white; 2235 border: 1px solid white;
2161 } 2236 }
2162 2237
2163 body[new-ui] list.autocomplete-suggestions > li, 2238 body[new-ui] list.autocomplete-suggestions > li,
2164 body[new-ui] list.autocomplete-suggestions > li:hover { 2239 body[new-ui] list.autocomplete-suggestions > li:hover {
2165 background-color: transparent; 2240 background-color: transparent;
2166 border: none; 2241 border: none;
2167 } 2242 }
2168 2243
2244 body[new-ui] list.autocomplete-suggestions > li > div.detail-icon {
2245 -webkit-margin-end: 6px;
2246 -webkit-margin-start: 6px;
2247 }
2248
2169 list.autocomplete-suggestions > li > div.detail-text { 2249 list.autocomplete-suggestions > li > div.detail-text {
2170 -webkit-box-flex: 1; 2250 -webkit-box-flex: 1;
2171 overflow-x: hidden; 2251 overflow-x: hidden;
2172 text-overflow: ellipsis; 2252 text-overflow: ellipsis;
2173 } 2253 }
2174 2254
2175 list.autocomplete-suggestions > li > div.detail-text em { 2255 list.autocomplete-suggestions > li > div.detail-text em {
2176 font-style: normal; 2256 font-style: normal;
2177 } 2257 }
2178 2258
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
2237 body[new-ui] #iframe-drag-area { 2317 body[new-ui] #iframe-drag-area {
2238 -webkit-app-region: drag; 2318 -webkit-app-region: drag;
2239 height: 45px; 2319 height: 45px;
2240 left: 64px; 2320 left: 64px;
2241 position: absolute; 2321 position: absolute;
2242 right: 70px; 2322 right: 70px;
2243 top: 0; 2323 top: 0;
2244 width: auto; 2324 width: auto;
2245 z-index: 101; 2325 z-index: 101;
2246 } 2326 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/images/files/ui/new-ui/2x/search_clear.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698