diff --git a/angular.json b/angular.json index f69522a581dd2757374d557dbc331312fb51de3e..5c81dd9f1d1de3d4346b638d8e67c726432118ae 100644 --- a/angular.json +++ b/angular.json @@ -25,7 +25,8 @@ "styles": [ "src/assets/material-theme.scss", "src/assets/sass/general.scss", - "src/styles.css" + "src/styles.css", + "src/assets/fonts/material-icons/material-icons.css" ], "scripts": [ "./node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js", diff --git a/src/app/degree-planner/degree-planner.component.html b/src/app/degree-planner/degree-planner.component.html index 3cac54c00018aae5d153d4701077ff7b322fad77..35be2206fc4c29a2eb90f3ba9067c145ccbad303 100644 --- a/src/app/degree-planner/degree-planner.component.html +++ b/src/app/degree-planner/degree-planner.component.html @@ -25,7 +25,7 @@ <div fxLayout="column" fxLayoutGap="20px" fxLayoutAlign="start stretch" style="margin: 24px"> <mat-accordion> - <mat-expansion-panel *ngFor="let term of terms" class="year-container" [expanded]="true"> + <mat-expansion-panel *ngFor="let term of terms" class="year-container"> <!--[expanded]="true"--> <mat-expansion-panel-header> <mat-panel-title> {{ term.academicYear | academicYearState }} diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.scss b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.scss index 5e7e6a0128a16508bf0e62902a6d4044565cae2a..10eae8079afb778d99e877afbcb7485537960f62 100644 --- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.scss +++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.scss @@ -39,15 +39,13 @@ margin-top: 0px; border-top: 1px solid rgba(0, 0, 0, 0.54); li { - font-size: 15px; padding-bottom: 12px; position: relative; padding-left: 2.6em; .material-icons, .not-offered { - font-size: 19px; position: absolute; - left: 6px; - top: 0px; + left: 2px; + top: -2px; } } } diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.eot b/src/assets/fonts/material-icons/MaterialIcons-Regular.eot new file mode 100644 index 0000000000000000000000000000000000000000..70508ebabc9992e64f1314f866b2d7ab90438c58 Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.eot differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..7015564ad166a3e9d88c82f17829f0cc01ebe29a Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff new file mode 100644 index 0000000000000000000000000000000000000000..b648a3eea2d16b6ce783906d6b7d5f251b9eb56c Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff differ diff --git a/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..9fa211252080046a23b2449dbdced6abc2b0bb34 Binary files /dev/null and b/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 differ diff --git a/src/assets/fonts/material-icons/material-icons.css b/src/assets/fonts/material-icons/material-icons.css new file mode 100644 index 0000000000000000000000000000000000000000..c0e179f4db1daa7f9b6f641f9f9ecd31365e5581 --- /dev/null +++ b/src/assets/fonts/material-icons/material-icons.css @@ -0,0 +1,38 @@ + + @font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: url('./MaterialIcons-Regular.eot'); /* For IE6-8 */ + src: local('Material Icons'), + local('MaterialIcons-Regular'), + url('./MaterialIcons-Regular.woff2') format('woff2'), + url('./MaterialIcons-Regular.woff') format('woff'), + url('./MaterialIcons-Regular.ttf') format('truetype'); + } + + +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: 'liga'; +}