From 4ce24d4072fd72be9e6e3296818117426b14a741 Mon Sep 17 00:00:00 2001
From: pnogal <paulina.nogal@wisc.edu>
Date: Thu, 25 Oct 2018 10:27:03 -0500
Subject: [PATCH] Add files with changes
---
src/app/shared/shared.module.ts | 11 ++++++++---
src/assets/material-theme.scss | 6 ++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index ccca945..189cdae 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,8 +1,9 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule, MatMenuModule, MatIconModule, MatTabsModule } from '@angular/material';
+import { MatButtonModule, MatMenuModule, MatIconModule, MatTabsModule, MatExpansionModule, MatCardModule } from '@angular/material';
import { FlexLayoutModule } from '@angular/flex-layout';
+import { TermContainerComponent } from '../degree-planner/term-container/term-container.component';
const modules = [
CommonModule,
@@ -12,12 +13,16 @@ const modules = [
MatMenuModule,
MatIconModule,
MatTabsModule,
+ MatExpansionModule,
+ MatCardModule,
FlexLayoutModule
];
@NgModule({
imports: [ modules ],
- exports: [ modules ],
- declarations: [ ]
+ exports: [ modules, TermContainerComponent ],
+ declarations: [
+ TermContainerComponent
+ ],
})
export class SharedModule { }
diff --git a/src/assets/material-theme.scss b/src/assets/material-theme.scss
index f52f883..e99ff52 100644
--- a/src/assets/material-theme.scss
+++ b/src/assets/material-theme.scss
@@ -112,4 +112,10 @@ $my-app-theme: mat-light-theme($my-app-primary, $my-app-accent, $my-app-warn);
// Since we're not using uw-style for buttons we need to add a few styles to mirror its appearance.
button {
text-transform: uppercase;
+}
+
+.btn-primary {
+ background-color: map-get($uw-primary, 500);
+ color: #fff;
+ font-weight: 400;
}
\ No newline at end of file
--
GitLab