fix conflicts

AsyncPlanningPoker · Oct 28, 2021 · 60eb34a · 60eb34a
1 parent 59ca2aa
commit 60eb34a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 180 deletions.
diff --git a/src/app/modules/home/components/home.component.css b/src/app/modules/home/components/home.component.css
@@ -1,3 +1,7 @@
+#wrapper-container{
+  height: 100%;
+}
+
 #container{
     margin: 80px auto;
     width: 80%;

diff --git a/src/app/modules/home/components/home.component.html b/src/app/modules/home/components/home.component.html
@@ -1,7 +1,12 @@
-<app-navbar></app-navbar>
-<div id="container">
+<div
+  id="wrapper-container"
+  [ngClass]="{'dark-theme': isDarkTheme}"
+  class="mat-app-background">
+  <app-navbar [(isDarkTheme)]="isDarkTheme"></app-navbar>
+  <div id="container">
+
     <header>
-        <h4>Meus Pokers</h4>
+        <h4 class="ppa-title" >Meus Pokers</h4>
         <button
             id="button-create-poker"
             mat-raised-button
@@ -11,7 +16,7 @@ <h4>Meus Pokers</h4>
             Criar Pokers
         </button>
     </header>
-    
+
     <div id="content">
         <mat-accordion class="example-headers-align" multi>
             <mat-expansion-panel>
@@ -31,12 +36,12 @@ <h4>Meus Pokers</h4>
                       </div>
                     </mat-panel-description>
                 </mat-expansion-panel-header>
-          
+
                 <mat-form-field appearance="fill">
                     <mat-label>First name</mat-label>
                     <input matInput>
                 </mat-form-field>
-          
+
                 <mat-form-field appearance="fill">
                     <mat-label>Age</mat-label>
                     <input matInput type="number" min="1">

diff --git a/src/app/modules/home/home.module.ts b/src/app/modules/home/home.module.ts
@@ -5,8 +5,6 @@ import { HomeComponent } from './components/home.component';
 import { CreatePokerComponent } from './components/create-poker/create-poker.component';
 
 
-
-
 @NgModule({
   declarations: [
     HomeComponent,

diff --git a/src/app/modules/home/home/home.component.css b/src/app/modules/home/home/home.component.css
diff --git a/src/app/modules/home/home/home.component.html b/src/app/modules/home/home/home.component.html