Skip to content

Commit f4e8c16

Browse files
committed
Fix bug causing Notebook report and FAB button to scroll with page on unit plan. #2836
1 parent 520cdfb commit f4e8c16

1 file changed

Lines changed: 25 additions & 18 deletions

File tree

  • src/main/webapp/wise5/themes/default

src/main/webapp/wise5/themes/default/vle.html

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,30 @@
33
<link rel="stylesheet" href="/wise5/themes/default/style/vle.css" />
44
<style ng-bind-html="::vleController.projectStyle"></style>
55
<disable-delete-keypress>
6-
<listen-for-delete-keypress>
7-
<div class="app-styles" role="main" layout="column" layout-fill
8-
ng-controller="ThemeController as themeCtrl" ng-mousemove="themeCtrl.mouseMoved()"
9-
ng-class="::{'notebook-enabled': vleController.notebookEnabled}">
10-
<ng-include src="::vleController.themePath + '/templates/topbar.html'"></ng-include>
11-
<step-tools show-position="themeCtrl.numberProject"
12-
ng-if="themeCtrl.layoutState === 'node'"></step-tools>
13-
<md-content id="content" flex role="main" ui-scrollpoint-target
14-
ng-class="{'l-nav': themeCtrl.layoutState === 'nav', 'l-node': themeCtrl.layoutState === 'node'}" layout="column">
15-
<div id="nav" ng-include="::vleController.themePath + '/navigation/navigation.html'" ng-show="themeCtrl.layoutState === 'nav'"></div>
16-
<div ng-if="themeCtrl.isEndedAndLocked" style="color: red; display: flex; justify-content: center; align-items: center; height: 30px;">
17-
<span style="border: 1px solid black; border-radius: 3px; padding-left: 8px; padding-right: 8px; background-color: white;">{{ themeCtrl.endedAndLockedMessage }}</span>
18-
</div>
19-
<div id="node" ng-cloak ui-view="nodeView" ng-if="themeCtrl.layoutState === 'node'"></div>
20-
</md-content>
21-
<global-annotations></global-annotations>
22-
<notebook workgroup-id="::vleController.workgroupId"></notebook>
6+
<listen-for-delete-keypress>
7+
<div class="app-styles" role="main" layout="column" layout-fill
8+
ng-controller="ThemeController as themeCtrl" ng-mousemove="themeCtrl.mouseMoved()"
9+
ng-class="::{'notebook-enabled': vleController.notebookEnabled}"
10+
style="position: absolute;">
11+
<ng-include src="::vleController.themePath + '/templates/topbar.html'"></ng-include>
12+
<step-tools show-position="themeCtrl.numberProject" ng-if="themeCtrl.layoutState === 'node'">
13+
</step-tools>
14+
<md-content id="content" flex role="main" ui-scrollpoint-target
15+
ng-class="{'l-nav': themeCtrl.layoutState === 'nav', 'l-node': themeCtrl.layoutState === 'node'}"
16+
layout="column">
17+
<div id="nav" ng-include="::vleController.themePath + '/navigation/navigation.html'"
18+
ng-show="themeCtrl.layoutState === 'nav'"></div>
19+
<div ng-if="themeCtrl.isEndedAndLocked"
20+
style="color: red; display: flex; justify-content: center; align-items: center; height: 30px;">
21+
<span
22+
style="border: 1px solid black; border-radius: 3px; padding-left: 8px; padding-right: 8px; background-color: white;">{{
23+
themeCtrl.endedAndLockedMessage }}</span>
2324
</div>
24-
</listen-for-delete-keypress>
25+
<div id="node" ng-cloak ui-view="nodeView" ng-if="themeCtrl.layoutState === 'node'">
26+
</div>
27+
</md-content>
28+
<global-annotations></global-annotations>
29+
<notebook workgroup-id="::vleController.workgroupId"></notebook>
30+
</div>
31+
</listen-for-delete-keypress>
2532
</disable-delete-keypress>

0 commit comments

Comments
 (0)