diff --git a/module/doc/css/view.css b/module/doc/css/view.css index 4f44ea039d..5d93946feb 100644 --- a/module/doc/css/view.css +++ b/module/doc/css/view.css @@ -53,7 +53,7 @@ .actions > .text {color: #8c8c8c; font-size: 14px;} .flex-content {display: flex; width: 100%; height: 100%;} .flex-content > #content {flex: auto; overflow-y: auto;} -.flex-content > #history {flex: 0 0 302px; position: relative;} +.flex-content > #history {flex: 0 0 302px; position: relative; overflow: auto;} .flex-content > #history > #closeIcon {position: absolute; right: 10px; top: 10px;} .panel {margin-bottom: 0;} .detail {margin: 0 4px;} diff --git a/module/doc/js/view.js b/module/doc/js/view.js index 38d17e3efe..c0eba22453 100644 --- a/module/doc/js/view.js +++ b/module/doc/js/view.js @@ -208,19 +208,22 @@ $(function() if($history.hasClass('hidden')) { $history.removeClass('hidden'); + $('#outlineMenu').addClass('hidden'); $icon.addClass('text-primary'); } else { $history.addClass('hidden'); + $('#outlineMenu').removeClass('hidden'); $icon.removeClass('text-primary'); } }) - $('#history').find('.btn.pull-right').removeClass('pull-right') + $('#history').find('.btn.pull-right').removeClass('pull-right'); $('#closeBtn').on('click', function() { $('#history').addClass('hidden'); + $('#outlineMenu').removeClass('hidden'); $('#hisTrigger').removeClass('text-primary'); }) $('#history').find('.btn.pull-right').removeClass('pull-right'); diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 8ab4482625..594364b181 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -145,7 +145,7 @@ -
+
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 0da8f7e00b..23ce630714 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -23,7 +23,7 @@ .input-tree {width: 120px;} .tree-icon {position: absolute; right: 0;} .tree li.has-input {overflow: hidden;} -.tree li.has-input > input {margin-left: 15px;} +.tree li.has-input > input.input-bro {margin-left: 15px;} .img-lib {flex: 0 0 14px; height: 14px; margin-right: 5px;} .tree-icon {position: absolute; right: 0;} .tree li > a {max-width: 100%; padding: 2px;} @@ -549,7 +549,7 @@ $(function() var $rootDom = $('#fileTree li[data-id=' + item.id + ']'); $rootDom.after($input); $rootDom.closest('ul').find('.has-input').css('padding-left', '0'); - $('#fileTree').find('input').focus(); + $('#fileTree').find('input').addClass('input-bro').focus(); break; case 'addCataChild' : moduleData.parentID = item.id;