From 8e18789c6a11cc03f93d3de5f96678c227907374 Mon Sep 17 00:00:00 2001 From: Lennart Guderian Date: Wed, 12 May 2021 18:37:09 +0200 Subject: [PATCH 1/3] first table layout updates --- freshContent/gradeTable.css | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/freshContent/gradeTable.css b/freshContent/gradeTable.css index 0d165561..96dd82c1 100644 --- a/freshContent/gradeTable.css +++ b/freshContent/gradeTable.css @@ -1,37 +1,42 @@ .tr-table-state-dark .td { - background-color: #2A272AAA; + background-color: #0B2A51DD; color: white; } .tr-table-state-dark .td:first-child { - background-color: #2A272AAA; + background-color: #FFFFFF00; + background-image: linear-gradient(to left, #0b2a51DD, #0a355dDD, #073f68CC, #044b74BB, #00567fAA); color: white; } .tr-table-state-danger .td, .red { - background-color: #CE5D7399; + background-color: #CE5D7366; } .tr-table-state-danger .td:first-child { - background-color: #2A272AAA; + background-color: #FFFFFF00; + background-image: linear-gradient(to right, #0b2a51DD, #0a355dCC, #073f68BB, #044b74AA, #00567fAA); color: white; } .tr-table-state-success .td, .green { - background-color: #91F08C99; + background-color: #91F08C66; } .tr-table-state-success .td:first-child { - background-color: #2A272AAA; + background-color: #FFFFFF00; + background-image: linear-gradient(to right, #0b2a51DD, #0a355dCC, #073f68BB, #044b74AA, #00567fAA); color: white; } .tr-table-state-primary .td, .blue { - background-color: #90B5FF99; + background-color: #00567FAA; + color: white; } .tr-table-state-primary .td:first-child { - background-color: #2A272AAA; + background-color: #FFFFFF00; + background-image: linear-gradient(to right, #0b2a51DD, #0a355dDD, #073f68CC, #044b74BB, #00567fAA); color: white; } @@ -68,6 +73,21 @@ width: 33% } +#container { + display: flex; + align-items: center; + justify-content: center; +} + +#pimpedTable { + width: 95vw; + +} + +#pimpedTable .td { + font-size: inherit; +} + /* fix original css */ #portal-footer { From f36f0b331d432de7348b3a5680ba4f44fe323ce0 Mon Sep 17 00:00:00 2001 From: Lennart Guderian Date: Sun, 23 May 2021 17:13:18 +0200 Subject: [PATCH 2/3] rm gradient and different colour for left column --- freshContent/gradeTable.css | 34 +++------------------------------- 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/freshContent/gradeTable.css b/freshContent/gradeTable.css index 96dd82c1..c2dab23d 100644 --- a/freshContent/gradeTable.css +++ b/freshContent/gradeTable.css @@ -3,30 +3,12 @@ color: white; } -.tr-table-state-dark .td:first-child { - background-color: #FFFFFF00; - background-image: linear-gradient(to left, #0b2a51DD, #0a355dDD, #073f68CC, #044b74BB, #00567fAA); - color: white; -} - .tr-table-state-danger .td, .red { - background-color: #CE5D7366; -} - -.tr-table-state-danger .td:first-child { - background-color: #FFFFFF00; - background-image: linear-gradient(to right, #0b2a51DD, #0a355dCC, #073f68BB, #044b74AA, #00567fAA); - color: white; + background-color: #91BFD666; } .tr-table-state-success .td, .green { - background-color: #91F08C66; -} - -.tr-table-state-success .td:first-child { - background-color: #FFFFFF00; - background-image: linear-gradient(to right, #0b2a51DD, #0a355dCC, #073f68BB, #044b74AA, #00567fAA); - color: white; + background-color: #38C79E66; } .tr-table-state-primary .td, .blue { @@ -34,21 +16,10 @@ color: white; } -.tr-table-state-primary .td:first-child { - background-color: #FFFFFF00; - background-image: linear-gradient(to right, #0b2a51DD, #0a355dDD, #073f68CC, #044b74BB, #00567fAA); - color: white; -} - .tr-table-state-warn .td { background-color: #E5EE1B99; } -.tr-table-state-warn .td:first-child { - background-color: #2A272AAA; - color: white; -} - .tr-table-state-success, .tr-table-state-primary, .tr-table-state-danger, .tr-table-state-warning { color: black; } @@ -86,6 +57,7 @@ #pimpedTable .td { font-size: inherit; + padding: 8px 5px; } /* fix original css */ From b92480057cea28c814bb84c3d59c00c0d9603fc4 Mon Sep 17 00:00:00 2001 From: Lennart Guderian Date: Sun, 23 May 2021 17:41:28 +0200 Subject: [PATCH 3/3] fixed search icon problem --- thirdParty/vuesax.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/thirdParty/vuesax.js b/thirdParty/vuesax.js index 9e0adde2..b5bf4f4b 100644 --- a/thirdParty/vuesax.js +++ b/thirdParty/vuesax.js @@ -10309,9 +10309,20 @@ var vsTable_component = normalizeComponent( /* harmony default export */ var vsTable = (vsTable_component.exports); // CONCATENATED MODULE: C:/Users/Usuario/AppData/Roaming/npm/node_modules/@vue/cli-service-global/node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"45aa2680-vue-loader-template"}!C:/Users/Usuario/AppData/Roaming/npm/node_modules/@vue/cli-service-global/node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!C:/Users/Usuario/AppData/Roaming/npm/node_modules/@vue/cli-service-global/node_modules/cache-loader/dist/cjs.js??ref--0-0!C:/Users/Usuario/AppData/Roaming/npm/node_modules/@vue/cli-service-global/node_modules/vue-loader/lib??vue-loader-options!./src/components/vsTable/vsTh.vue?vue&type=template&id=6008fdf0& //THIS IS ORIGINAL LINE: - var vsThvue_type_template_id_6008fdf0_render = function () { var _vm = this; var _h = _vm.$createElement; var _c = _vm._self._c || _h; return _c('th', { attrs: { "colspan": "1", "rowspan": "1" }, on: { "click": function ($event) { return _vm.sortValue() } } }, [_c('div', { staticClass: "vs-table-text" }, [_vm._t("default"), (_vm.isColumnSelectedForSort && _vm.currentSort != 0) ? _c('span', { staticClass: "sort-th" }, [_c('vs-icon', { staticClass: "th-sort-icon", attrs: { "icon": _vm.currentSort == 1 ? 'expand_less' : 'expand_more' } })], 1) : _vm._e()], 2)]) } -//THIS IS MODIFIED LINE BY OLIVER HAUSDOERFER TO ALWAYS SHOW SORT ICONS - var vsThvue_type_template_id_6008fdf0_render = function () { var _vm = this; var _h = _vm.$createElement; var _c = _vm._self._c || _h; return _c('th', { attrs: { "colspan": "1", "rowspan": "1" }, on: { "click": function ($event) { return _vm.sortValue() } } }, [_c('div', { staticClass: "vs-table-text" }, [_vm._t("default"), (true) ? _c('span', { staticClass: "sort-th" }, [_c('vs-icon', { staticClass: "th-sort-icon", attrs: { "icon": _vm.currentSort == 1 ? 'expand_less' : 'expand_more' } })], 1) : _vm._e()], 2)]) } + // var vsThvue_type_template_id_6008fdf0_render = function () { var _vm = this; var _h = _vm.$createElement; var _c = _vm._self._c || _h; return _c('th', { attrs: { "colspan": "1", "rowspan": "1" }, on: { "click": function ($event) { return _vm.sortValue() } } }, [_c('div', { staticClass: "vs-table-text" }, [_vm._t("default"), (_vm.isColumnSelectedForSort && _vm.currentSort != 0) ? _c('span', { staticClass: "sort-th" }, [_c('vs-icon', { staticClass: "th-sort-icon", attrs: { "icon": _vm.currentSort == 1 ? 'expand_less' : 'expand_more' } })], 1) : _vm._e()], 2)]) } + +// THIS IS MODIFIED LINE BY OLIVER HAUSDOERFER TO ALWAYS SHOW SORT ICONS + // var vsThvue_type_template_id_6008fdf0_render = function () { var _vm = this; var _h = _vm.$createElement; var _c = _vm._self._c || _h; return _c('th', { attrs: { "colspan": "1", "rowspan": "1" }, on: { "click": function ($event) { return _vm.sortValue() } } }, [_c('div', { staticClass: "vs-table-text" }, [_vm._t("default"), (true) ? _c('span', { staticClass: "sort-th" }, [_c('vs-icon', { staticClass: "th-sort-icon", attrs: { "icon": _vm.currentSort == 1 ? 'expand_less' : 'expand_more' } })], 1) : _vm._e()], 2)]) } + +// THIS IS THE FURTHER MODIFIED LINE BY LENNART GUDERIAN TO SHOW AN UNFOLD_MORE-ICON IN THE UNSORTED AND THE +// NORMAL SORT ICONS IN THE SORTED STATE +var vsThvue_type_template_id_6008fdf0_render = function () { + var _vm = this; var _h = _vm.$createElement; + var _c = _vm._self._c || _h; return _c('th', { + attrs: { "colspan": "1", "rowspan": "1" }, + on: { "click": function ($event) { return _vm.sortValue() } } + }, [_c('div', { staticClass: "vs-table-text" }, [_vm._t("default"), (true) ? _c('span', { staticClass: "sort-th" }, [_c('vs-icon', { staticClass: "th-sort-icon", attrs: { "icon": _vm.currentSort == 1 ? 'expand_less' : _vm.currentSort == 2 ? 'expand_more' : 'unfold_more'} })], 1) : _vm._e()], 2)]) } + var vsThvue_type_template_id_6008fdf0_staticRenderFns = []