diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 3712375dad..c18cdca402 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -638,6 +638,19 @@ define(function(require) { var topTabs = $(".sunstone-menu-content ul li.topTab"); var subTabs = $(".sunstone-menu-content ul li.subTab > a"); + $(".sunstone-menu-content").resize(function(){ + var menuWidth = $(this).outerWidth(); + var maxWidth = $(this).parent().innerWidth(); + if(maxWidth >= 1200){ + if(menuWidth >= maxWidth){ + $(this).outerWidth(maxWidth); + $(this).siblings(".sunstone-content").outerWidth(maxWidth); + }else{ + $(this).siblings(".sunstone-content").outerWidth(Math.floor(maxWidth-menuWidth)-1); + } + } + }); + subTabs.on("click", function() { if ($(this).closest("li").hasClass("topTab")) { return false; diff --git a/src/sunstone/public/app/utils/labels/utils.js b/src/sunstone/public/app/utils/labels/utils.js index 69c28b6463..d7168cdd80 100644 --- a/src/sunstone/public/app/utils/labels/utils.js +++ b/src/sunstone/public/app/utils/labels/utils.js @@ -445,17 +445,17 @@ define(function (require) { var fullName = parentName + folderName; if (persis) { var htmlStr = - "" + + "" + folderName + ""; } else if (yaml) { var htmlStr = - "" + + "" + folderName + ""; } else { var htmlStr = - "" + + "" + folderName + ""; } diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss index 2effd7fa71..ea36b980a2 100644 --- a/src/sunstone/public/scss/app.scss +++ b/src/sunstone/public/scss/app.scss @@ -328,6 +328,11 @@ ul.dropdown-menu-css { } } +.sunstone-menu-content{ + resize: horizontal; + overflow: auto; +} + @media screen and (min-width: 64em){ .medium-hide { display: none !important;