Skip to content
Snippets Groups Projects
Commit 7fe09866 authored by pnogal's avatar pnogal
Browse files

Fix markup after rebase

parent b2804abc
No related branches found
No related tags found
No related merge requests found
<div fxLayout="row" fxLayout.sm="column" fxLayoutGap="20px" fxLayoutAlign="space-between" style="margin: 24px">
<mat-form-field>
<mat-select placeholder="Degree Plans" [disableOptionCentering]=true [value]="selectedDegreePlan">
<mat-option *ngFor="let degreePlan of degreePlans" [value]="degreePlan.roadmapId">
{{degreePlan.name}}
</mat-option>
</mat-select>
</mat-form-field>
<button mat-button class="btn-primary">Check Plan (DARS)</button>
</div>
<div fxLayout="column" fxLayoutGap="20px" fxLayoutAlign="start stretch" style="margin: 24px">
<mat-sidenav-container id="plans-container"> <mat-sidenav-container id="plans-container">
<mat-sidenav #sidenav position="end" mode="side" disableClose> <mat-sidenav #sidenav position="end" mode="side" disableClose>
...@@ -19,8 +5,8 @@ ...@@ -19,8 +5,8 @@
</mat-sidenav> </mat-sidenav>
<mat-sidenav-content> <mat-sidenav-content>
<div fxLayout="row" fxLayout.sm="column" fxLayoutGap="20px" fxLayoutAlign="space-between center" style="margin: 24px 0px 24px 24px;"> <div fxLayout="row" fxLayout.sm="column" fxLayoutGap="20px" fxLayoutAlign="start center" style="margin: 24px 0px 24px 24px;">
<div fxFlex="70"> <div>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Degree Plans" [disableOptionCentering]=true [value]="selectedDegreePlan"> <mat-select placeholder="Degree Plans" [disableOptionCentering]=true [value]="selectedDegreePlan">
<mat-option *ngFor="let degreePlan of degreePlans" [value]="degreePlan.roadmapId"> <mat-option *ngFor="let degreePlan of degreePlans" [value]="degreePlan.roadmapId">
...@@ -29,7 +15,7 @@ ...@@ -29,7 +15,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div fxFlex="20"><button mat-button class="btn-primary">Check Plan (DARS)</button></div> <button mat-button class="btn-primary">Check Plan (DARS)</button>
<button id="menu-toggle-btn" mat-button (click)="sidenav.toggle()"> <button id="menu-toggle-btn" mat-button (click)="sidenav.toggle()">
<i *ngIf="sidenav.opened" class="material-icons">chevron_right</i> <i *ngIf="sidenav.opened" class="material-icons">chevron_right</i>
<i *ngIf="!sidenav.opened" class="material-icons">chevron_left</i> <i *ngIf="!sidenav.opened" class="material-icons">chevron_left</i>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment