OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
2 <link rel="import" href="chrome://resources/html/assert.html"> | 2 <link rel="import" href="chrome://resources/html/assert.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.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/polymer/v1_0/paper-styles/default-th eme.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/default-th eme.html"> |
6 | 6 |
7 <dom-module id="cr-dialog"> | 7 <dom-module id="cr-dialog"> |
8 <template> | 8 <template> |
9 <style> | 9 <style> |
10 :host { | 10 :host { |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
52 }; | 52 }; |
53 -webkit-margin-end: 6px; | 53 -webkit-margin-end: 6px; |
54 /* <paper-icon-button> overrides --iron-icon-{height,width}, so this | 54 /* <paper-icon-button> overrides --iron-icon-{height,width}, so this |
55 * padding essentially reduces 40x40 to 20x20. */ | 55 * padding essentially reduces 40x40 to 20x20. */ |
56 padding: 10px; | 56 padding: 10px; |
57 } | 57 } |
58 | 58 |
59 .body-container { | 59 .body-container { |
60 display: flex; | 60 display: flex; |
61 flex-direction: column; | 61 flex-direction: column; |
62 /* TODO(dbeam): copy <paper-dialog-scrollable>'s dividers? */ | |
63 overflow: auto; | 62 overflow: auto; |
63 /* Prevent layout moving when border does appear. */ | |
64 border-bottom: 1px solid transparent; | |
65 | |
66 @apply(--cr-dialog-body-container); | |
67 } | |
dpapad
2017/03/29 21:12:22
How about moving those border showing related rule
scottchen
2017/03/30 06:42:47
Done.
dpapad
2017/03/30 17:18:39
Did you forget to upload latest patch? I don't see
scottchen
2017/03/30 18:11:18
..I keep forgetting that it would prompt me for a
| |
68 | |
69 .body-container.bottom-scrollable { | |
70 border-bottom: 1px solid var(--paper-grey-300); | |
64 } | 71 } |
65 | 72 |
66 :host ::content .body { | 73 :host ::content .body { |
67 padding-bottom: 12px; | 74 padding-bottom: 12px; |
68 padding-top: 12px; | 75 padding-top: 12px; |
69 } | 76 } |
70 | 77 |
71 :host ::content .body, | 78 :host ::content .body, |
72 :host ::content .title { | 79 :host ::content .title { |
73 -webkit-padding-end: 24px; | 80 -webkit-padding-end: 24px; |
(...skipping 29 matching lines...) Expand all Loading... | |
103 <div class="top-container"> | 110 <div class="top-container"> |
104 <div class="title-container" tabindex="-1"> | 111 <div class="title-container" tabindex="-1"> |
105 <content select=".title"></content> | 112 <content select=".title"></content> |
106 </div> | 113 </div> |
107 <paper-icon-button icon="cr:clear" on-tap="cancel" id="close" | 114 <paper-icon-button icon="cr:clear" on-tap="cancel" id="close" |
108 aria-label$="[[closeText]]"> | 115 aria-label$="[[closeText]]"> |
109 </paper-icon-button> | 116 </paper-icon-button> |
110 </div> | 117 </div> |
111 <div class="body-container"> | 118 <div class="body-container"> |
112 <content select=".body"></content> | 119 <content select=".body"></content> |
120 <span id="bodyBottomMarker"> | |
dpapad
2017/03/29 21:12:22
Thi CL only adds a border to the bottom, but in th
scottchen
2017/03/30 06:42:47
I think I misspoke during standup - in the case of
| |
113 </div> | 121 </div> |
114 <content select=".button-container"></content> | 122 <content select=".button-container"></content> |
115 <content select=".footer"></content> | 123 <content select=".footer"></content> |
116 </template> | 124 </template> |
117 <script src="cr_dialog.js"></script> | 125 <script src="cr_dialog.js"></script> |
118 </dom-module> | 126 </dom-module> |
OLD | NEW |