Skip to content

Commit 005e858

Browse files
committed
chg: style changes
1 parent 6ca7a76 commit 005e858

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

frontend/src/components/attributes/AttributesIndex.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ function handleAttributesUpdated(event) {
6464
<table class="table table-striped">
6565
<thead>
6666
<tr>
67-
<th style="width: 30%" scope="col">value</th>
68-
<th style="width: 15%" scope="col" class="d-none d-sm-table-cell">tags</th>
69-
<th style="width: 10%" scope="col">type</th>
70-
<th style="width: 10%" scope="col" class="d-none d-sm-table-cell">timestamp</th>
71-
<th style="width: 15%" scope="col" class="d-none d-sm-table-cell">distribution</th>
72-
<th style="width: 20%" scope="col" class="text-end">actions</th>
67+
<th scope="col">value</th>
68+
<th style="width: 400px;" scope="col" class="d-none d-sm-table-cell">tags</th>
69+
<th scope="col">type</th>
70+
<th scope="col" class="d-none d-sm-table-cell">timestamp</th>
71+
<th scope="col" class="d-none d-sm-table-cell">distribution</th>
72+
<th scope="col" class="text-end">actions</th>
7373
</tr>
7474
</thead>
7575
<tbody>

frontend/src/components/objects/ObjectAttributesList.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ function handleAttributeEnriched(attribute_id) {
4242
<table class="table table-striped">
4343
<thead>
4444
<tr>
45-
<th style="width: 30%" scope="col">value</th>
46-
<th style="width: 15%" scope="col" class="d-none d-sm-table-cell">tags</th>
47-
<th style="width: 10%" scope="col">type</th>
48-
<th style="width: 10%" scope="col" class="d-none d-sm-table-cell">timestamp</th>
49-
<th style="width: 15%" scope="col" class="d-none d-sm-table-cell">distribution</th>
50-
<th style="width: 20%" scope="col" class="text-end">actions</th>
45+
<th scope="col">value</th>
46+
<th style="width: 400px" scope="col" class="d-none d-sm-table-cell">tags</th>
47+
<th scope="col">type</th>
48+
<th scope="col" class="d-none d-sm-table-cell">timestamp</th>
49+
<th scope="col" class="d-none d-sm-table-cell">distribution</th>
50+
<th scope="col" class="text-end">actions</th>
5151
</tr>
5252
</thead>
5353
<tbody>

frontend/src/components/tags/TagsSelect.vue

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,19 @@ onMounted(() => {
6868
},
6969
render: {
7070
option: function (data, escape) {
71-
return '<span class="badge mx-1 tag" style="color: ' + escape(data.color) + '; background-color: ' + escape(data.backgroundColor) + '" title="' + escape(data.name) + '">' +
71+
return '<span class="badge mx-1 tag" style="color: ' + escape(data.color) + '; background-color: ' + escape(data.backgroundColor) + ';" title="' + escape(data.name) + '">' +
7272
escape(data.name) +
7373
'</span>';
7474
},
7575
item: function (data, escape) {
76-
return '<span class="badge mx-1 tag" style="color: ' + escape(data.color) + '; background-color: ' + escape(data.backgroundColor) + '" title="' + escape(data.name) + '">' +
76+
return '<span class="badge mx-1 tag" style="display:block; color: ' + escape(data.color) + '; background-color: ' + escape(data.backgroundColor) + ';" title="' + escape(data.name) + '"><span class="tag-label">' +
7777
escape(data.name) +
78-
'</span>';
78+
'<span/></span>';
7979
}
8080
},
8181
onLoad() {
82-
selectElement.value.tomselect.setValue(props.selectedTags.map(tag => tag.name), true);
82+
let tags = props.selectedTags ? props.selectedTags.map(tag => tag.name) : [];
83+
selectElement.value.tomselect.setValue(tags, true);
8384
initialising = false;
8485
},
8586
onItemRemove: function (tag) {
@@ -97,7 +98,6 @@ onMounted(() => {
9798
if (initialising) {
9899
return;
99100
}
100-
console.log(item);
101101
if (props.modelClass == "event") {
102102
eventsStore.tag(props.model.id, tag);
103103
return;
@@ -113,6 +113,8 @@ onMounted(() => {
113113
114114
</script>
115115

116+
<style></style>
117+
116118
<template>
117119
<select ref="selectElement" multiple>
118120
</select>

0 commit comments

Comments
 (0)