Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 | 2 |
| 3 <link rel="import" href="chrome://resources/html/util.html"> | 3 <link rel="import" href="chrome://resources/html/util.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/iron-icon/iron-icon.htm l"> |
|
dschuyler
2017/06/06 18:58:39
Is this needed?
scottchen
2017/06/06 22:33:12
Nope! removing.
| |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> |
| 6 <link rel="import" href="../icons.html"> | 7 <link rel="import" href="../icons.html"> |
| 7 <link rel="import" href="../settings_shared_css.html"> | 8 <link rel="import" href="../settings_shared_css.html"> |
| 8 | 9 |
| 9 <dom-module id="settings-camera"> | 10 <dom-module id="settings-camera"> |
| 10 <template> | 11 <template> |
| 11 <style include="settings-shared"> | 12 <style include="settings-shared"> |
| 12 #perspectiveBox { | 13 #perspectiveBox { |
| 13 height: 228px; | 14 height: 228px; |
| 14 perspective: 600px; | 15 perspective: 600px; |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 57 :host-context([dir=rtl]) #flipPhoto { | 58 :host-context([dir=rtl]) #flipPhoto { |
| 58 float: left; | 59 float: left; |
| 59 } | 60 } |
| 60 | 61 |
| 61 #takePhoto { | 62 #takePhoto { |
| 62 --iron-icon-fill-color: white; | 63 --iron-icon-fill-color: white; |
| 63 background-color: var(--paper-green-500); | 64 background-color: var(--paper-green-500); |
| 64 border-radius: 50%; | 65 border-radius: 50%; |
| 65 display: block; | 66 display: block; |
| 66 margin: 0 auto 0 auto; | 67 margin: 0 auto 0 auto; |
| 67 } | 68 } |
|
dschuyler
2017/06/06 18:58:39
I suspect that --iron-icon-fill-color is no longer
scottchen
2017/06/06 22:33:12
Yep, removing!
| |
| 68 </style> | 69 </style> |
| 69 <div hidden="[[!cameraActive]]"> | 70 <div hidden="[[!cameraActive]]"> |
| 70 <div id="perspectiveBox"> | 71 <div id="perspectiveBox"> |
| 71 <div id="userImageStreamCrop"> | 72 <div id="userImageStreamCrop"> |
| 72 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> | 73 <video id="cameraVideo" autoplay hidden="[[!cameraOnline_]]"></video> |
| 73 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> | 74 <paper-spinner active="[[!cameraOnline_]]"></paper-spinner> |
| 74 </div> | 75 </div> |
| 75 </div> | 76 </div> |
| 76 <div id="cameraControls"> | 77 <div id="cameraControls"> |
| 77 <paper-icon-button id="flipPhoto" tabindex="2" | 78 <button is="paper-icon-button-light" id="flipPhoto" tabindex="2" |
| 78 icon="settings:flip" title="$i18n{flipPhoto}" | 79 title="$i18n{flipPhoto}" on-tap="onTapFlipPhoto_" |
| 79 on-tap="onTapFlipPhoto_" disabled="[[!cameraOnline_]]"> | 80 disabled="[[!cameraOnline_]]" class="icon-flip"> |
| 80 </paper-icon-button> | 81 </button> |
| 81 <paper-icon-button id="takePhoto" tabindex="1" | 82 <button is="paper-icon-button-light" id="takePhoto" tabindex="1" |
| 82 icon="settings:camera-alt" title="$i18n{takePhoto}" | 83 title="$i18n{takePhoto}" on-tap="takePhoto" |
| 83 on-tap="takePhoto" disabled="[[!cameraOnline_]]"> | 84 disabled="[[!cameraOnline_]]" class="icon-camera-alt"> |
| 84 </paper-icon-button> | 85 </button> |
| 85 </div> | 86 </div> |
| 86 </div> | 87 </div> |
| 87 </template> | 88 </template> |
| 88 <script src="camera.js"></script> | 89 <script src="camera.js"></script> |
| 89 </dom-module> | 90 </dom-module> |
| OLD | NEW |