简柏林 / thingskit · Commits

Commit ac9c3731f8f7ca7924eeeaf18f30c5a48ea79ea3

Authored by Vladyslav_Prykhodko
1 parent 8d3cdde1

Fixed problem widget-editor in Safari #2900

Inline Side-by-side
Showing 2 changed files with 15 additions and 12 deletions
@@ -62,6 +62,11 @@ $edit-toolbar-height: 40px !default; @@ -62,6 +62,11 @@ $edit-toolbar-height: 40px !default;
62 height: 100%; 62 height: 100%;
63 } 63 }
64 } 64 }
  65 +
  66 + .container{
  67 + width: 100%;
  68 + height: 100%;
  69 + }
65 } 70 }
66 71
67 .tb-split-vertical { 72 .tb-split-vertical {
@@ -114,18 +114,18 @@ @@ -114,18 +114,18 @@
114 </div> 114 </div>
115 </md-toolbar> 115 </md-toolbar>
116 <div flex style="position: relative;"> 116 <div flex style="position: relative;">
117 - <div class="tb-editor tb-absolute-fill" style=""> 117 + <div class="tb-editor tb-absolute-fill">
118 <div id="top_panel" class="tb-split tb-split-vertical"> 118 <div id="top_panel" class="tb-split tb-split-vertical">
119 <div id="top_left_panel" class="tb-split tb-content"> 119 <div id="top_left_panel" class="tb-split tb-content">
120 - <md-tabs md-selected="1" md-dynamic-height md-border-bottom style="width: 100%; height: 100%;">  
121 - <md-tab label="{{ 'widget.resources' | translate }}" style="width: 100%; height: 100%;"> 120 + <md-tabs md-selected="1" md-dynamic-height md-border-bottom class="container">
  121 + <md-tab label="{{ 'widget.resources' | translate }}">
122 <div class="tb-resize-container" style="background-color: #fff;"> 122 <div class="tb-resize-container" style="background-color: #fff;">
123 <div class="md-padding"> 123 <div class="md-padding">
124 <div flex layout="row" 124 <div flex layout="row"
125 ng-repeat="resource in vm.widget.resources track by $index" 125 ng-repeat="resource in vm.widget.resources track by $index"
126 style="max-height: 40px;" layout-align="start center"> 126 style="max-height: 40px;" layout-align="start center">
127 <md-input-container flex md-no-float class="md-block" 127 <md-input-container flex md-no-float class="md-block"
128 - style="margin: 10px 0px 0px 0px; max-height: 40px;"> 128 + style="margin: 10px 0 0; max-height: 40px;">
129 <input placeholder="{{ 'widget.resource-url' | translate }}" 129 <input placeholder="{{ 'widget.resource-url' | translate }}"
130 ng-required="true" name="resource" ng-model="resource.url"> 130 ng-required="true" name="resource" ng-model="resource.url">
131 </md-input-container> 131 </md-input-container>
@@ -154,7 +154,7 @@ @@ -154,7 +154,7 @@
154 </div> 154 </div>
155 </div> 155 </div>
156 </md-tab> 156 </md-tab>
157 - <md-tab label="{{ 'widget.html' | translate }}" style="width: 100%; height: 100%;"> 157 + <md-tab label="{{ 'widget.html' | translate }}">
158 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button"> 158 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
159 <div class="tb-editor-area-title-panel"> 159 <div class="tb-editor-area-title-panel">
160 <md-button aria-label="{{ 'widget.tidy' | translate }}" 160 <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 ng-model="vm.widget.templateHtml"></div> 168 ng-model="vm.widget.templateHtml"></div>
169 </div> 169 </div>
170 </md-tab> 170 </md-tab>
171 - <md-tab label="{{ 'widget.css' | translate }}" style="width: 100%; height: 100%;"> 171 + <md-tab label="{{ 'widget.css' | translate }}">
172 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button"> 172 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
173 <div class="tb-editor-area-title-panel"> 173 <div class="tb-editor-area-title-panel">
174 <md-button aria-label="{{ 'widget.tidy' | translate }}" 174 <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -185,9 +185,8 @@ @@ -185,9 +185,8 @@
185 </md-tabs> 185 </md-tabs>
186 </div> 186 </div>
187 <div id="top_right_panel" class="tb-split tb-content"> 187 <div id="top_right_panel" class="tb-split tb-content">
188 - <md-tabs md-dynamic-height md-border-bottom style="width: 100%; height: 100%;">  
189 - <md-tab label="{{ 'widget.settings-schema' | translate }}"  
190 - style="width: 100%; height: 100%;"> 188 + <md-tabs md-dynamic-height md-border-bottom class="container">
  189 + <md-tab label="{{ 'widget.settings-schema' | translate }}">
191 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button"> 190 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
192 <div class="tb-editor-area-title-panel"> 191 <div class="tb-editor-area-title-panel">
193 <md-button aria-label="{{ 'widget.tidy' | translate }}" 192 <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -201,8 +200,7 @@ @@ -201,8 +200,7 @@
201 ng-model="vm.widget.settingsSchema"></div> 200 ng-model="vm.widget.settingsSchema"></div>
202 </div> 201 </div>
203 </md-tab> 202 </md-tab>
204 - <md-tab label="{{ 'widget.datakey-settings-schema' | translate }}"  
205 - style="width: 100%; height: 100%;"> 203 + <md-tab label="{{ 'widget.datakey-settings-schema' | translate }}">
206 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button"> 204 <div class="tb-resize-container" tb-expand-fullscreen expand-button-id="expand-button">
207 <div class="tb-editor-area-title-panel"> 205 <div class="tb-editor-area-title-panel">
208 <md-button aria-label="{{ 'widget.tidy' | translate }}" 206 <md-button aria-label="{{ 'widget.tidy' | translate }}"
@@ -240,7 +238,7 @@ @@ -240,7 +238,7 @@
240 <md-progress-circular ng-disabled="vm.iframeWidgetEditModeInited" md-mode="indeterminate" class="md-warn" 238 <md-progress-circular ng-disabled="vm.iframeWidgetEditModeInited" md-mode="indeterminate" class="md-warn"
241 md-diameter="100"></md-progress-circular> 239 md-diameter="100"></md-progress-circular>
242 </md-content> 240 </md-content>
243 - <div tb-expand-fullscreen expand-button-id="expand-button" style="width: 100%; height: 100%;"> 241 + <div tb-expand-fullscreen expand-button-id="expand-button" class="container">
244 <iframe frameborder="0" height="100%" width="100%"></iframe> 242 <iframe frameborder="0" height="100%" width="100%"></iframe>
245 <md-button id="expand-button" aria-label="Fullscreen" 243 <md-button id="expand-button" aria-label="Fullscreen"
246 class="md-icon-button tb-fullscreen-button-style" 244 class="md-icon-button tb-fullscreen-button-style"