OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> | 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html"> |
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout.html"> |
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
5 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_searc h_field.html"> |
6 | 6 |
7 <dom-module id="history-toolbar"> | 7 <dom-module id="history-toolbar"> |
8 <template> | 8 <template> |
9 | 9 |
10 <style> | 10 <style> |
(...skipping 11 matching lines...) Expand all Loading... | |
22 @apply(--layout-horizontal); | 22 @apply(--layout-horizontal); |
23 width: 100%; | 23 width: 100%; |
24 } | 24 } |
25 | 25 |
26 :host([items-selected_]) { | 26 :host([items-selected_]) { |
27 background: rgb(68, 136, 255); | 27 background: rgb(68, 136, 255); |
28 } | 28 } |
29 | 29 |
30 h1 { | 30 h1 { |
31 @apply(--layout-flex); | 31 @apply(--layout-flex); |
32 @apply(--layout-horizontal); | |
32 font-size: 16px; | 33 font-size: 16px; |
33 font-weight: 400; | 34 font-weight: 400; |
34 padding-left: 24px; | 35 padding-left: 24px; |
35 } | 36 } |
36 | 37 |
37 #items { | 38 #items { |
38 margin: 0 auto; | 39 margin: 0 auto; |
39 max-width: 960px; | 40 max-width: 960px; |
40 } | 41 } |
41 | 42 |
42 #number-selected { | 43 #number-selected { |
43 @apply(--layout-flex); | 44 @apply(--layout-flex); |
44 } | 45 } |
45 | 46 |
46 paper-icon-button { | 47 paper-icon-button { |
47 height: 36px; | 48 height: 36px; |
48 margin: 0 24px 0 2px; | 49 margin: 0 24px 0 2px; |
49 min-width: 36px; | 50 min-width: 36px; |
50 width: 36px; | 51 width: 36px; |
51 } | 52 } |
52 | 53 |
54 #clear-browsing-data { | |
55 flex: 1 1 960px; | |
56 max-width: 960px; | |
57 pointer-events: auto; | |
calamity
2016/02/05 00:43:37
This pointer-events style needs to be on the butto
yingran
2016/02/05 04:53:16
Done.
| |
58 } | |
59 | |
60 :host([items-selected_]) #clear-browsing-data { | |
61 display: none; | |
62 } | |
63 | |
64 #button-container { | |
65 @apply(--layout-horizontal); | |
66 @apply(--layout-center); | |
67 height: inherit; | |
68 left: 0; | |
69 pointer-events: none; | |
70 position: absolute; | |
71 top: 0; | |
72 width: 100%; | |
73 } | |
74 | |
75 #toolbar-container { | |
76 @apply(--layout-horizontal); | |
77 @apply(--layout-center); | |
78 width: 100%; | |
79 } | |
80 | |
81 #front-padding { | |
82 flex: 1 1 0; | |
83 min-width: 100px; | |
84 } | |
85 | |
86 #back-padding { | |
87 flex: 1 1 0; | |
88 pointer-events: none; | |
calamity
2016/02/05 00:43:38
Remove.
yingran
2016/02/05 04:53:16
Done.
| |
89 } | |
90 | |
53 [hidden] { | 91 [hidden] { |
54 display: none !important; | 92 display: none !important; |
55 } | 93 } |
56 </style> | 94 </style> |
57 | 95 |
58 <div id="main-content" hidden$="{{itemsSelected_}}"> | 96 <div id="toolbar-container"> |
59 <h1 i18n-content="title" id="title"></h1> | 97 <div id="main-content" hidden$="{{itemsSelected_}}"> |
60 <cr-search-field id="search-input" | 98 <h1 i18n-content="title" id="title"></h1> |
61 i18n-values="label:search;clear-label:clearSearch"></cr-search-field> | 99 <cr-search-field id="search-input" |
100 i18n-values="label:search;clear-label:clearSearch"></cr-search-field > | |
101 </div> | |
102 | |
103 <div id="items" hidden$="{{!itemsSelected_}}"> | |
104 <paper-icon-button icon="clear" id="cancel-icon-button" | |
105 on-tap="onClearSelectionTap_"></paper-icon-button> | |
106 <div id="number-selected">{{numberOfItemsSelected_(count)}}</div> | |
107 <paper-button id="cancel-button" on-tap="onClearSelectionTap_" | |
108 i18n-content="cancel"></paper-button> | |
109 <paper-button id="delete-button" i18n-content="delete"></paper-button> | |
110 </div> | |
62 </div> | 111 </div> |
63 | 112 |
64 <div id="items" hidden$="{{!itemsSelected_}}"> | 113 <div id="button-container"> |
65 <paper-icon-button icon="clear" id="cancel-icon-button" | 114 <div id="front-padding"></div> |
66 on-tap="onClearSelectionTap_"></paper-icon-button> | 115 <div id="clear-browsing-data"> |
tsergeant
2016/02/05 00:16:03
Use hidden$= here instead of hiding with CSS, sinc
yingran
2016/02/05 04:53:16
Done.
| |
67 <div id="number-selected">{{numberOfItemsSelected_(count)}}</div> | 116 <paper-button on-tap="onClearBrowsingDataTap_" |
68 <paper-button id="cancel-button" on-tap="onClearSelectionTap_" | 117 i18n-content="clearBrowsingData"> |
69 i18n-content="cancel"></paper-button> | 118 </paper-button> |
70 <paper-button id="delete-button" i18n-content="delete"></paper-button> | 119 </div> |
120 <div id="back-padding"></div> | |
71 </div> | 121 </div> |
72 | |
73 </template> | 122 </template> |
74 <script src="chrome://history/history_toolbar.js"></script> | 123 <script src="chrome://history/history_toolbar.js"></script> |
75 </dom-module> | 124 </dom-module> |
OLD | NEW |