Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
41443430
Commit
41443430
authored
Aug 20, 2021
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address UX Feedback
- Table cells should have a minimum width - Dropdown accessibility improvements
parent
985320fa
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
9 deletions
+30
-9
app/assets/javascripts/content_editor/components/wrappers/table_cell.vue
...scripts/content_editor/components/wrappers/table_cell.vue
+21
-8
app/assets/stylesheets/utilities.scss
app/assets/stylesheets/utilities.scss
+6
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/assets/javascripts/content_editor/components/wrappers/table_cell.vue
View file @
41443430
...
...
@@ -2,6 +2,7 @@
import
{
GlDropdown
,
GlDropdownItem
,
GlDropdownDivider
}
from
'
@gitlab/ui
'
;
import
{
NodeViewWrapper
,
NodeViewContent
}
from
'
@tiptap/vue-2
'
;
import
{
selectedRect
as
getSelectedRect
}
from
'
prosemirror-tables
'
;
import
{
__
}
from
'
~/locale
'
;
export
default
{
name
:
'
TableCellWrapper
'
,
...
...
@@ -69,10 +70,20 @@ export default {
this
.
$refs
.
dropdown
?.
hide
();
},
},
i18n
:
{
insertColumnBefore
:
__
(
'
Insert column before
'
),
insertColumnAfter
:
__
(
'
Insert column after
'
),
insertRowBefore
:
__
(
'
Insert row before
'
),
insertRowAfter
:
__
(
'
Insert row after
'
),
deleteRow
:
__
(
'
Delete row
'
),
deleteColumn
:
__
(
'
Delete column
'
),
deleteTable
:
__
(
'
Delete table
'
),
editTableActions
:
__
(
'
Edit table
'
),
},
};
</
script
>
<
template
>
<node-view-wrapper
class=
"gl-relative gl-padding-5"
as=
"td"
@
click=
"hideDropdown"
>
<node-view-wrapper
class=
"gl-relative gl-padding-5
gl-min-w-10
"
as=
"td"
@
click=
"hideDropdown"
>
<span
v-if=
"displayActionsDropdown"
class=
"gl-absolute gl-right-0 gl-top-0"
>
<gl-dropdown
ref=
"dropdown"
...
...
@@ -82,30 +93,32 @@ export default {
category=
"tertiary"
boundary=
"viewport"
no-caret
text-sr-only
:text=
"$options.i18n.editTableActions"
:popper-opts=
"
{ positionFixed: true }"
@hide="handleHide($event)"
>
<gl-dropdown-item
@
click=
"runCommand('addColumnBefore')"
>
{{
__
(
'
Insert column before
'
)
}}
{{
$options
.
i18n
.
insertColumnBefore
}}
</gl-dropdown-item>
<gl-dropdown-item
@
click=
"runCommand('addColumnAfter')"
>
{{
__
(
'
Insert column after
'
)
}}
{{
$options
.
i18n
.
insertColumnAfter
}}
</gl-dropdown-item>
<gl-dropdown-item
@
click=
"runCommand('addRowBefore')"
>
{{
__
(
'
Insert row before
'
)
}}
{{
$options
.
i18n
.
insertRowBefore
}}
</gl-dropdown-item>
<gl-dropdown-item
@
click=
"runCommand('addRowAfter')"
>
{{
__
(
'
Insert row after
'
)
}}
{{
$options
.
i18n
.
insertRowAfter
}}
</gl-dropdown-item>
<gl-dropdown-divider
/>
<gl-dropdown-item
v-if=
"totalRows > 2"
@
click=
"runCommand('deleteRow')"
>
{{
__
(
'
Delete row
'
)
}}
{{
$options
.
i18n
.
deleteRow
}}
</gl-dropdown-item>
<gl-dropdown-item
v-if=
"totalCols > 1"
@
click=
"runCommand('deleteColumn')"
>
{{
__
(
'
Delete column
'
)
}}
{{
$options
.
i18n
.
deleteColumn
}}
</gl-dropdown-item>
<gl-dropdown-item
@
click=
"runCommand('deleteTable')"
>
{{
__
(
'
Delete table
'
)
}}
{{
$options
.
i18n
.
deleteTable
}}
</gl-dropdown-item>
</gl-dropdown>
</span>
...
...
app/assets/stylesheets/utilities.scss
View file @
41443430
...
...
@@ -245,11 +245,16 @@ $gl-line-height-42: px-to-rem(42px);
width
:
$grid-size
*
28
;
}
// Will be
moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1491
// Will be
removed after https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2347 is merged
.gl-min-w-8
{
min-width
:
$gl-spacing-scale-8
;
}
// Will be removed after https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2347 is merged
.gl-min-w-10
{
min-width
:
$gl-spacing-scale-10
;
}
// Will both be moved to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1526
.gl-opacity-6
{
opacity
:
0
.6
;
...
...
locale/gitlab.pot
View file @
41443430
...
...
@@ -12140,6 +12140,9 @@ msgstr ""
msgid "Edit sidebar"
msgstr ""
msgid "Edit table"
msgstr ""
msgid "Edit this file only."
msgstr ""
...
...
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