Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

0310e7a9

Commit 0310e7a9 authored 4 years ago by Jérémie BRISON

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feat/hour-picker' into fix/formDesign-createStructure

parents fa17130b c61a63e3

Branches

Tags

4 merge requests!68Recette,!67Dev,!66Fix/form design create structure,!60WIP: Feat/hour picker

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/app/form/form.component.html 3 additions, 2 deletions

src/app/form/form.component.html
src/app/form/form.component.ts 1 addition, 1 deletion

src/app/form/form.component.ts
src/app/shared/components/hour-picker/copy-paste/copy-paste.component.html 13 additions, 0 deletions

...mponents/hour-picker/copy-paste/copy-paste.component.html
src/app/shared/components/hour-picker/copy-paste/copy-paste.component.scss 13 additions, 0 deletions

...mponents/hour-picker/copy-paste/copy-paste.component.scss
src/app/shared/components/hour-picker/copy-paste/copy-paste.component.spec.ts 25 additions, 0 deletions

...nents/hour-picker/copy-paste/copy-paste.component.spec.ts
src/app/shared/components/hour-picker/copy-paste/copy-paste.component.ts 30 additions, 0 deletions

...components/hour-picker/copy-paste/copy-paste.component.ts
src/app/shared/components/hour-picker/hour-picker.component.html 152 additions, 0 deletions

.../shared/components/hour-picker/hour-picker.component.html
src/app/shared/components/hour-picker/hour-picker.component.scss 112 additions, 0 deletions

.../shared/components/hour-picker/hour-picker.component.scss
src/app/shared/components/hour-picker/hour-picker.component.spec.ts 25 additions, 0 deletions

...ared/components/hour-picker/hour-picker.component.spec.ts
src/app/shared/components/hour-picker/hour-picker.component.ts 311 additions, 0 deletions

...pp/shared/components/hour-picker/hour-picker.component.ts
src/app/shared/components/index.ts 7 additions, 0 deletions

src/app/shared/components/index.ts
src/app/shared/shared.module.ts 5 additions, 1 deletion

src/app/shared/shared.module.ts
src/assets/ico/sprite.svg 30 additions, 0 deletions

src/assets/ico/sprite.svg
src/assets/scss/_inputs.scss 51 additions, 0 deletions

src/assets/scss/_inputs.scss
src/assets/scss/_typography.scss 14 additions, 12 deletions

src/assets/scss/_typography.scss

with 792 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment