diff --git a/module/index/css/index.css b/module/index/css/index.css index 83387211dc..fdafdaf6ee 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -43,11 +43,12 @@ body.menu-hide {padding-left: 0;} #appsBar {position: fixed; left: 96px; bottom: 0; right: 0; height: 40px; z-index: 1012; background: #fff; border-top: 1px solid #eff1f7;} .menu-hide #appsBar {left: 40px;} #bars {position: absolute; left: 0; top: 0; bottom: 0; padding: 0 5px;} -#bars > li {padding: 8px 5px;} -#bars > li > a {height: 24px; color: #fff; background: #3c4353; padding: 2px 8px; line-height: 20px; border-radius: 2px;} -#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #3c495c;} -#bars > li.active > a, #bars > li.active > a:active, #bars > li.active > a:focus {background: #0c64eb;} -#bars > li.active:after {content: ' '; display: block; position: absolute; background: #a0cafa; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;} +#bars > li {padding: 8px 2px;} +#bars > li > a {height: 24px; color: #000; padding: 2px 8px; line-height: 20px; border-radius: 2px;} +#bars > li > a:hover, #bars > li > a:active, #bars > li > a:focus {background: #16a8f8;} +#bars > li.active > a, #bars > li.active > a:active, #bars > li.active > a:focus {font-weight: 600; border-bottom: 2px solid #16a8f8;} +#bars > li.active:after {content: ' '; display: block; position: absolute; height: 3px; left: 5px; right: 5px; bottom: 0; border-radius: 2px;} +#bars > li.divider{margin-right: 5px; margin-top: 10px; height: 20px; border-right: 1px solid #d9d9d9;} #userNav {float: none; margin: 0;} #userNav>li {text-align: center;} diff --git a/module/index/js/index.js b/module/index/js/index.js index c8f05a1e7a..cc08ec5a0d 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -114,11 +114,11 @@ { if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program'; } - if(moduleName === 'user') + if(moduleName === 'user') { if(['todo', 'task', 'story', 'bug', 'testtask', 'testcase', 'execution', 'dynamic', 'profile', 'view'].includes(methodLowerCase)) return 'system'; } - if(moduleName === 'my') + if(moduleName === 'my') { if(['team'].includes(methodLowerCase)) return 'system'; } @@ -219,6 +219,9 @@ .attr('data-app', appCode) .attr('class', 'show-in-app') .html(app.text); + var barCount = $('#bars li').length; + + if(barCount) $bar = $('
  • ').appendTo($bars); $bar = $('
  • ').attr('data-app', appCode) .attr('id', 'appBar-' + appCode) .append($link)