UI: Adjust spacing in left navigation menu to fit in smaller screens,…

… where height is less.
ClusterLabs · Dec 5, 2016 · bf7899c · bf7899c
1 parent 61ff35d
commit bf7899c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/hawk/app/assets/javascripts/application.js b/hawk/app/assets/javascripts/application.js
@@ -41,14 +41,14 @@ $(function() {
   var resize = function() {
     var navHeight = $('.navbar-fixed-top').outerHeight();
     var footHeight = $('footer').show().outerHeight();
-    var winHeight = $(window).outerHeight() - navHeight - footHeight;
+    var winHeight = $(window).outerHeight() - navHeight;
     var maxHeight = Math.max.apply(
       null,
-      $('#sidebar, #middle, #rightbar').map(function() {
+      $('#middle, #rightbar').map(function() {
         return $(this).height('auto').outerHeight();
       }).get()
     );
-    $('#sidebar, #middle, #rightbar').height(
+    $('#middle, #rightbar').height(
       winHeight > maxHeight ? winHeight : maxHeight
     );
   };

diff --git a/hawk/app/assets/stylesheets/application/_content.scss b/hawk/app/assets/stylesheets/application/_content.scss
@@ -28,7 +28,6 @@
 #sidebar {
   background-color: $sidebar-bg;
   color: $sidebar-fg;
-
   padding-left: 0;
   padding-right: 0;
 
@@ -41,10 +40,10 @@
 
     ul {
       list-style-type: none;
-      line-height: 2.8em;
+      line-height: 2.5em;
       font-weight: normal;
       padding: 0 0 10px 0;
-      margin: 10px 0 10px 10px;
+      margin: 0px 0 10px 10px;
 
       li {
         text-transform: none;
@@ -173,7 +172,6 @@
 }
 
 #rightbar {
-  width: 50%;
   background-color: $rightbar-bg;
   padding-left: 0;
   padding-right: 0;

diff --git a/hawk/app/assets/stylesheets/shared/_foot.scss b/hawk/app/assets/stylesheets/shared/_foot.scss
@@ -3,7 +3,7 @@
 
 .footer {
   position: absolute;
-  bottom: 0;
+  bottom: 60px;
   width: 100%;
   padding: 5px 10px 30px 10px;
   border-top: $footer-border;