Skip to content

Commit

Permalink
Améliorations UI suite au point design (#807)
Browse files Browse the repository at this point in the history
  • Loading branch information
mdulac authored Oct 28, 2020
1 parent 7cd1acb commit 9a3e8a8
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
8 changes: 3 additions & 5 deletions app/views/createApplication.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -120,12 +120,10 @@ <h5 class="title--addline">
</div>
<br>
<h5 class="title--addline">
Sujet de la demande
Sujet de la demande <span class="mdl-color-text--red-500">*</span>
</h5>

Résumer la nature du problème rencontré <span class="mdl-color-text--red-500">*</span>

<div class="single--display-flex single--align-items-center single--flex-wrap-wrap">
<div class="single--display-flex single--align-items-center single--flex-wrap-wrap single--margin-top--16px">
<div>
@helper.input(applicationForm("subject"),
"label" -> "Saisir le sujet de votre demande...",
Expand Down Expand Up @@ -182,7 +180,7 @@ <h5 class="title--addline">
Description du problème <span class="mdl-color-text--red-500">*</span>
</h5>

<div>
<div class="single--margin-top--16px">
@helper.input(applicationForm("description"), "class" -> "mdl-textfield--floating-label mdl-textfield--large", "label" -> "Rédigez une description rapide du problème ...") { (id, name, value, args) =>
<textarea class="mdl-textfield__input textfield__input--no-height-constraint" type="text" rows= "5" name="@name" id="@id" @toHtmlArgs(args)>@value</textarea>
}<br>
Expand Down
2 changes: 1 addition & 1 deletion app/views/helpers/usersInformationsInput.scala.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import _root_.helper.MDLForms._
@(infoField: play.api.data.Field, info: String)(implicit messagesProvider: MessagesProvider)

<div class="single--display-flex single--align-items-center single--flex-wrap-wrap">
<div class="single--display-flex single--align-items-center single--flex-wrap-wrap single--margin-top--8px">

<div>
@helper.input(infoField,
Expand Down
4 changes: 2 additions & 2 deletions app/views/showApplication.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
.application__message {
white-space: pre-line;
font-size: 16px;
font-weight: 600;
font-weight: 300;
line-height: 25px;
}

Expand Down Expand Up @@ -360,7 +360,7 @@ <h2 class="mdl-card__title-text">@application.subject</h2>
<div class="mdl-list__item">
<div class="mdl-list__item-primary-content">
@organisationIcon(answer.creatorUserName)
<span>@answer.creatorUserName</span>@if(currentUser.admin){ <span style="font-weight: bold; color:red" class="do-not-print"> <a href="@routes.UserController.editUser(answer.creatorUserID)"> Voir fiche utilisateur</a></span>}
<span class="single--font-weight-600">@answer.creatorUserName</span>@if(currentUser.admin){ <span style="font-weight: bold; color:red" class="do-not-print"> <a href="@routes.UserController.editUser(answer.creatorUserID)"> Voir fiche utilisateur</a></span>}
<span class="mdl-list__item-sub-title"></span>
</div>
<div class="mdl-list__item-secondary-content">
Expand Down
12 changes: 12 additions & 0 deletions public/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,14 @@ a {
margin-top: 8px;
}

.single--margin-top--8px {
margin-top: -8px;
}

.single--margin-top--16px {
margin-top: -16px;
}

.single--margin-top-10px {
margin-top: 10px;
}
Expand Down Expand Up @@ -725,6 +733,10 @@ a {
list-style-type: none;
}

.single--font-weight-600 {
font-weight: 600;
}


@media (max-width: 479px) {
.single--hidden-phone {
Expand Down

0 comments on commit 9a3e8a8

Please sign in to comment.