diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2f51ec2e..50301b68 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -28,6 +28,7 @@ import { VotingGraphComponent } from './pages/voting-graph/voting-graph.componen import { VotingChoiceComponent } from './pages/voting-choice/voting-choice.component'; import { PasswordComponent } from './pages/password/password.component'; import { HomeComponent } from './pages/home/home.component'; +import { VoteChoiceComponent } from './vote-choice/vote-choice.component'; registerLocaleData(localeFr, 'fr'); @@ -52,6 +53,7 @@ registerLocaleData(localeFr, 'fr'); VotingChoiceComponent, PasswordComponent, HomeComponent, + VoteChoiceComponent, ], imports: [ diff --git a/src/app/pages/kind/kind.component.html b/src/app/pages/kind/kind.component.html index 3fa54208..a826fdb7 100644 --- a/src/app/pages/kind/kind.component.html +++ b/src/app/pages/kind/kind.component.html @@ -142,7 +142,7 @@

Molecules

- +

Useful classes

diff --git a/src/app/vote-choice/vote-choice.component.html b/src/app/vote-choice/vote-choice.component.html new file mode 100644 index 00000000..455badb7 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.html @@ -0,0 +1,15 @@ +
+
+

Jeudi 17 aout

+

08:00

+
+
+

14

+

76

+
+
+ + + +
+
diff --git a/src/app/vote-choice/vote-choice.component.scss b/src/app/vote-choice/vote-choice.component.scss new file mode 100644 index 00000000..e66ca3a5 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.scss @@ -0,0 +1,5 @@ +.choice_container{ + width:320px; + height:172px; + box-shadow: 0 3px 6px 0 rgba(black, 0.2); +} diff --git a/src/app/vote-choice/vote-choice.component.spec.ts b/src/app/vote-choice/vote-choice.component.spec.ts new file mode 100644 index 00000000..f24b9070 --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { VoteChoiceComponent } from './vote-choice.component'; + +describe('VoteChoiceComponent', () => { + let component: VoteChoiceComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ VoteChoiceComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(VoteChoiceComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/vote-choice/vote-choice.component.ts b/src/app/vote-choice/vote-choice.component.ts new file mode 100644 index 00000000..32b684dc --- /dev/null +++ b/src/app/vote-choice/vote-choice.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'framadate-vote-choice', + templateUrl: './vote-choice.component.html', + styleUrls: ['./vote-choice.component.scss'] +}) +export class VoteChoiceComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/assets/img/check-2.svg b/src/assets/img/check-2.svg new file mode 100644 index 00000000..2fd97ed2 --- /dev/null +++ b/src/assets/img/check-2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/img/check.svg b/src/assets/img/check.svg new file mode 100644 index 00000000..52234938 --- /dev/null +++ b/src/assets/img/check.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/croix.svg b/src/assets/img/croix.svg new file mode 100644 index 00000000..1c398859 --- /dev/null +++ b/src/assets/img/croix.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/votant-pas-sur.svg b/src/assets/img/votant-pas-sur.svg new file mode 100644 index 00000000..f8d8ade1 --- /dev/null +++ b/src/assets/img/votant-pas-sur.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/assets/img/votant-sur.svg b/src/assets/img/votant-sur.svg new file mode 100644 index 00000000..3d97906e --- /dev/null +++ b/src/assets/img/votant-sur.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 9b1e2dfd..ae263ce9 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -10,6 +10,7 @@ $dark-lavender: #7d6c99; $dusty-orange: #f18647; $violet: #bd10e0; $red: #cd0000; +$cool-grey: #aeafb1; // interpretations in app $primary_color: $ugly-purple; @@ -17,6 +18,7 @@ $secondary_color: $lavender-pink; $font_color: $black; $logo_color: $dark-lavender; $logo_color_2: $camo; +$choice_select_border_color: $cool-grey; // FONT $default_font : "pt_sans";