diff options
author | Max <max@nextcloud.com> | 2022-03-22 11:49:03 +0300 |
---|---|---|
committer | Max <max@nextcloud.com> | 2022-03-31 15:29:25 +0300 |
commit | 2e0440ec30f9ee82b9abcd8fc563884cd40e4c38 (patch) | |
tree | d2e9d2dba089cd2953618c025b78e4d798cdb900 | |
parent | 3491ccb97fa59b1afd1c0bbb5a6e804af6e77fc0 (diff) |
ui: translate table actions, new icons
Signed-off-by: Max <max@nextcloud.com>
-rw-r--r-- | css/icons.scss | 2 | ||||
-rw-r--r-- | img/add_col_after.svg | 2 | ||||
-rw-r--r-- | img/add_col_before.svg | 2 | ||||
-rw-r--r-- | img/add_row_after.svg | 2 | ||||
-rw-r--r-- | img/add_row_before.svg | 2 | ||||
-rw-r--r-- | img/delete_col.svg | 2 | ||||
-rw-r--r-- | img/delete_row.svg | 2 | ||||
-rw-r--r-- | src/components/EditorWrapper.vue | 1 | ||||
-rw-r--r-- | src/nodes/TableCellView.vue | 11 | ||||
-rw-r--r-- | src/nodes/TableHeaderView.vue | 11 |
10 files changed, 22 insertions, 15 deletions
diff --git a/css/icons.scss b/css/icons.scss index 626d1650d..db6b3c7b3 100644 --- a/css/icons.scss +++ b/css/icons.scss @@ -28,3 +28,5 @@ @include icon-black-white('add_col_after', 'text', 1); @include icon-black-white('add_row_before', 'text', 1); @include icon-black-white('add_row_after', 'text', 1); +@include icon-black-white('delete_col', 'text', 1); +@include icon-black-white('delete_row', 'text', 1); diff --git a/img/add_col_after.svg b/img/add_col_after.svg index df986b98e..ebee59590 100644 --- a/img/add_col_after.svg +++ b/img/add_col_after.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 14c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm2.5 5.9375c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-1.25c-0.17259 0-0.3125-0.13991-0.3125-0.3125v-1.25c0-0.51777-0.41973-0.9375-0.9375-0.9375s-0.9375 0.41973-0.9375 0.9375v1.25c0 0.17259-0.13991 0.3125-0.3125 0.3125h-1.25c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375h1.25c0.17259 0 0.3125 0.13991 0.3125 0.3125v1.25c0 0.51777 0.41973 0.9375 0.9375 0.9375s0.9375-0.41973 0.9375-0.9375v-1.25c0-0.17259 0.13991-0.3125 0.3125-0.3125h1.25zm8.5-0.9375c0 1.6569 1.3431 3 3 3s3-1.3431 3-3v-14c0-1.6569-1.3431-3-3-3s-3 1.3431-3 3v14zm-2 0v-14c0-2.7614 2.2386-5 5-5s5 2.2386 5 5v14c0 2.7614-2.2386 5-5 5s-5-2.2386-5-5z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M11,2A2,2 0 0,1 13,4V20A2,2 0 0,1 11,22H2V2H11M4,10V14H11V10H4M4,16V20H11V16H4M4,4V8H11V4H4M15,11H18V8H20V11H23V13H20V16H18V13H15V11Z" /></svg>
\ No newline at end of file diff --git a/img/add_col_before.svg b/img/add_col_before.svg index a9011ef14..91b3496c7 100644 --- a/img/add_col_before.svg +++ b/img/add_col_before.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m19 14c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm2.5 5.9375c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-1.25c-0.17259 0-0.3125-0.13991-0.3125-0.3125v-1.25c0-0.51777-0.41973-0.9375-0.9375-0.9375s-0.9375 0.41973-0.9375 0.9375v1.25c0 0.17259-0.13991 0.3125-0.3125 0.3125h-1.25c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375h1.25c0.17259 0 0.3125 0.13991 0.3125 0.3125v1.25c0 0.51777 0.41973 0.9375 0.9375 0.9375s0.9375-0.41973 0.9375-0.9375v-1.25c0-0.17259 0.13991-0.3125 0.3125-0.3125h1.25zm-19.5-0.9375c0 1.6569 1.3431 3 3 3s3-1.3431 3-3v-14c0-1.6569-1.3431-3-3-3s-3 1.3431-3 3v14zm-2 0 8.5725e-16 -14c-7.1909e-16 -2.7614 2.2386-5 5-5s5 2.2386 5 5v14c0 2.7614-2.2386 5-5 5s-5-2.2386-5-5z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M13,2A2,2 0 0,0 11,4V20A2,2 0 0,0 13,22H22V2H13M20,10V14H13V10H20M20,16V20H13V16H20M20,4V8H13V4H20M9,11H6V8H4V11H1V13H4V16H6V13H9V11Z" /></svg>
\ No newline at end of file diff --git a/img/add_row_after.svg b/img/add_row_after.svg index 8104d8673..782a4044a 100644 --- a/img/add_row_after.svg +++ b/img/add_row_after.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m19 0c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm2.5 5.9375c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-1.25c-0.17259 0-0.3125-0.13991-0.3125-0.3125v-1.25c0-0.51777-0.41973-0.9375-0.9375-0.9375s-0.9375 0.41973-0.9375 0.9375v1.25c0 0.17259-0.13991 0.3125-0.3125 0.3125h-1.25c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375h1.25c0.17259 0 0.3125 0.13991 0.3125 0.3125v1.25c0 0.51777 0.41973 0.9375 0.9375 0.9375s0.9375-0.41973 0.9375-0.9375v-1.25c0-0.17259 0.13991-0.3125 0.3125-0.3125h1.25zm-16.5 10.062c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3h14c1.6569 0 3-1.3431 3-3s-1.3431-3-3-3h-14zm0-2h14c2.7614 0 5 2.2386 5 5s-2.2386 5-5 5h-14c-2.7614 0-5-2.2386-5-5-1.2264e-15 -2.7614 2.2386-5 5-5z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M22,10A2,2 0 0,1 20,12H4A2,2 0 0,1 2,10V3H4V5H8V3H10V5H14V3H16V5H20V3H22V10M4,10H8V7H4V10M10,10H14V7H10V10M20,10V7H16V10H20M11,14H13V17H16V19H13V22H11V19H8V17H11V14Z" /></svg>
\ No newline at end of file diff --git a/img/add_row_before.svg b/img/add_row_before.svg index 0d2a68e42..c7821b9a9 100644 --- a/img/add_row_before.svg +++ b/img/add_row_before.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m19 14c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm2.5 5.9375c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-1.25c-0.17259 0-0.3125-0.13991-0.3125-0.3125v-1.25c0-0.51777-0.41973-0.9375-0.9375-0.9375s-0.9375 0.41973-0.9375 0.9375v1.25c0 0.17259-0.13991 0.3125-0.3125 0.3125h-1.25c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375h1.25c0.17259 0 0.3125 0.13991 0.3125 0.3125v1.25c0 0.51777 0.41973 0.9375 0.9375 0.9375s0.9375-0.41973 0.9375-0.9375v-1.25c0-0.17259 0.13991-0.3125 0.3125-0.3125h1.25zm-16.5-17.938c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3h14c1.6569 0 3-1.3431 3-3s-1.3431-3-3-3h-14zm0-2h14c2.7614-5.0727e-16 5 2.2386 5 5s-2.2386 5-5 5h-14c-2.7614 0-5-2.2386-5-5-1.2264e-15 -2.7614 2.2386-5 5-5z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M22,14A2,2 0 0,0 20,12H4A2,2 0 0,0 2,14V21H4V19H8V21H10V19H14V21H16V19H20V21H22V14M4,14H8V17H4V14M10,14H14V17H10V14M20,14V17H16V14H20M11,10H13V7H16V5H13V2H11V5H8V7H11V10Z" /></svg>
\ No newline at end of file diff --git a/img/delete_col.svg b/img/delete_col.svg index a68b35683..70c46a083 100644 --- a/img/delete_col.svg +++ b/img/delete_col.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m12.641 21.931c0.29444 0.63765 0.68198 1.2235 1.1452 1.7401-0.55482 0.21233-1.1571 0.32865-1.7866 0.32865-2.7614 0-5-2.2386-5-5v-14c0-2.7614 2.2386-5 5-5s5 2.2386 5 5v7.2899c-0.72243 0.21501-1.396 0.5435-2 0.96481v-8.2547c0-1.6569-1.3431-3-3-3s-3 1.3431-3 3v14c0 1.6569 1.3431 3 3 3 0.22016 0 0.43478-0.023715 0.64144-0.068729zm6.3586-7.9313c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm-2.5 5.9375h5c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-5c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M4,2H11A2,2 0 0,1 13,4V20A2,2 0 0,1 11,22H4A2,2 0 0,1 2,20V4A2,2 0 0,1 4,2M4,10V14H11V10H4M4,16V20H11V16H4M4,4V8H11V4H4M17.59,12L15,9.41L16.41,8L19,10.59L21.59,8L23,9.41L20.41,12L23,14.59L21.59,16L19,13.41L16.41,16L15,14.59L17.59,12Z" /></svg>
\ No newline at end of file diff --git a/img/delete_row.svg b/img/delete_row.svg index 537c3195a..ce66d104d 100644 --- a/img/delete_row.svg +++ b/img/delete_row.svg @@ -1 +1 @@ -<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m13.255 15c-0.42131 0.60401-0.7498 1.2776-0.96481 2h-7.2899c-2.7614 0-5-2.2386-5-5-1.2264e-15 -2.7614 2.2386-5 5-5h14c2.7614 0 5 2.2386 5 5 0 0.62948-0.11632 1.2318-0.32865 1.7866-0.5166-0.4632-1.1024-0.85073-1.7401-1.1452 0.045014-0.20666 0.068729-0.42128 0.068729-0.64144 0-1.6569-1.3431-3-3-3h-14c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3h8.2547zm5.7453-1c2.7601 0.0033061 4.9967 2.2399 5 5 0 2.7614-2.2386 5-5 5s-5-2.2386-5-5 2.2386-5 5-5zm-2.5 5.9375h5c0.51777 0 0.9375-0.41973 0.9375-0.9375s-0.41973-0.9375-0.9375-0.9375h-5c-0.51777 0-0.9375 0.41973-0.9375 0.9375s0.41973 0.9375 0.9375 0.9375z"/></svg> +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M9.41,13L12,15.59L14.59,13L16,14.41L13.41,17L16,19.59L14.59,21L12,18.41L9.41,21L8,19.59L10.59,17L8,14.41L9.41,13M22,9A2,2 0 0,1 20,11H4A2,2 0 0,1 2,9V6A2,2 0 0,1 4,4H20A2,2 0 0,1 22,6V9M4,9H8V6H4V9M10,9H14V6H10V9M16,9H20V6H16V9Z" /></svg>
\ No newline at end of file diff --git a/src/components/EditorWrapper.vue b/src/components/EditorWrapper.vue index 069646f37..de3071080 100644 --- a/src/components/EditorWrapper.vue +++ b/src/components/EditorWrapper.vue @@ -649,7 +649,6 @@ export default { &:not(.show-color-annotations)::v-deep .author-annotation, &:not(.show-color-annotations)::v-deep .image { background-color: transparent !important; - color: var(--color-main-text) !important; } .ProseMirror { diff --git a/src/nodes/TableCellView.vue b/src/nodes/TableCellView.vue index 1eb62a1e1..4e82955d5 100644 --- a/src/nodes/TableCellView.vue +++ b/src/nodes/TableCellView.vue @@ -28,17 +28,17 @@ <ActionButton icon="icon-add_row_before" :close-after-click="true" @click="addRowBefore"> - Add new row before this + {{ t('text', 'Add row before') }} </ActionButton> <ActionButton icon="icon-add_row_after" :close-after-click="true" @click="addRowAfter"> - Add new row after this + {{ t('text', 'Add row after') }} </ActionButton> - <ActionButton icon="icon-delete" + <ActionButton icon="icon-delete_row" :close-after-click="true" @click="deleteRow"> - Remove this row + {{ t('text', 'Delete this row') }} </ActionButton> </Actions> </div> @@ -68,6 +68,9 @@ export default { required: true, }, }, + computed: { + t: () => window.t, + }, methods: { deleteRow() { this.editor.chain() diff --git a/src/nodes/TableHeaderView.vue b/src/nodes/TableHeaderView.vue index e14fa2b38..5fe168a65 100644 --- a/src/nodes/TableHeaderView.vue +++ b/src/nodes/TableHeaderView.vue @@ -28,17 +28,17 @@ <ActionButton icon="icon-add_col_before" :close-after-click="true" @click="addColumnBefore"> - Add new column before this + {{ t('text', 'Add column before') }} </ActionButton> <ActionButton icon="icon-add_col_after" :close-after-click="true" @click="addColumnAfter"> - Add new column after this + {{ t('text', 'Add column after') }} </ActionButton> - <ActionButton icon="icon-delete" + <ActionButton icon="icon-delete_col" :close-after-click="true" @click="deleteColumn"> - Remove this column + {{ t('text', 'Delete this column') }} </ActionButton> </Actions> </div> @@ -68,6 +68,9 @@ export default { required: true, }, }, + computed: { + t: () => window.t, + }, methods: { deleteColumn() { this.editor.chain() |