diff --git a/services/web/app/views/project/editor/file-tree-react.pug b/services/web/app/views/project/editor/file-tree-react.pug index 9ec480fbbc..5838ab541d 100644 --- a/services/web/app/views/project/editor/file-tree-react.pug +++ b/services/web/app/views/project/editor/file-tree-react.pug @@ -1,42 +1,38 @@ -aside.editor-sidebar.full-size +aside.editor-sidebar.full-size( + ng-show="ui.view != 'history'" + vertical-resizable-panes="outline-resizer" + vertical-resizable-panes-toggled-externally-on="outline-toggled" + vertical-resizable-panes-default-size="350" + vertical-resizable-panes-min-size="32" + vertical-resizable-panes-max-size="'75%'" + vertical-resizable-panes-resize-on="left-pane-resize-all" +) - .resizable-side-bar( - ng-show="ui.view != 'history'" - vertical-resizable-panes="outline-resizer" - vertical-resizable-panes-toggled-externally-on="outline-toggled" - vertical-resizable-panes-default-size="350" - vertical-resizable-panes-min-size="32" - vertical-resizable-panes-max-size="'75%'" - vertical-resizable-panes-resize-on="left-pane-resize-all" + .file-tree( + ng-controller="ReactFileTreeController" + vertical-resizable-top ) - - .file-tree( - ng-controller="ReactFileTreeController" - vertical-resizable-top + file-tree-root( + on-select="onSelect" + on-init="onInit" + is-connected="isConnected" + ref-providers="refProviders" + reindex-references="reindexReferences" + set-ref-provider-enabled="setRefProviderEnabled" + set-started-free-trial="setStartedFreeTrial" ) - file-tree-root( - on-select="onSelect" - on-init="onInit" - is-connected="isConnected" - ref-providers="refProviders" - reindex-references="reindexReferences" - set-ref-provider-enabled="setRefProviderEnabled" - set-started-free-trial="setStartedFreeTrial" - ) - .outline-container( - vertical-resizable-bottom - ng-controller="OutlineController" + .outline-container( + vertical-resizable-bottom + ng-controller="OutlineController" + ) + outline-pane( + is-tex-file="isTexFile" + outline="outline" + project-id="project_id" + jump-to-line="jumpToLine" + on-toggle="onToggle" + event-tracking="eventTracking" + highlighted-line="highlightedLine" + show="show" ) - outline-pane( - is-tex-file="isTexFile" - outline="outline" - project-id="project_id" - jump-to-line="jumpToLine" - on-toggle="onToggle" - event-tracking="eventTracking" - highlighted-line="highlightedLine" - show="show" - ) - - documentation-button \ No newline at end of file diff --git a/services/web/frontend/stylesheets/app/editor/file-tree.less b/services/web/frontend/stylesheets/app/editor/file-tree.less index b40cac76c5..d6d928634e 100644 --- a/services/web/frontend/stylesheets/app/editor/file-tree.less +++ b/services/web/frontend/stylesheets/app/editor/file-tree.less @@ -14,10 +14,6 @@ background-color: @file-tree-bg; } -.resizable-side-bar { - flex-grow: 1; -} - .file-tree { display: flex !important; // To work around jQuery layout's inline styles flex-direction: column; diff --git a/services/web/frontend/stylesheets/app/editor/outline.less b/services/web/frontend/stylesheets/app/editor/outline.less index 715772abd8..53cd8fc921 100644 --- a/services/web/frontend/stylesheets/app/editor/outline.less +++ b/services/web/frontend/stylesheets/app/editor/outline.less @@ -15,11 +15,6 @@ opacity: 0.5; } -.documentation-link { - display: flex; - flex: 1; -} - .documentation-btn-container { .toolbar-small-mixin; .toolbar-alt-mixin;