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

Table update #29

Merged
merged 3 commits into from
May 23, 2021
+34 −31
Merged

Table update #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e18789
first table layout updates
Noxdor May 12, 2021
f36f0b3
rm gradient and different colour for left column
Noxdor May 23, 2021
b924800
fixed search icon problem
Noxdor May 23, 2021
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
48 changes: 20 additions & 28 deletions freshContent/gradeTable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,25 @@
.tr-table-state-dark .td {
background-color: #2A272AAA;
color: white;
}

.tr-table-state-dark .td:first-child {
background-color: #2A272AAA;
background-color: #0B2A51DD;
color: white;
}

.tr-table-state-danger .td, .red {
background-color: #CE5D7399;
}

.tr-table-state-danger .td:first-child {
background-color: #2A272AAA;
color: white;
background-color: #91BFD666;
}

.tr-table-state-success .td, .green {
background-color: #91F08C99;
}

.tr-table-state-success .td:first-child {
background-color: #2A272AAA;
color: white;
background-color: #38C79E66;
}

.tr-table-state-primary .td, .blue {
background-color: #90B5FF99;
}

.tr-table-state-primary .td:first-child {
background-color: #2A272AAA;
background-color: #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;
}
Expand All @@ -68,6 +44,22 @@
width: 33%
}

#container {
display: flex;
align-items: center;
justify-content: center;
}

#pimpedTable {
width: 95vw;

}

#pimpedTable .td {
font-size: inherit;
padding: 8px 5px;
}

/* fix original css */

#portal-footer {
Expand Down
17 changes: 14 additions & 3 deletions thirdParty/vuesax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@OliEfr OliEfr May 24, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Noxdor Haha gewöhne dir bitte nicht alle meine schlechten collaborations habits an 👍 😆
Aber die Lösung wie es jetzt ist finde ich gut :)

// 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 = []


Expand Down