Skip to content

[table] CSS refactor #425

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

Merged
merged 9 commits into from
May 19, 2017
Merged

[table] CSS refactor #425

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
74b15d4
[carousel] Fixed this arg in forEach
tmorehouse May 16, 2017
8a961f5
[carousel] coerce querySelectorAll into an array
tmorehouse May 17, 2017
5e6a5ba
[carousel] ESLint
tmorehouse May 17, 2017
244800c
Merge pull request #1 from bootstrap-vue/master
tmorehouse May 17, 2017
656a8e2
Merge pull request #2 from bootstrap-vue/master
tmorehouse May 17, 2017
2830201
Merge pull request #3 from bootstrap-vue/master
tmorehouse May 18, 2017
a2de129
Merge pull request #4 from bootstrap-vue/master
tmorehouse May 19, 2017
e2f44b2
[table] Position arrows for table-sm
tmorehouse May 19, 2017
9f6fc30
[table] Refactor CSS
tmorehouse May 19, 2017
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
111 changes: 32 additions & 79 deletions lib/components/table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@click="headClick(field,key)"
@keydown.enter="headClick(field,key)"
@keydown.space.prevent="headClick(field,key)"
:class="[field.sortable?'sorting':null,sortBy===key?'sorting_'+(sortDesc?'desc':'asc'):'',field.class?field.class:null,field.invisible?'invisible':null]"
:class="fieldClass(field)"
:aria-label="field.sortable ? (sortDesc ? labelSortAsc : labelSortDesc) : null"
:aria-sort="(field.sortable && sortBy === key) ? (sortDesc ? 'descending' : 'ascending') : null"
:tabindex="field.sortable?'0':null"
Expand All @@ -23,7 +23,7 @@
@click="headClick(field,key)"
@keydown.enter="headClick(field,key)"
@keydown.space.prevent="headClick(field,key)"
:class="[field.sortable?'sorting':null,sortBy===key?'sorting_'+(sortDesc?'desc':'asc'):'',field.class?field.class:null,field.invisible?'invisible':null]"
:class="fieldClass(field)"
:aria-label="field.sortable ? (sortDesc ? labelSortAsc : labelSortDesc) : null"
:aria-sort="(field.sortable && sortBy === key) ? (sortDesc ? 'descending' : 'ascending') : null"
:tabindex="field.sortable?'0':null"
Expand Down Expand Up @@ -186,7 +186,7 @@
this.hover ? 'table-hover' : '',
this.inverse ? 'table-inverse' : '',
this.bordered ? 'table-bordered' : '',
this.responsive ? '.table-responsive' : '',
this.responsive ? 'table-responsive' : '',
this.small ? 'table-sm' : ''
];
},
Expand Down Expand Up @@ -239,6 +239,14 @@
}
},
methods: {
fieldClass(field) {
return [
field.sortable ? 'sorting' : '',
(field.sortable && sortBy===key) ? 'sorting_' + (sortDesc ? 'desc' : 'asc') : '',
field.class ? field.class : '',
field.invisible ? 'invisible' : ''
];
},
rowClicked(item, index) {
this.$emit('row-clicked', item, index);
},
Expand All @@ -262,101 +270,46 @@
<style>
/* https://cdn.datatables.net/1.10.13/css/dataTables.bootstrap4.css */

table thead > tr > th.sorting_asc, table thead > tr > th.sorting_desc, table thead > tr > th.sorting,
table thead > tr > td.sorting_asc,
table thead > tr > td.sorting_desc,
table thead > tr > td.sorting,
table tfoot > tr > th.sorting_asc, table tfoot > tr > th.sorting_desc, table tfoot > tr > th.sorting,
table tfoot > tr > td.sorting_asc,
table tfoot > tr > td.sorting_desc,
table tfoot > tr > td.sorting {
table > thead > tr > .sorting,
table > tfoot > tr > .sorting {
padding-right: 30px;
}

table thead > tr > th:active,
table thead > tr > td:active,
table tfoot > tr > th:active,
table tfoot > tr > td:active {
outline: none;
}

table thead .sorting,
table thead .sorting_asc,
table thead .sorting_desc,
table thead .sorting_asc_disabled,
table thead .sorting_desc_disabled,
table tfoot .sorting,
table tfoot .sorting_asc,
table tfoot .sorting_desc,
table tfoot .sorting_asc_disabled,
table tfoot .sorting_desc_disabled {
cursor: pointer;
position: relative;
}

table thead .sorting:before, table thead .sorting:after,
table thead .sorting_asc:before,
table thead .sorting_asc:after,
table thead .sorting_desc:before,
table thead .sorting_desc:after,
table thead .sorting_asc_disabled:before,
table thead .sorting_asc_disabled:after,
table thead .sorting_desc_disabled:before,
table thead .sorting_desc_disabled:after,
table tfoot .sorting:before, table thead .sorting:after,
table tfoot .sorting_asc:before,
table tfoot .sorting_asc:after,
table tfoot .sorting_desc:before,
table tfoot .sorting_desc:after,
table tfoot .sorting_asc_disabled:before,
table tfoot .sorting_asc_disabled:after,
table tfoot .sorting_desc_disabled:before,
table tfoot .sorting_desc_disabled:after {
table thead > tr > .sorting:before,
table thead > tr > .sorting:after,
table tfoot > tr > .sorting:before,
table thead > tr > .sorting:after {
position: absolute;
bottom: 0.9em;
display: block;
opacity: 0.3;
}

table thead .sorting:before,
table thead .sorting_asc:before,
table thead .sorting_desc:before,
table thead .sorting_asc_disabled:before,
table thead .sorting_desc_disabled:before,
table tfoot .sorting:before,
table tfoot .sorting_asc:before,
table tfoot .sorting_desc:before,
table tfoot .sorting_asc_disabled:before,
table tfoot .sorting_desc_disabled:before {
table.table-sm > thead > tr > .sorting:before,
table.table-sm > thead > tr > .sorting:after,
table.table-sm > tfoot > tr > .sorting:before,
table.table-sm > thead > tr > .sorting:after {
bottom: 0.4em;
}

table > thead > tr > .sorting:before,
table > tfoot > tr > .sorting:before {
right: 1em;
content: "\2191";
}

table thead .sorting:after,
table thead .sorting_asc:after,
table thead .sorting_desc:after,
table thead .sorting_asc_disabled:after,
table thead .sorting_desc_disabled:after,
table tfoot .sorting:after,
table tfoot .sorting_asc:after,
table tfoot .sorting_desc:after,
table tfoot .sorting_asc_disabled:after,
table tfoot .sorting_desc_disabled:after {
table > thead > tr > .sorting:after,
table > tfoot > tr > .sorting:after {
right: 0.5em;
content: "\2193";
}

table thead .sorting_asc:before,
table thead .sorting_desc:after,
table tfoot .sorting_asc:before,
table tfoot .sorting_desc:after {
table > thead > tr > .sorting_asc:before,
table > thead > tr > .sorting_desc:after,
table > tfoot > tr > .sorting_asc:before,
table > tfoot > tr > .sorting_desc:after {
opacity: 1;
}

table thead .sorting_asc_disabled:before,
table thead .sorting_desc_disabled:after,
table tfoot .sorting_asc_disabled:before,
table tfoot .sorting_desc_disabled:after {
opacity: 0;
}
</style>