thingsboard-aplcache

UI: Main layouts improvements.

9/15/2017 9:46:06 AM

Igor Kulikov

Commit: 4ab8b4a

Tree: c655e6a

Parents: 1133acf

Changes

ui/src/app/layout/home.scss 4(+4 -0)

ui/src/app/layout/home.tpl.html 8(+3 -5)

ui/src/app/profile/profile.tpl.html 2(+1 -1)

Details

ui/src/app/layout/home.scss 4(+4 -0)

diff --git a/ui/src/app/layout/home.scss b/ui/src/app/layout/home.scss
index a809cf6..b15af3e 100644
--- a/ui/src/app/layout/home.scss
+++ b/ui/src/app/layout/home.scss
@@ -71,6 +71,10 @@ md-icon.tb-logo-title {
   white-space: nowrap;
 }
 
+.tb-side-menu-toolbar {
+  overflow-y: auto;
+}
+
 .tb-entity-subtype-search {
   margin-top: 15px;
 }

ui/src/app/layout/home.tpl.html 8(+3 -5)

diff --git a/ui/src/app/layout/home.tpl.html b/ui/src/app/layout/home.tpl.html
index 7b6d9c4..6aacdb8 100644
--- a/ui/src/app/layout/home.tpl.html
+++ b/ui/src/app/layout/home.tpl.html
@@ -31,11 +31,9 @@
           	 </div>
           </md-toolbar>
       </header>
-      <md-content flex layout="column" role="navigation">
-      	 <md-toolbar flex>
-         	<tb-side-menu></tb-side-menu>
-         </md-toolbar> 
-      </md-content>      	
+	  <md-toolbar flex class="tb-side-menu-toolbar" role="navigation">
+		  <tb-side-menu></tb-side-menu>
+	  </md-toolbar>
   </md-sidenav>
 
   <div flex layout="column" tabIndex="-1" role="main">

ui/src/app/profile/profile.tpl.html 2(+1 -1)

diff --git a/ui/src/app/profile/profile.tpl.html b/ui/src/app/profile/profile.tpl.html
index e9445ce..5d59047 100644
--- a/ui/src/app/profile/profile.tpl.html
+++ b/ui/src/app/profile/profile.tpl.html
@@ -16,7 +16,7 @@
 
 -->
 <div layout="row" width="100%" layout-wrap>
-    <md-card flex-gt-sm="60" flex="100">
+    <md-card flex-gt-sm="60" flex="100" style="height: 100%;">
         <md-card-title>
             <md-card-title-text>
                 <span translate class="md-headline">profile.profile</span>