Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/2267 table tweaks #2289

Merged
merged 2 commits into from
Apr 11, 2022
Merged

Fix/2267 table tweaks #2289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2df7c7a
fix: clear float after table
max-nextcloud Apr 11, 2022
1c3d0d8
fix: only show table actions if editing is allowed
max-nextcloud Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/editor.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/nodes/TableCellView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<NodeViewWrapper as="td">
<div class="container">
<NodeViewContent class="content" />
<Actions>
<Actions v-if="editor.isEditable">
<ActionButton icon="icon-add_row_before"
:close-after-click="true"
@click="addRowBefore">
Expand Down
2 changes: 1 addition & 1 deletion src/nodes/TableHeaderView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<NodeViewWrapper as="th">
<div>
<NodeViewContent class="content" />
<Actions>
<Actions v-if="editor.isEditable">
<ActionButton icon="icon-add_col_before"
:close-after-click="true"
@click="addColumnBefore">
Expand Down
11 changes: 9 additions & 2 deletions src/nodes/TableView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
-->

<template>
<NodeViewWrapper>
<NodeViewWrapper class="table-wrapper">
<NodeViewContent class="content" as="table" />
<Actions :force-menu="true"
<Actions v-if="editor.isEditable"
:force-menu="true"
class="table-settings"
default-icon="icon-table_settings">
<ActionButton icon="icon-delete"
Expand All @@ -32,6 +33,7 @@
{{ t('text', 'Delete this table') }}
</ActionButton>
</Actions>
<div class="clearfix" />
</NodeViewWrapper>
</template>

Expand Down Expand Up @@ -66,6 +68,10 @@ export default {

<style scoped lang="scss">

.clearfix {
clear: both;
}

table {
float: left;
}
Expand All @@ -78,4 +84,5 @@ table {
opacity: 1;
}
}

</style>