Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <!-- TODO(crbug.com/603217): Use i18n instead of string literals. Figure out | 1 <!-- TODO(crbug.com/603217): Use i18n instead of string literals. Figure out |
| 2 what i18n to use for keypad, ie, does 1 ABC make | 2 what i18n to use for keypad, ie, does 1 ABC make |
| 3 sense in every scenario? --> | 3 sense in every scenario? --> |
| 4 | 4 |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <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-icon-button/paper -icon-button.html"> | 6 <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-styles/paper-styl es.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/paper-styl es.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 9 | 9 |
| 10 <dom-module id="pin-keyboard"> | 10 <dom-module id="pin-keyboard"> |
| 11 <template> | 11 <template> |
| 12 <style> | 12 <style> |
| 13 #root { | 13 #root { |
| 14 display: flex; | 14 display: flex; |
| 15 } | 15 } |
| 16 | 16 |
| 17 /* TODO(jdufault): Remove this CSS once we inline the PIN element with the | 17 /* TODO(jdufault): Remove this CSS once we inline the PIN element with the |
| 18 * user-pod. */ | 18 * user-pod. */ |
| 19 #container-constrained-width { | 19 #container-constrained-width { |
| 20 -webkit-tap-highlight-color: transparent; | 20 -webkit-tap-highlight-color: transparent; |
| 21 background: white; | 21 background: white; |
| 22 border-radius: 2px; | 22 border-radius: 2px; |
| 23 box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), | 23 box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), |
| 24 0 2px 6px rgba(0, 0, 0, 0.15), | 24 0 2px 6px rgba(0, 0, 0, 0.15), |
| 25 0 3px 0 rgba(0, 0, 0, 0.08); | 25 0 3px 0 rgba(0, 0, 0, 0.08); |
| 26 cursor: pointer; | 26 cursor: pointer; |
| 27 flex-direction: column; | 27 flex-direction: column; |
| 28 outline: none; | 28 outline: none; |
| 29 width: 100%; | |
| 29 } | 30 } |
| 30 | 31 |
| 31 .row { | 32 .row { |
| 32 display: flex; | 33 display: flex; |
| 34 width: 100%; | |
| 33 } | 35 } |
| 34 | 36 |
| 35 .row.horizontal-center { | 37 .row.horizontal-center { |
| 38 height: 16%; | |
| 36 justify-content: center; | 39 justify-content: center; |
| 37 } | 40 } |
| 38 | 41 |
| 42 .row.keyboard { | |
| 43 height: 21%; | |
|
jdufault
2016/06/14 22:50:33
For this entire CL, can we use margin/offset with
| |
| 44 } | |
| 45 | |
| 39 .digit-button { | 46 .digit-button { |
| 40 align-items: center; | 47 align-items: center; |
| 41 background: none; | 48 background: none; |
| 42 border-radius: 50px; | 49 border-radius: 50px; |
| 43 display: flex; | 50 display: flex; |
| 44 font-size: 30px; | 51 font-size: 30px; |
| 45 justify-content: center; | 52 justify-content: center; |
| 46 margin: 5px; | 53 margin: 5px; |
| 47 min-width: 94px; | 54 } |
| 48 width: 94px; | 55 |
| 56 .row.keyboard paper-button { | |
| 57 display: block; | |
| 58 min-height: 20px; | |
| 59 min-width: 20px; | |
| 60 position: relative; | |
| 61 width: 34%; | |
|
jdufault
2016/06/14 22:50:33
Do the buttons change sizes? Can we define the wid
| |
| 49 } | 62 } |
| 50 | 63 |
| 51 .digit-button inner-text { | 64 .digit-button inner-text { |
| 52 display: flex; | 65 display: flex; |
| 53 flex-direction: column; | 66 flex-direction: column; |
| 54 height: 52px; | 67 font-size: 34px; |
| 68 text-align: center; | |
| 55 } | 69 } |
| 56 | 70 |
| 57 .digit-button inner-text subhead { | 71 .digit-button inner-text subhead { |
| 58 color: var(--paper-grey-500); | 72 color: var(--paper-grey-500); |
| 59 font-size: 16px; | 73 font-size: 16px; |
| 60 } | 74 } |
| 61 | 75 |
| 62 .digit-button .submit-button { | 76 .digit-button .submit-button { |
| 63 background: var(--paper-blue-a400); | 77 background: var(--paper-blue-a400); |
| 64 color: white; | 78 color: white; |
| 65 font-size: 20px; | 79 font-size: 20px; |
| 66 height: 60px; | |
| 67 min-width: 0; | 80 min-width: 0; |
| 68 width: 60px; | |
| 69 } | 81 } |
| 70 | 82 |
| 71 #pin-input { | 83 #pin-input { |
| 72 -webkit-text-security: disc; | 84 -webkit-text-security: disc; |
| 73 border-bottom-color: lightgray; | 85 border-bottom-color: lightgray; |
| 74 border-left: none; | 86 border-left: none; |
| 75 border-right: none; | 87 border-right: none; |
| 76 border-top: none; | 88 border-top: none; |
| 77 font-size: 20px; | 89 font-size: 20px; |
| 78 height: 30px; | 90 height: 30px; |
| 79 margin-top: 10px; | 91 margin-top: 10px; |
| 80 text-align: center; | 92 text-align: center; |
| 81 width: 95%; | 93 width: 95%; |
| 82 } | 94 } |
| 83 | 95 |
| 84 #pin-input[type=number]::-webkit-inner-spin-button, | 96 #pin-input[type=number]::-webkit-inner-spin-button, |
| 85 #pin-input[type=number]::-webkit-outer-spin-button { | 97 #pin-input[type=number]::-webkit-outer-spin-button { |
| 86 -webkit-appearance: none; | 98 -webkit-appearance: none; |
| 87 margin: 0; | 99 margin: 0; |
| 88 } | 100 } |
| 89 | 101 |
| 90 /* Ensure that all children of paper-button do not consume events. This | 102 /* Ensure that all children of paper-button do not consume events. This |
| 91 * simplifies the event handler code. */ | 103 * simplifies the event handler code. */ |
| 92 paper-button * { | 104 paper-button * { |
| 93 pointer-events: none; | 105 pointer-events: none; |
| 94 } | 106 } |
| 95 </style> | 107 </style> |
| 96 | |
| 97 <div id="root"> | 108 <div id="root"> |
|
jdufault
2016/06/14 22:50:33
Revert change.
sammiequon
2016/06/15 21:56:58
Done.
| |
| 98 <div id="container-constrained-width"> | 109 <div id="container-constrained-width"> |
| 99 <div class="row horizontal-center"> | 110 <div class="row horizontal-center"> |
| 100 <input id="pin-input" type="number" placeholder="Enter PIN" | 111 <input id="pin-input" type="number" placeholder="Enter PIN" |
| 101 on-keydown="onInputKeyDown_"></input> | 112 on-keydown="onInputKeyDown_"></input> |
| 102 </div> | 113 </div> |
| 103 | |
| 104 <div class="row keyboard"> | 114 <div class="row keyboard"> |
|
jdufault
2016/06/14 22:50:33
Revert change.
sammiequon
2016/06/15 21:56:58
Done.
| |
| 105 <paper-button class="digit-button" on-tap="onNumberTap_" value="1"> | 115 <paper-button class="digit-button" on-tap="onNumberTap_" value="1"> |
| 106 <inner-text>1</inner-text> | 116 <inner-text>1</inner-text> |
| 107 </paper-button> | 117 </paper-button> |
| 108 <paper-button class="digit-button" on-tap="onNumberTap_" value="2"> | 118 <paper-button class="digit-button" on-tap="onNumberTap_" value="2"> |
| 109 <inner-text>2<subhead>ABC</subhead></inner-text> | 119 <inner-text>2<subhead>ABC</subhead></inner-text> |
| 110 </paper-button> | 120 </paper-button> |
| 111 <paper-button class="digit-button" on-tap="onNumberTap_" value="3"> | 121 <paper-button class="digit-button" on-tap="onNumberTap_" value="3"> |
| 112 <inner-text>3<subhead>DEF</subhead></inner-text> | 122 <inner-text>3<subhead>DEF</subhead></inner-text> |
| 113 </paper-button> | 123 </paper-button> |
| 114 </div> | 124 </div> |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 137 <div class="row keyboard"> | 147 <div class="row keyboard"> |
| 138 <div class="digit-button"></div> | 148 <div class="digit-button"></div> |
| 139 <paper-button class="digit-button" on-tap="onNumberTap_" value="0"> | 149 <paper-button class="digit-button" on-tap="onNumberTap_" value="0"> |
| 140 <inner-text>0</inner-text> | 150 <inner-text>0</inner-text> |
| 141 </paper-button> | 151 </paper-button> |
| 142 <div class="digit-button"> | 152 <div class="digit-button"> |
| 143 <paper-icon-button class="digit-button submit-button" | 153 <paper-icon-button class="digit-button submit-button" |
| 144 icon="icons:check" on-tap="onPinSubmit_"> | 154 icon="icons:check" on-tap="onPinSubmit_"> |
| 145 </paper-icon-button> | 155 </paper-icon-button> |
| 146 </div> | 156 </div> |
| 147 </div> | |
| 148 </div> | 157 </div> |
|
jdufault
2016/06/14 22:50:33
Revert change.
sammiequon
2016/06/15 21:56:58
Done.
| |
| 149 </div> | 158 </div> |
| 150 </template> | 159 </template> |
| 151 <script src="pin_keyboard.js"></script> | 160 <script src="pin_keyboard.js"></script> |
| 152 </dom-module> | 161 </dom-module> |
| OLD | NEW |