Styles & readded router to fix unexplainable problem... :/

hexcodech · Sep 3, 2018 · 3fb2572 · 3fb2572
1 parent 2f1160a
commit 3fb2572
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/frontend-app/src/app/app.component.html b/frontend-app/src/app/app.component.html
@@ -6,4 +6,4 @@
     </ngb-progressbar>
 </div>
 
-<app-home *ngIf="!mqttConnecting"></app-home>
+<router-outlet *ngIf="!mqttConnecting"></router-outlet>
diff --git a/frontend-app/src/app/app.module.ts b/frontend-app/src/app/app.module.ts
@@ -7,6 +7,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { NgbModule, NgbDropdown, NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { DndModule } from 'ngx-drag-drop';
+import { RouterModule } from '@angular/router';
 
 import { AppComponent } from './app.component';
 import { HomeComponent } from './home/home.component';
@@ -39,6 +40,9 @@ library.add(faPlay, faPause, faStop, faCheckCircle, faTimesCircle, faVolumeUp);
     FormsModule,
     FontAwesomeModule,
     NgbModule.forRoot(),
+    RouterModule.forRoot([
+      { path: '', component: HomeComponent }
+    ]),
     DndModule
   ],
   providers: [

diff --git a/frontend-app/src/app/media/media.component.scss b/frontend-app/src/app/media/media.component.scss
@@ -1,3 +1,8 @@
 /deep/ ngb-accordion .card-header {
     padding: 0.2rem 1.25rem;
+}
+
+/deep/ ngb-accordion .card {
+    margin-bottom: 1rem;
+    border-radius: 0.25rem !important;
 }
diff --git a/frontend-app/src/styles.scss b/frontend-app/src/styles.scss
@@ -1,4 +1,10 @@
 /* You can add global styles to this file, and also import other style files */
+$container-max-widths: (
+  sm: 95%,
+  md: 95%,
+  lg: 95%,
+  xl: 95%
+);
 @import '~bootstrap/scss/bootstrap';
 
 .media {