Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sib-invoicing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Components
sib-invoicing
Commits
873db19b
Commit
873db19b
authored
3 years ago
by
Marjolaine Le Bon
Browse files
Options
Downloads
Patches
Plain Diff
update: solid-delete + integration
parent
fc698283
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!14
Dev
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
css/main.css
+26
-5
26 additions, 5 deletions
css/main.css
locales/en.json
+3
-1
3 additions, 1 deletion
locales/en.json
locales/fr.json
+3
-1
3 additions, 1 deletion
locales/fr.json
solid-invoicing.js
+9
-3
9 additions, 3 deletions
solid-invoicing.js
with
41 additions
and
10 deletions
css/main.css
+
26
−
5
View file @
873db19b
...
...
@@ -136,11 +136,6 @@
height
:
33px
;
padding
:
10px
15px
;
}
solid-delete
{
position
:
absolute
;
right
:
170px
;
bottom
:
35px
;
}
/* Header lists ============ */
.invoices-list
{
...
...
@@ -256,6 +251,10 @@ solid-delete {
display
:
block
;
text-align
:
center
;
}
.invoices-list
widget-embed-drive
embed
{
object-fit
:
contain
;
height
:
100%
;
}
/* Action menu =========================== */
[
name
=
"actions"
]
{
...
...
@@ -508,6 +507,28 @@ solid-delete {
background
:
white
;
color
:
var
(
--color-third
,
gray
);
}
.solid-invoicing
solid-delete
{
position
:
absolute
;
right
:
170px
;
bottom
:
35px
;
}
.solid-invoicing
solid-delete
dialog
{
position
:
fixed
;
top
:
30%
;
padding
:
35px
;
width
:
500px
;
max-width
:
100%
;
}
.solid-invoicing
solid-delete
dialog
p
{
color
:
var
(
--color-heading
)
!important
;
text-transform
:
none
!important
;
font-size
:
14px
;
margin-bottom
:
30px
;
}
.solid-invoicing
solid-delete
:hover
dialog
.cancel
{
color
:
var
(
--color-secondary
)
!important
;
}
/* Batches */
.invoice-form
widget-form-batches
{
...
...
This diff is collapsed.
Click to expand it.
locales/en.json
+
3
−
1
View file @
873db19b
...
...
@@ -52,5 +52,7 @@
"button.submit_form"
:
"Submit"
,
"button.edit_submit_form"
:
"Confirm"
,
"button.delete_submit_form"
:
"Delete"
,
"confirm.delete_invoice"
:
"Are you sure you want to delete this invoice ?"
"confirm.delete_invoice"
:
"Are you sure you want to delete this invoice ?"
,
"validate.delete_invoice"
:
"Delete"
,
"cancel.delete_invoice"
:
"Cancel"
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
locales/fr.json
+
3
−
1
View file @
873db19b
...
...
@@ -52,5 +52,7 @@
"button.submit_form"
:
"Envoyer"
,
"button.edit_submit_form"
:
"Valider"
,
"button.delete_submit_form"
:
"Supprimer"
,
"confirm.delete_invoice"
:
"Es-tu sûr de vouloir supprimer cette facture ?"
"confirm.delete_invoice"
:
"Es-tu sûr de vouloir supprimer cette facture ?"
,
"validate.delete_invoice"
:
"Supprimer"
,
"cancel.delete_invoice"
:
"Annuler"
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
solid-invoicing.js
+
9
−
3
View file @
873db19b
...
...
@@ -360,9 +360,14 @@ export class SolidInvoicing extends SolidTemplateElement {
<solid-delete class="sm-full button text-xsmall text-bold text-uppercase text-center color-secondary bordered icon icon-trash"
bind-resources
next="invoice-list"
confirmation-message="
${
this
.
localize
(
'
confirm.delete_invoice
'
)}
">
submit-button="
${
this
.
localize
(
'
button.delete_submit_form
'
)}
"
</solid-delete>
confirmation-message="
${
this
.
localize
(
'
confirm.delete_invoice
'
)}
"
confirmation-type="dialog"
confirmation-submit-text="
${
this
.
localize
(
'
validate.delete_invoice
'
)}
"
confirmation-cancel-text="
${
this
.
localize
(
'
cancel.delete_invoice
'
)}
"
confirmation-submit-class="segment sm-full button text-xsmall text-bold reversed text-uppercase text-center color-secondary bordered"
confirmation-cancel-class="cancel segment sm-full button text-xsmall text-bold text-uppercase text-center color-secondary bordered"
data-label="
${
this
.
localize
(
'
button.delete_submit_form
'
)}
"
></solid-delete>
</dialog>
<dialog data-view="duplicate-invoice" class="invoice-form" id="duplicate">
...
...
@@ -451,6 +456,7 @@ export class SolidInvoicing extends SolidTemplateElement {
widget-tvaAmount="widget-money"
widget-ttcAmount="widget-money"
widget-tvaRate="widget-tva-rate"
class-project.customer.name="segment block whitespace-normal text-color-heading text-bold margin-bottom-xsmall"
></solid-display>
<div class="invoice-render__footer">
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment