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 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.h tml"> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog-behavior/p aper-dialog-behavior.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog-behavior/p aper-dialog-behavior.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog-behavior/p aper-dialog-shared-styles.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog-behavior/p aper-dialog-shared-styles.html"> |
| 5 <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-icon-button/paper -icon-button.html"> |
| 6 | 6 |
| 7 <dom-module id="settings-dialog"> | 7 <dom-module id="settings-dialog"> |
| 8 <template> | 8 <template> |
| 9 <style include="paper-dialog-shared-styles"></style> | 9 <style include="paper-dialog-shared-styles"></style> |
| 10 <style> | 10 <style> |
| 11 .body-content { | 11 .body-content { |
| 12 display: flex; | |
| 13 flex-direction: column; | |
| 12 font-size: 1em; | 14 font-size: 1em; |
| 13 margin: 20px 0; | 15 min-height: 120px; |
| 14 } | 16 } |
| 15 | 17 |
| 16 .dialog-content { | 18 .dialog-content { |
| 17 -webkit-padding-end: 0; | 19 -webkit-padding-end: 0; |
| 18 -webkit-padding-start: 0; | 20 -webkit-padding-start: 0; |
| 19 margin-bottom: 0; | 21 margin-bottom: 0; |
| 20 margin-top: 0; | 22 margin-top: 0; |
| 21 } | 23 } |
| 22 | 24 |
| 23 .footer-container { | 25 .footer-container { |
| 24 margin: 0; | 26 margin: 0; |
| 25 padding: 0; | 27 padding: 0; |
| 26 } | 28 } |
| 27 | 29 |
| 28 .top-row { | 30 .top-row { |
| 29 align-items: center; | 31 align-items: center; |
| 30 border-bottom: 1px solid var(--paper-grey-300); | 32 border-bottom: 1px solid rgba(0, 0, 0, 0.14); |
| 31 display: flex; | 33 display: flex; |
| 32 padding-bottom: 5px; | 34 font-size: 16px; |
|
dschuyler
2016/04/16 00:31:16
Please use a percentage of current font
size inste
dpapad
2016/04/16 01:09:51
Done. (Also moved the font-size style further down
| |
| 33 padding-top: 5px; | 35 height: 52px; |
|
dschuyler
2016/04/16 00:31:16
will min-height work here? I'm wondering
if a 'ver
dpapad
2016/04/16 01:09:51
Done, min-height seems to work just as fine.
| |
| 36 } | |
| 37 | |
| 38 paper-icon-button { | |
| 39 height: 20px; | |
| 40 margin: 16px; | |
| 41 padding: 0; | |
| 42 width: 20px; | |
| 34 } | 43 } |
| 35 | 44 |
| 36 :host { | 45 :host { |
| 37 max-width: 800px; | 46 max-width: 800px; |
| 38 min-width: 500px; | 47 min-width: 512px; |
| 39 overflow: auto; | 48 overflow: auto; |
| 40 } | 49 } |
| 41 | 50 |
| 42 :host ::content .body { | 51 :host ::content .body { |
| 43 margin-bottom: 35px; | 52 flex: 1; |
| 53 margin: 12px 0 24px 0; | |
| 44 } | 54 } |
| 45 | 55 |
| 46 :host ::content .button-container { | 56 :host ::content .button-container { |
| 47 display: flex; | 57 display: flex; |
| 48 justify-content: flex-end; | 58 justify-content: flex-end; |
| 59 margin-bottom: 12px; | |
| 49 } | 60 } |
| 50 | 61 |
| 51 :host ::content .button-container .cancel-button { | 62 :host ::content .button-container .cancel-button { |
| 63 -webkit-margin-end: 8px; | |
| 52 color: var(--paper-grey-600); | 64 color: var(--paper-grey-600); |
| 53 font-weight: 500; | 65 font-weight: 500; |
| 54 } | 66 } |
| 55 | 67 |
| 56 :host ::content .footer { | 68 :host ::content .footer { |
| 57 background-color: var(--paper-grey-200); | 69 background-color: var(--paper-grey-200); |
| 58 margin: 0; | 70 margin: 0; |
| 59 padding: 20px; | 71 padding: 20px; |
| 60 } | 72 } |
| 61 | 73 |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 90 <content select=".body"></content> | 102 <content select=".body"></content> |
| 91 <content select=".button-container"></content> | 103 <content select=".button-container"></content> |
| 92 </div> | 104 </div> |
| 93 </div> | 105 </div> |
| 94 <div class="footer-container"> | 106 <div class="footer-container"> |
| 95 <content select=".footer"></content> | 107 <content select=".footer"></content> |
| 96 </div> | 108 </div> |
| 97 </template> | 109 </template> |
| 98 <script src="settings_dialog.js"></script> | 110 <script src="settings_dialog.js"></script> |
| 99 </dom-module> | 111 </dom-module> |
| OLD | NEW |