简柏林 / thingskit · Commits

Commit b922e070aecb98b54f5f9364b516cf1276596bf5

Authored by Igor Kulikov
1 parent 01cb77f5

UI layout fixes.

Inline Side-by-side
Showing 4 changed files with 8 additions and 18 deletions
... ... @@ -60,7 +60,7 @@
60 60 <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
61 61 <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
62 62 </div>
63   - <div layout="row" flex>
  63 + <div layout="row">
64 64 <div class="tb-chip-label">
65 65 {{$chip.label}}
66 66 </div>
... ... @@ -112,7 +112,7 @@
112 112 <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
113 113 <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
114 114 </div>
115   - <div layout="row" flex>
  115 + <div layout="row">
116 116 <div class="tb-chip-label">
117 117 {{$chip.label}}
118 118 </div>
... ... @@ -164,7 +164,7 @@
164 164 <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
165 165 <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
166 166 </div>
167   - <div layout="row" flex>
  167 + <div layout="row">
168 168 <div class="tb-chip-label">
169 169 {{$chip.label}}
170 170 </div>
... ...
... ... @@ -61,7 +61,7 @@
61 61 <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
62 62 <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
63 63 </div>
64   - <div layout="row" flex>
  64 + <div layout="row">
65 65 <div class="tb-chip-label">
66 66 {{$chip.label}}
67 67 </div>
... ... @@ -112,7 +112,7 @@
112 112 <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
113 113 <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
114 114 </div>
115   - <div layout="row" flex>
  115 + <div layout="row">
116 116 <div class="tb-chip-label">
117 117 {{$chip.label}}
118 118 </div>
... ...
... ... @@ -59,14 +59,4 @@ md-sidenav.tb-sidenav-details {
59 59 background-color: $primary-hue-3;
60 60 }
61 61 }
62   -
63   - md-tab-content.md-active > div {
64   - height: 100%;
65   - & > *:first-child {
66   - height: 100%;
67   - }
68   - md-content {
69   - height: 100%;
70   - }
71   - }
72 62 }
... ...
... ... @@ -187,17 +187,17 @@
187 187 </div>
188 188 <div layout='column' layout-align="center" layout-gt-sm='row' layout-align-gt-sm="start center">
189 189 <div layout="row" layout-padding>
190   - <md-checkbox flex aria-label="{{ 'widget-config.display-title' | translate }}"
  190 + <md-checkbox aria-label="{{ 'widget-config.display-title' | translate }}"
191 191 ng-model="showTitle">{{ 'widget-config.display-title' | translate }}
192 192 </md-checkbox>
193 193 </div>
194 194 <div layout="row" layout-padding>
195   - <md-checkbox flex aria-label="{{ 'widget-config.drop-shadow' | translate }}"
  195 + <md-checkbox aria-label="{{ 'widget-config.drop-shadow' | translate }}"
196 196 ng-model="dropShadow">{{ 'widget-config.drop-shadow' | translate }}
197 197 </md-checkbox>
198 198 </div>
199 199 <div layout="row" layout-padding>
200   - <md-checkbox flex aria-label="{{ 'widget-config.enable-fullscreen' | translate }}"
  200 + <md-checkbox aria-label="{{ 'widget-config.enable-fullscreen' | translate }}"
201 201 ng-model="enableFullscreen">{{ 'widget-config.enable-fullscreen' | translate }}
202 202 </md-checkbox>
203 203 </div>
... ...