Skip to content

Commit 94b3a77

Browse files
rueckstiesskangas
authored andcommitted
INT-1436 remove cardinality column, add compound to properties
(cherry picked from commit 13be38a)
1 parent 3c7f48c commit 94b3a77

File tree

4 files changed

+12
-17
lines changed

4 files changed

+12
-17
lines changed

src/app/indexes/index-item.jade

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ tr
2525
div.quantity(data-hook='usage-count')
2626
div.usage-since since 
2727
span(data-hook='usage-since')
28-
td.property1-column
29-
div.property.cardinality
30-
= model.cardinality
31-
i.link
32-
td.property2-column
28+
td.property-column
3329
div.properties
3430
each prop in model.properties
3531
if prop === 'ttl'
@@ -44,3 +40,7 @@ tr
4440
div(class='property')
4541
= prop
4642
i.link
43+
if model.cardinality === 'compound'
44+
div.property.cardinality
45+
= model.cardinality
46+
i.link

src/app/indexes/index.jade

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
th.usage-column(data-hook='th-usage') Usage
1717
i.sort.fa.fa-fw
1818
i.fa.fa-fw.fa-sort
19-
th(data-hook='th-cardinality') Cardinality
20-
i.sort.fa.fa-fw
21-
i.fa.fa-fw.fa-sort
2219
th(data-hook='th-properties') Properties
2320
i.sort.fa.fa-fw
2421
i.fa.fa-fw.fa-sort

src/app/indexes/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ module.exports = View.extend({
6969
'Type': '[data-hook=th-type]',
7070
'Size': '[data-hook=th-size]',
7171
'Usage': '[data-hook=th-usage]',
72-
'Cardinality': '[data-hook=th-cardinality]',
7372
'Properties': '[data-hook=th-properties]'
7473
}
7574
},

src/app/indexes/index.less

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
&[data-hook="th-name"],
4040
&[data-hook="th-type"],
4141
&[data-hook="th-size"],
42-
&[data-hook="th-cardinality"],
4342
&[data-hook="th-properties"] {
4443
padding-left: 24px;
4544
}
@@ -99,7 +98,7 @@
9998
padding: 0 0 24px 12px;
10099
position: relative;
101100
height: 48px;
102-
width: 30%;
101+
width: 40%;
103102

104103
&:hover {
105104
.name {
@@ -124,16 +123,16 @@
124123
padding-right: 24px;
125124
}
126125

127-
&.util-column {
128-
width: 18%;
129-
}
130-
131-
&.type-column, &.property1-column, &.property2-column {
132-
width: 14%;
126+
&.type-column, &.property-column {
127+
width: auto;
133128
padding-left: 24px;
134129
padding-right: 24px;
135130
}
136131

132+
&.usage-column {
133+
width: 20%;
134+
}
135+
137136
.name {
138137
font-size: 12px;
139138
color: @index-type-color;

0 commit comments

Comments
 (0)