From 7fe098661db6a1f2fa98adaf2562e1f0f2a05f0e Mon Sep 17 00:00:00 2001
From: pnogal <paulina.nogal@wisc.edu>
Date: Fri, 26 Oct 2018 12:17:49 -0500
Subject: [PATCH] Fix markup after rebase
---
.../degree-planner.component.html | 20 +++----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/src/app/degree-planner/degree-planner.component.html b/src/app/degree-planner/degree-planner.component.html
index 7ee158f..12d5cc1 100644
--- a/src/app/degree-planner/degree-planner.component.html
+++ b/src/app/degree-planner/degree-planner.component.html
@@ -1,17 +1,3 @@
-<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 #sidenav position="end" mode="side" disableClose>
@@ -19,8 +5,8 @@
</mat-sidenav>
<mat-sidenav-content>
- <div fxLayout="row" fxLayout.sm="column" fxLayoutGap="20px" fxLayoutAlign="space-between center" style="margin: 24px 0px 24px 24px;">
- <div fxFlex="70">
+ <div fxLayout="row" fxLayout.sm="column" fxLayoutGap="20px" fxLayoutAlign="start center" style="margin: 24px 0px 24px 24px;">
+ <div>
<mat-form-field>
<mat-select placeholder="Degree Plans" [disableOptionCentering]=true [value]="selectedDegreePlan">
<mat-option *ngFor="let degreePlan of degreePlans" [value]="degreePlan.roadmapId">
@@ -29,7 +15,7 @@
</mat-select>
</mat-form-field>
</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()">
<i *ngIf="sidenav.opened" class="material-icons">chevron_right</i>
<i *ngIf="!sidenav.opened" class="material-icons">chevron_left</i>
--
GitLab