Skip to content

Commit

Permalink
fix(Step Tools): Node icons and tooltips do not appear (#1382)
Browse files Browse the repository at this point in the history
  • Loading branch information
breity authored Aug 7, 2023
1 parent d47e93a commit a31de10
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 34 deletions.
5 changes: 0 additions & 5 deletions src/assets/wise5/authoringTool/authoring-tool.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import './structure/structureAuthoringModule';
import { ProjectLibraryService } from '../services/projectLibraryService';
import { AuthoringToolComponent } from '../authoringTool/authoringToolComponent';
import { WiseAuthoringTinymceEditorComponent } from '../directives/wise-tinymce-editor/wise-authoring-tinymce-editor.component';
import { StepToolsComponent } from '../common/stepTools/step-tools.component';
import { ProjectListComponent } from './project-list/project-list.component';
import { AddProjectComponent } from './add-project/add-project.component';

Expand All @@ -35,10 +34,6 @@ export default angular
'addProjectComponent',
downgradeComponent({ component: AddProjectComponent }) as angular.IDirectiveFactory
)
.directive(
'stepTools',
downgradeComponent({ component: StepToolsComponent }) as angular.IDirectiveFactory
)
.directive(
'projectListComponent',
downgradeComponent({ component: ProjectListComponent }) as angular.IDirectiveFactory
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<mat-toolbar class="md-whiteframe-z1 toolbar">
<mat-toolbar class="mat-elevation-z1 toolbar">
<div class="toolbar__tools" fxLayout="row wrap" fxLayoutAlign="start center">
<button mat-icon-button aria-label="Authoring Tool Menu" i18n-aria-label (click)="toggleMenu()">
<mat-icon>menu</mat-icon>
</button>
<span *ngIf="!showStepTools" class="toolbar__title">{{ viewName }}</span>
<step-tools *ngIf="showStepTools"></step-tools>
<div fxFlex></div>
<span *ngIf="isJSONValid" class="green" fxLayoutAlign="start center">
<span *ngIf="isJSONValid" class="success" fxLayoutAlign="start center">
<mat-icon>done</mat-icon>
<span>JSON Valid</span></span
>
<span *ngIf="isJSONValid === false" class="red" fxLayoutAlign="start center">
<span *ngIf="isJSONValid === false" class="warn" fxLayoutAlign="start center">
<mat-icon>clear</mat-icon>
<span>JSON Invalid</span>
</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,13 @@

.toolbar__tools {
width: 100%;
padding: 0 4px;
}

.progress-spinner {
margin: 8px
}

.green {
color: green;
}

.red {
color: red;
}

.global-message {
margin-right: 20px
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<mat-toolbar class="md-whiteframe-1dp toolbar md-toolbar--wise" md-theme="light">
<mat-toolbar class="mat-elevation-z1 toolbar">
<div class="md-toolbar-tools toolbar__tools">
<button
mat-icon-button
aria-label="Main Menu"
i18n-aria-label
class="md-icon-button"
(click)="toggleMenu()"
matTooltip="Main Menu"
matTooltipPosition="below"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
}

.toolbar__tools {
padding-left: 4px;
padding: 0 4px;
}
2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/author.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/author.css.map

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions src/assets/wise5/themes/default/style/modules/_toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@
font-weight: 500;
}

.toolbar__tools {
padding-right: 8px;
}
[dir=rtl] .toolbar__tools {
padding-right: 16px;
padding-left: 8px;
}

.toolbar__nav, .md-button.toolbar__nav {
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/monitor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/monitor.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/vle.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/assets/wise5/themes/default/style/vle.css.map

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { FormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { MatButtonModule } from '@angular/material/button';
import { FlexLayoutModule } from '@angular/flex-layout';
import { MatTooltipModule } from '@angular/material/tooltip';
import { StudentTeacherCommonModule } from '../../../../../../app/student-teacher-common.module';

@NgModule({
declarations: [StepToolsComponent],
Expand All @@ -20,7 +22,9 @@ import { FlexLayoutModule } from '@angular/flex-layout';
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatSelectModule
MatSelectModule,
MatTooltipModule,
StudentTeacherCommonModule
]
})
export class StepToolsModule {}

0 comments on commit a31de10

Please sign in to comment.