Commit dd1398918af4fd97b623f3d54528bbeca4ba7160
1 parent
f390a6e1
layout fix
Showing
2 changed files
with
21 additions
and
11 deletions
controllets/animated-button-container-controllet/animated-button-container-controllet.html
| ... | ... | @@ -131,6 +131,15 @@ |
| 131 | 131 | transition: 0.2s ease-out; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | + .transparent | |
| 135 | + { | |
| 136 | + position:fixed; | |
| 137 | + top:0; | |
| 138 | + left:0; | |
| 139 | + width:100%; | |
| 140 | + height:100%; | |
| 141 | + background-color: rgba(0, 0, 0, 0.4); | |
| 142 | + } | |
| 134 | 143 | |
| 135 | 144 | </style> |
| 136 | 145 | |
| ... | ... | @@ -139,7 +148,7 @@ |
| 139 | 148 | <neon-animatable><div id="hidden"></div></neon-animatable> |
| 140 | 149 | <neon-animatable> |
| 141 | 150 | <paper-material elevation="5" id="window" class="window"> |
| 142 | - <div style="position:fixed; top:0; left:0; width:100%; height:100%; background-color: rgba(0, 0, 0, 0.4);"></div> | |
| 151 | + <div class="transparent"></div> | |
| 143 | 152 | <paper-toolbar id="toolbar"> |
| 144 | 153 | <search-panel-controllet id="search_from_animated_button_container" left-direction="true"></search-panel-controllet> |
| 145 | 154 | <paper-fab id="close" mini icon="close" on-click="_onCloseClick"></paper-fab> |
| ... | ... | @@ -149,8 +158,7 @@ |
| 149 | 158 | </neon-animatable> |
| 150 | 159 | </neon-animated-pages> |
| 151 | 160 | |
| 152 | - <div class="horizontal layout"> | |
| 153 | - <!--<paper-fab mini icon="{{icon}}" id="open" on-click="_onOpenClick"></paper-fab>--> | |
| 161 | + <div id="button_container" class="horizontal layout"> | |
| 154 | 162 | <span class="button-container" id="open" on-click="_onOpenClick"> |
| 155 | 163 | <iron-icon id="button" icon="{{icon}}"></iron-icon> |
| 156 | 164 | </span> |
| ... | ... | @@ -229,11 +237,12 @@ |
| 229 | 237 | |
| 230 | 238 | $(this.$.container_content).perfectScrollbar(); |
| 231 | 239 | |
| 232 | - this.$.open.style.height = this.iconHeight + "px"; | |
| 233 | - this.$.open.style.width = this.iconWidth + "px"; | |
| 234 | - this.$.open.style.backgroundColor = this.backgroundButtonColor; | |
| 235 | - this.$.button.style.width = this.iconWidth + "px"; | |
| 236 | - this.$.button.style.height = this.iconHeight + "px"; | |
| 240 | + this.$.open.style.height = this.iconHeight + "px"; | |
| 241 | + this.$.open.style.width = this.iconWidth + "px"; | |
| 242 | + this.$.open.style.backgroundColor = this.backgroundButtonColor; | |
| 243 | + this.$.button.style.width = this.iconWidth + "px"; | |
| 244 | + this.$.button.style.height = this.iconHeight + "px"; | |
| 245 | + this.$.button_container.style.height = this.iconHeight + "px"; | |
| 237 | 246 | }, |
| 238 | 247 | |
| 239 | 248 | _onOpenClick: function() { | ... | ... |
controllets/data-sevc-controllet/data-sevc-controllet.html
| ... | ... | @@ -175,7 +175,8 @@ Example: |
| 175 | 175 | { |
| 176 | 176 | height: 60vh; |
| 177 | 177 | min-height: 60vh; |
| 178 | - | |
| 178 | + min-width: 45%; | |
| 179 | + margin-top:10px; | |
| 179 | 180 | } |
| 180 | 181 | |
| 181 | 182 | .datalet_right_container |
| ... | ... | @@ -392,7 +393,7 @@ Example: |
| 392 | 393 | |
| 393 | 394 | </neon-animatable> |
| 394 | 395 | |
| 395 | - <neon-animatable style="height:100vh"> | |
| 396 | + <neon-animatable> | |
| 396 | 397 | |
| 397 | 398 | <div class="vertical justified layout"> |
| 398 | 399 | |
| ... | ... | @@ -429,7 +430,7 @@ Example: |
| 429 | 430 | </paper-material> |
| 430 | 431 | </div> |
| 431 | 432 | |
| 432 | - <div id="datalet_placeholder" style="min-width: 45%;margin-top:10px;"></div> | |
| 433 | + <div id="datalet_placeholder"></div> | |
| 433 | 434 | |
| 434 | 435 | </div> |
| 435 | 436 | ... | ... |