Skip to content

Commit 60eb34a

Browse files
author
jessiLeandro
committed
fix conflicts
1 parent 59ca2aa commit 60eb34a

File tree

5 files changed

+15
-180
lines changed

5 files changed

+15
-180
lines changed

src/app/modules/home/components/home.component.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#wrapper-container{
2+
height: 100%;
3+
}
4+
15
#container{
26
margin: 80px auto;
37
width: 80%;

src/app/modules/home/components/home.component.html

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
<app-navbar></app-navbar>
2-
<div id="container">
1+
<div
2+
id="wrapper-container"
3+
[ngClass]="{'dark-theme': isDarkTheme}"
4+
class="mat-app-background">
5+
<app-navbar [(isDarkTheme)]="isDarkTheme"></app-navbar>
6+
<div id="container">
7+
38
<header>
4-
<h4>Meus Pokers</h4>
9+
<h4 class="ppa-title" >Meus Pokers</h4>
510
<button
611
id="button-create-poker"
712
mat-raised-button
@@ -11,7 +16,7 @@ <h4>Meus Pokers</h4>
1116
Criar Pokers
1217
</button>
1318
</header>
14-
19+
1520
<div id="content">
1621
<mat-accordion class="example-headers-align" multi>
1722
<mat-expansion-panel>
@@ -31,12 +36,12 @@ <h4>Meus Pokers</h4>
3136
</div>
3237
</mat-panel-description>
3338
</mat-expansion-panel-header>
34-
39+
3540
<mat-form-field appearance="fill">
3641
<mat-label>First name</mat-label>
3742
<input matInput>
3843
</mat-form-field>
39-
44+
4045
<mat-form-field appearance="fill">
4146
<mat-label>Age</mat-label>
4247
<input matInput type="number" min="1">

src/app/modules/home/home.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import { HomeComponent } from './components/home.component';
55
import { CreatePokerComponent } from './components/create-poker/create-poker.component';
66

77

8-
9-
108
@NgModule({
119
declarations: [
1210
HomeComponent,

src/app/modules/home/home/home.component.css

Lines changed: 0 additions & 77 deletions
This file was deleted.

src/app/modules/home/home/home.component.html

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)