Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 2 <link rel="import" href="chrome://resources/html/cr.html"> | 2 <link rel="import" href="chrome://resources/html/cr.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/iron-flex-layout/classe s/iron-flex-layout.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-selector/iron-sele ctor.html"> |
| 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
| 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html"> | 10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html"> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 paper-spinner { | 33 paper-spinner { |
| 34 height: 20px; | 34 height: 20px; |
| 35 margin: 0 10px; | 35 margin: 0 10px; |
| 36 width: 20px; | 36 width: 20px; |
| 37 } | 37 } |
| 38 | 38 |
| 39 .dialog-message { | 39 .dialog-message { |
| 40 margin-bottom: 10px; | 40 margin-bottom: 10px; |
| 41 } | 41 } |
| 42 | 42 |
| 43 div.contents { | |
|
Dan Beam
2016/08/12 00:43:28
nit: unless it's necessary, I'd drop the "div" par
| |
| 44 max-height: 250px; | |
| 45 min-height: 250px; | |
| 46 } | |
| 47 | |
| 43 /* .display indicates a displayed pin code or passkey. */ | 48 /* .display indicates a displayed pin code or passkey. */ |
| 44 span.display { | 49 span.display { |
| 45 border: 1px solid #ccc; | 50 border: 1px solid #ccc; |
| 46 border-radius: 4px; | 51 border-radius: 4px; |
| 47 box-shadow: 0 0 0 1px #222; | 52 box-shadow: 0 0 0 1px #222; |
| 48 color: #222; | 53 color: #222; |
| 49 font-size: 16px; | 54 font-size: 16px; |
| 50 height: 38px; | 55 height: 38px; |
| 51 line-height: 38px; | 56 line-height: 38px; |
| 52 margin: 0 5px; | 57 margin: 0 5px; |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 68 color: #666; | 73 color: #666; |
| 69 } | 74 } |
| 70 | 75 |
| 71 /* .confirm indicates a confirmation passkey. */ | 76 /* .confirm indicates a confirmation passkey. */ |
| 72 span.confirm { | 77 span.confirm { |
| 73 color: #999; | 78 color: #999; |
| 74 font-size: 20px; | 79 font-size: 20px; |
| 75 font-weight: 600; /* semibold */ | 80 font-weight: 600; /* semibold */ |
| 76 margin: 0 20px; | 81 margin: 0 20px; |
| 77 } | 82 } |
| 78 </style> | 83 </style> |
| 79 <dialog is="cr-dialog" id="dialog" on-cancel="onDialogCanceled_"> | 84 <dialog is="cr-dialog" id="dialog" on-cancel="onDialogCanceled_"> |
| 80 <div class="title">[[getTitle_(dialogId)]]</div> | 85 <div class="title">[[getTitle_(dialogId)]]</div> |
| 81 <div class="body"> | 86 <div class="body"> |
| 82 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]"> | 87 <div class="contents layout vertical center center-justified"> |
| 83 <div id="dialogDeviceList" class="layout vertical" | 88 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]"> |
| 84 on-device-event="onDeviceEvent_"> | 89 <div id="dialogDeviceList" |
| 85 <span class="no-devices" hidden$="[[haveDevices_(deviceList)]]"> | 90 class="layout vertical flex start self-stretch" |
| 86 $i18n{bluetoothNoDevices} | 91 on-device-event="onDeviceEvent_"> |
| 87 </span> | 92 <span class="no-devices" hidden$="[[haveDevices_(deviceList)]]"> |
| 88 <iron-selector class="flex"> | 93 $i18n{bluetoothNoDevices} |
| 89 <template is="dom-repeat" items="[[deviceList]]" | 94 </span> |
| 90 filter="deviceNotPaired_" observe="paired"> | 95 <iron-selector class="flex"> |
| 91 <bluetooth-device-list-item device="[[item]]"> | 96 <template is="dom-repeat" items="[[deviceList]]" |
| 92 </bluetooth-device-list-item> | 97 filter="deviceNotPaired_" observe="paired"> |
| 93 </template> | 98 <bluetooth-device-list-item device="[[item]]"> |
| 94 </iron-selector> | 99 </bluetooth-device-list-item> |
| 95 </div> | 100 </template> |
| 96 </template> | 101 </iron-selector> |
| 97 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]"> | |
| 98 <div id="pairing" class="settings-box first layout vertical center | |
| 99 center-justified"> | |
| 100 <div class="dialog-message"> | |
| 101 [[getMessage_(pairingDevice, pairingEvent)]] | |
| 102 </div> | 102 </div> |
| 103 <div hidden$="[[!showEnterPincode_(pairingEvent)]]"> | 103 </template> |
| 104 <paper-input id="pincode" minlength="1" maxlength="16" | 104 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]"> |
| 105 type="text" auto-validate value="{{pinOrPass}}"> | 105 <div id="pairing" class="settings-box first layout vertical center |
| 106 </paper-input> | 106 center-justified"> |
| 107 <div class="dialog-message"> | |
| 108 [[getMessage_(pairingDevice, pairingEvent)]] | |
| 109 </div> | |
| 110 <div hidden$="[[!showEnterPincode_(pairingEvent)]]"> | |
| 111 <paper-input id="pincode" minlength="1" maxlength="16" | |
| 112 type="text" auto-validate value="{{pinOrPass}}"> | |
| 113 </paper-input> | |
| 114 </div> | |
| 115 <div hidden$="[[!showEnterPasskey_(pairingEvent)]]"> | |
| 116 <paper-input id="passkey" minlength="6" maxlength="6" | |
| 117 type="text" auto-validate value="{{pinOrPass}}"> | |
| 118 </paper-input> | |
| 119 </div> | |
| 120 <div id="pinDiv" class="layout horizontal center center-justified" | |
| 121 hidden="[[!showDisplayPassOrPin_(pairingEvent)]]"> | |
| 122 <template is="dom-repeat" items="[[digits]]"> | |
| 123 <span class$="[[getPinClass_(pairingEvent, index)]]"> | |
| 124 [[getPinDigit_(pairingEvent, index)]] | |
| 125 </span> | |
| 126 </template> | |
| 127 <span class$="[[getPinClass_(pairingEvent, -1)]]" | |
| 128 hidden="[[showAcceptReject_(pairingEvent)]]"> | |
| 129 $i18n{bluetoothEnterKey} | |
| 130 </span> | |
| 131 </div> | |
| 107 </div> | 132 </div> |
| 108 <div hidden$="[[!showEnterPasskey_(pairingEvent)]]"> | 133 </template> |
| 109 <paper-input id="passkey" minlength="6" maxlength="6" type="text" | 134 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]" > |
| 110 auto-validate value="{{pinOrPass}}"></paper-input> | 135 <div class="settings-box first layout vertical center |
| 136 center-justified"> | |
| 137 <div class="dialog-message">[[errorMessage]]</div> | |
| 111 </div> | 138 </div> |
| 112 <div id="pinDiv" class="layout horizontal center center-justified" | 139 </template> |
| 113 hidden="[[!showDisplayPassOrPin_(pairingEvent)]]"> | 140 </div> |
| 114 <template is="dom-repeat" items="[[digits]]"> | |
| 115 <span class$="[[getPinClass_(pairingEvent, index)]]"> | |
| 116 [[getPinDigit_(pairingEvent, index)]] | |
| 117 </span> | |
| 118 </template> | |
| 119 <span class$="[[getPinClass_(pairingEvent, -1)]]" | |
| 120 hidden="[[showAcceptReject_(pairingEvent)]]"> | |
| 121 $i18n{bluetoothEnterKey} | |
| 122 </span> | |
| 123 </div> | |
| 124 </div> | |
| 125 </template> | |
| 126 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]"> | |
| 127 <div class="settings-box first layout vertical center | |
| 128 center-justified"> | |
| 129 <div class="dialog-message">[[errorMessage]]</div> | |
| 130 </div> | |
| 131 </template> | |
| 132 </div> | 141 </div> |
| 133 <div class="button-container"> | 142 <div class="button-container"> |
| 134 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]"> | 143 <template is="dom-if" if="[[isDialogType_(dialogId, 'addDevice')]]"> |
| 135 <div id="scanning" class="layout horizontal center flex" | 144 <div id="scanning" class="layout horizontal center flex" |
| 136 hidden$="[[!adapterState.discovering]]"> | 145 hidden$="[[!adapterState.discovering]]"> |
| 137 <paper-spinner active="[[adapterState.discovering]]"> | 146 <paper-spinner active="[[adapterState.discovering]]"> |
| 138 </paper-spinner> | 147 </paper-spinner> |
| 139 <span>$i18n{bluetoothScanning}</span> | 148 <span>$i18n{bluetoothScanning}</span> |
| 140 </div> | 149 </div> |
| 141 <paper-button class="end-justified" on-tap="onCancelTap_"> | 150 <paper-button class="end-justified" on-tap="onCancelTap_"> |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 159 </template> | 168 </template> |
| 160 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]"> | 169 <template is="dom-if" if="[[isDialogType_(dialogId, 'connectError')]]"> |
| 161 <paper-button on-tap="close">$i18n{bluetoothDismiss} | 170 <paper-button on-tap="close">$i18n{bluetoothDismiss} |
| 162 </paper-button> | 171 </paper-button> |
| 163 </template> | 172 </template> |
| 164 </div> | 173 </div> |
| 165 </dialog> | 174 </dialog> |
| 166 </template> | 175 </template> |
| 167 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script> | 176 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script> |
| 168 </dom-module> | 177 </dom-module> |
| OLD | NEW |