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/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior /iron-resizable-behavior.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-material/paper-ma terial-shared-styles.html"> |
5 <link rel="import" href="drag_behavior.html"> | 5 <link rel="import" href="drag_behavior.html"> |
6 <link rel="import" href="layout_behavior.html"> | 6 <link rel="import" href="layout_behavior.html"> |
7 <link rel="import" href="../settings_shared_css.html"> | 7 <link rel="import" href="../settings_shared_css.html"> |
8 | 8 |
9 <dom-module id="display-layout"> | 9 <dom-module id="display-layout"> |
10 <template> | 10 <template> |
11 <style include="settings-shared"> | 11 <style include="settings-shared paper-material-shared-styles"> |
12 /* Use relative position with no offset so that display divs (children), | 12 /* Use relative position with no offset so that display divs (children), |
13 which have absolute positions, are offset from the displayArea div. */ | 13 which have absolute positions, are offset from the displayArea div. */ |
14 #displayArea { | 14 #displayArea { |
15 height: 100%; | 15 height: 100%; |
16 overflow: hidden; | 16 overflow: hidden; |
17 position: relative; | 17 position: relative; |
18 width: 100%; | 18 width: 100%; |
19 } | 19 } |
20 | 20 |
21 /* Note: the size of the border / box shadow affects the style generated | 21 /* Note: the size of the border / box shadow affects the style generated |
(...skipping 23 matching lines...) Expand all Loading... | |
45 } | 45 } |
46 .highlight-right { | 46 .highlight-right { |
47 border-right: var(--google-blue-700) solid 1px; | 47 border-right: var(--google-blue-700) solid 1px; |
48 } | 48 } |
49 .highlight-top { | 49 .highlight-top { |
50 border-top: var(--google-blue-700) solid 1px; | 50 border-top: var(--google-blue-700) solid 1px; |
51 } | 51 } |
52 .highlight-bottom { | 52 .highlight-bottom { |
53 border-bottom: var(--google-blue-700) solid 1px; | 53 border-bottom: var(--google-blue-700) solid 1px; |
54 } | 54 } |
55 | |
56 .display.elevate { | |
57 @apply(--shadow-elevation-2dp); | |
58 } | |
55 </style> | 59 </style> |
56 <div id="displayArea" on-iron-resize="calculateVisualScale_"> | 60 <div id="displayArea" on-iron-resize="calculateVisualScale_"> |
57 <template is="dom-repeat" items="[[displays]]"> | 61 <template is="dom-repeat" items="[[displays]]"> |
58 <div id="_mirror_[[item.id]]" class="display mirror" | 62 <div id="_mirror_[[item.id]]" class="display mirror" |
dpapad
2017/05/20 00:38:33
It is unclear to me whether this should also have
stevenjb
2017/05/22 22:27:56
There were some styling changes done here that I w
| |
59 hidden$="[[!mirroring]]" | 63 hidden$="[[!mirroring]]" |
60 style$="[[getMirrorDivStyle_(item.id, item.bounds, visualScale)]]"> | 64 style$="[[getMirrorDivStyle_(item.id, item.bounds, visualScale)]]"> |
61 </div> | 65 </div> |
62 </template> | 66 </template> |
63 <template is="dom-repeat" items="[[displays]]"> | 67 <template is="dom-repeat" items="[[displays]]"> |
64 <paper-material id="_[[item.id]]" class="display" elevation="1" | 68 <div id="_[[item.id]]" class="display elevate" |
65 draggable="[[dragEnabled]]" on-tap="onSelectDisplayTap_" | 69 draggable="[[dragEnabled]]" on-tap="onSelectDisplayTap_" |
66 style$="[[getDivStyle_(item.id, item.bounds, visualScale)]]" | 70 style$="[[getDivStyle_(item.id, item.bounds, visualScale)]]" |
67 selected$="[[isSelected_(item, selectedDisplay)]]"> | 71 selected$="[[isSelected_(item, selectedDisplay)]]"> |
68 [[item.name]] | 72 [[item.name]] |
69 </paper-material> | 73 </div> |
70 </template> | 74 </template> |
71 </div> | 75 </div> |
72 </template> | 76 </template> |
73 <script src="display_layout.js"></script> | 77 <script src="display_layout.js"></script> |
74 </dom-module> | 78 </dom-module> |
OLD | NEW |