Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sib-materiel-intranet
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Remut
sib-materiel-intranet
Commits
58871830
Commit
58871830
authored
Jan 15, 2021
by
Marjolaine Le Bon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into 'master'
update: wording "don/vente" and * fields See merge request
!3
parents
eba3201b
5cb512f3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
new.pug
src/includes/new.pug
+2
-2
update.pug
src/includes/update.pug
+2
-2
_form.scss
src/styles/scss/_form.scss
+1
-1
No files found.
src/includes/new.pug
View file @
58871830
...
...
@@ -85,7 +85,7 @@ section#new(hidden, data-view="new")
multiple-contact-add-label="Ajouter une autre personne de contact"
multiple-contact-remove-label="Supprimer la personne de contact"
class-contact="deploy"
label-title="Nom du matériel"
label-title="Nom du matériel
*
"
widget-description="solid-form-textarea-label"
label-description="Description du matériel*"
widget-withdrawaldate="solid-form-date-label"
...
...
@@ -106,7 +106,7 @@ section#new(hidden, data-view="new")
label-modalite="Précisez ici les conditions particulières pour récupérer le matériel : dimensions du véhicule, poids important..."
widget-condition="solid-form-radio-label"
range-condition=`${serv}/matosconditions/`
label-condition="Le matériel est proposé :"
label-condition="Le matériel est proposé
en
:"
multiple-promotedvideo
widget-promotedvideo="multiple-promotedvideo-widget"
multiple-promotedvideo-add-label="Ajouter une vidéo"
...
...
src/includes/update.pug
View file @
58871830
...
...
@@ -15,7 +15,7 @@ section#update(hidden, data-view="update")
multiple-contact-add-label="Ajouter une autre personne de contact"
multiple-contact-remove-label="Supprimer la personne de contact"
class-contact="deploy"
label-title="Nom du matériel"
label-title="Nom du matériel
*
"
widget-description="solid-form-textarea-label"
label-description="Description du matériel*"
widget-withdrawaldate="solid-form-date-label"
...
...
@@ -36,7 +36,7 @@ section#update(hidden, data-view="update")
label-modalite="Précisez ici les conditions particulières pour récupérer le matériel : dimensions du véhicule, poids important..."
widget-condition="solid-form-radio-label"
range-condition=`${serv}/matosconditions/`
label-condition="Le matériel est proposé :"
label-condition="Le matériel est proposé
en
:"
multiple-promotedvideo
widget-promotedvideo="multiple-promotedvideo-widget"
multiple-promotedvideo-add-label="Ajouter une vidéo"
...
...
src/styles/scss/_form.scss
View file @
58871830
...
...
@@ -110,7 +110,7 @@
content
:
"Informations sur le matériel"
}
solid-set-default
[
name
=
"img"
]
::before
{
content
:
"Affiche ou photo du matériel"
;
content
:
"Affiche ou photo du matériel
*
"
;
}
[
name
=
"matoscondition"
]
::before
{
content
:
"Le matériel est proposé"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment