thingsboard-aplcache

UI layout fixes.

6/12/2018 11:22:35 AM

Igor Kulikov

Commit: b922e07

Tree: bf2e222

Parents: 01cb77f

Changes

ui/src/app/components/datasource-entity.tpl.html 6(+3 -3)

ui/src/app/components/datasource-func.tpl.html 4(+2 -2)

ui/src/app/components/details-sidenav.scss 10(+0 -10)

ui/src/app/components/widget/widget-config.tpl.html 6(+3 -3)

Details

ui/src/app/components/datasource-entity.tpl.html 6(+3 -3)

diff --git a/ui/src/app/components/datasource-entity.tpl.html b/ui/src/app/components/datasource-entity.tpl.html
index 484164f..db6fd3b 100644
--- a/ui/src/app/components/datasource-entity.tpl.html
+++ b/ui/src/app/components/datasource-entity.tpl.html
@@ -60,7 +60,7 @@
 							<div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
 								<div class="tb-color-result" ng-style="{background: $chip.color}"></div>
 							</div>
-							<div layout="row" flex>
+							<div layout="row">
 							  <div class="tb-chip-label">
 							  	{{$chip.label}}
 							  </div>
@@ -112,7 +112,7 @@
 							  <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
 								  <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
 							  </div>
-							  <div layout="row" flex>
+							  <div layout="row">
 								  <div class="tb-chip-label">
 									  {{$chip.label}}
 								  </div>
@@ -164,7 +164,7 @@
 						   <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
 							   <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
 						   </div>
-						   <div layout="row" flex>
+						   <div layout="row">
 							   <div class="tb-chip-label">
 								   {{$chip.label}}
 							   </div>

ui/src/app/components/datasource-func.tpl.html 4(+2 -2)

diff --git a/ui/src/app/components/datasource-func.tpl.html b/ui/src/app/components/datasource-func.tpl.html
index 134dcd7..6bf49ba 100644
--- a/ui/src/app/components/datasource-func.tpl.html
+++ b/ui/src/app/components/datasource-func.tpl.html
@@ -61,7 +61,7 @@
 						  <div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
 							  <div class="tb-color-result" ng-style="{background: $chip.color}"></div>
 						  </div>
-						  <div layout="row" flex>
+						  <div layout="row">
 							  <div class="tb-chip-label">
 								  {{$chip.label}}
 							  </div>
@@ -112,7 +112,7 @@
 					<div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
 						<div class="tb-color-result" ng-style="{background: $chip.color}"></div>
 					</div>
-					<div layout="row" flex>
+					<div layout="row">
 						<div class="tb-chip-label">
 							{{$chip.label}}
 						</div>

ui/src/app/components/details-sidenav.scss 10(+0 -10)

diff --git a/ui/src/app/components/details-sidenav.scss b/ui/src/app/components/details-sidenav.scss
index 360b133..c7e9919 100644
--- a/ui/src/app/components/details-sidenav.scss
+++ b/ui/src/app/components/details-sidenav.scss
@@ -59,14 +59,4 @@ md-sidenav.tb-sidenav-details {
       background-color: $primary-hue-3;
     }
   }
-
-  md-tab-content.md-active > div {
-    height: 100%;
-    & > *:first-child {
-      height: 100%;
-    }
-    md-content {
-      height: 100%;
-    }
-  }
 }

ui/src/app/components/widget/widget-config.tpl.html 6(+3 -3)

diff --git a/ui/src/app/components/widget/widget-config.tpl.html b/ui/src/app/components/widget/widget-config.tpl.html
index ce796d4..e8762bd 100644
--- a/ui/src/app/components/widget/widget-config.tpl.html
+++ b/ui/src/app/components/widget/widget-config.tpl.html
@@ -187,17 +187,17 @@
                 </div>
                 <div layout='column' layout-align="center" layout-gt-sm='row' layout-align-gt-sm="start center">
                     <div layout="row" layout-padding>
-                        <md-checkbox flex aria-label="{{ 'widget-config.display-title' | translate }}"
+                        <md-checkbox aria-label="{{ 'widget-config.display-title' | translate }}"
                                      ng-model="showTitle">{{ 'widget-config.display-title' | translate }}
                         </md-checkbox>
                     </div>
                     <div layout="row" layout-padding>
-                        <md-checkbox flex aria-label="{{ 'widget-config.drop-shadow' | translate }}"
+                        <md-checkbox aria-label="{{ 'widget-config.drop-shadow' | translate }}"
                                      ng-model="dropShadow">{{ 'widget-config.drop-shadow' | translate }}
                         </md-checkbox>
                     </div>
                     <div layout="row" layout-padding>
-                        <md-checkbox flex aria-label="{{ 'widget-config.enable-fullscreen' | translate }}"
+                        <md-checkbox aria-label="{{ 'widget-config.enable-fullscreen' | translate }}"
                                      ng-model="enableFullscreen">{{ 'widget-config.enable-fullscreen' | translate }}
                         </md-checkbox>
                     </div>