tykayn/funky-framadate-front
1
1
Fork 1
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git synced 2023-08-25 13:53:14 +02:00
Code Issues Projects Releases Wiki Activity

Resolution du conflit

Browse Source
This commit is contained in:
MarguoNana 2019-10-25 14:17:13 +02:00
commit 985be95b0d
12 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/debugger/debugger.component.html
View File

@ -1,5 +1,4 @@
<div class="well debug"> <div class="well debug">
<strong> <strong>
<h2 i18n> <h2 i18n>
infos de debug infos de debug

7
src/app/pages/home/home.component.html
View File

@ -1,5 +1,4 @@
<div class="description"> <div class="description">
<router-outlet></router-outlet> <router-outlet></router-outlet>
<h1 i18n> <h1 i18n>
{{"creation.title"|translate}} {{"creation.title"|translate}}
@ -23,8 +22,10 @@
{{"creation.kind.classic"|translate}} {{"creation.kind.classic"|translate}}
</option> </option>
</select> </select>
<span class="post-selector"> <span class="post-selector">
</span> </span>
<div> <div>
<label <label
@ -41,8 +42,8 @@
placeholder="titre" placeholder="titre"
[(ngModel)]="config.title" [(ngModel)]="config.title"
> >
</div> </div>
<div> <div>
<label for="my_name"> <label for="my_name">
{{"creation.name"|translate}} : {{"creation.name"|translate}} :
@ -55,6 +56,7 @@
[(ngModel)]="config.myName" [(ngModel)]="config.myName"
> >
</div> </div>
<div> <div>
<label <label
for="poll_description" for="poll_description"
@ -71,7 +73,6 @@
cols="50" cols="50"
lines="5" lines="5"
></textarea> ></textarea>
</div> </div>
<a <a