Skip to content

Commit

Permalink
Improve list tree styling and minor fix
Browse files Browse the repository at this point in the history 
Fixes bug with non standard primary key on model when using tree mode
Fixes #2532
Recompile assets
  • Loading branch information
@daftspunk
daftspunk committed Dec 10, 2016
1 parent d3a959b commit 15fcaeb
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 28 deletions.
15 changes: 10 additions & 5 deletions assets/ui/less/list.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,15 @@ table.table.data {
border-left: 3px solid transparent;
padding-left: 22px;
}

tr.active td {
color: @color-list-text-active;

&:first-child {
border-left: 3px solid @color-list-stripe-active;
}
}

tr.rowlink:hover td, tr:not(.no-data).selected td, {
background: @color-list-hover-bg !important;
text-shadow: 0 -1px 0 @highlight-hover-text-shadow;
Expand All @@ -160,6 +162,7 @@ table.table.data {
color: @highlight-hover-text;
}
}

tr.rowlink:active td {
text-shadow: 0 -1px 0 @highlight-active-text-shadow;
background: @color-list-active-bg !important;
Expand Down Expand Up @@ -370,27 +373,29 @@ table.table.data {
.list-tree {
width: 10px;
padding: 0;
padding-left: 0 !important;
vertical-align: middle;

a.list-expand-collapse {
padding: 5px;
display: block;
text-align: center;
font-size: 18px;
font-size: 14px;
position: relative;
top: 5px;
left: 10px;
text-decoration: none !important;
color: @color-list-text-tree;
}
}

// Tree levels 1 - 10
.makeTreeLevel(@count) {
tr.list-tree-level-@{count} {
a.list-expand-collapse { left: 20px + (10 * @count); }
td.list-cell-index-1 { padding-left: 25px + (10 * @count); }
a.list-expand-collapse { left: 10px + (10 * @count); }
td.list-cell-index-1 { padding-left: 15px + (10 * @count); }
}
}

.makeTreeLevel(0);
.makeTreeLevel(1);
.makeTreeLevel(2);
.makeTreeLevel(3);
Expand Down
1 change: 1 addition & 0 deletions assets/ui/less/list.variables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
@color-list-text-head: #666666;
@color-list-text: #666666;
@color-list-text-active: #000000;
@color-list-text-tree: #999999;
@color-list-stripe-active: #ff9933;
@color-list-accent: #ECF0F1;
@color-list-norecords-text: #555555;
Expand Down
2 changes: 1 addition & 1 deletion assets/ui/storm-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 24 additions & 22 deletions assets/ui/storm.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2629,28 +2629,30 @@ table.table.data .list-checkbox .custom-checkbox{position:relative;top:-14px;lef
table.table.data .list-checkbox .custom-checkbox label{margin-right:0;margin-bottom:0}
table.table.data tbody tr td.list-checkbox{padding-left:17px;padding-right:3px}
table.table.data thead tr th.list-checkbox{padding:18px 0 0 20px}
table.table.data .list-tree{width:10px;padding:0}
table.table.data .list-tree a.list-expand-collapse{padding:5px;display:block;text-align:center;font-size:18px;position:relative;top:5px;left:10px;text-decoration:none !important}
table.table.data tr.list-tree-level-1 a.list-expand-collapse{left:30px}
table.table.data tr.list-tree-level-1 td.list-cell-index-1{padding-left:35px}
table.table.data tr.list-tree-level-2 a.list-expand-collapse{left:40px}
table.table.data tr.list-tree-level-2 td.list-cell-index-1{padding-left:45px}
table.table.data tr.list-tree-level-3 a.list-expand-collapse{left:50px}
table.table.data tr.list-tree-level-3 td.list-cell-index-1{padding-left:55px}
table.table.data tr.list-tree-level-4 a.list-expand-collapse{left:60px}
table.table.data tr.list-tree-level-4 td.list-cell-index-1{padding-left:65px}
table.table.data tr.list-tree-level-5 a.list-expand-collapse{left:70px}
table.table.data tr.list-tree-level-5 td.list-cell-index-1{padding-left:75px}
table.table.data tr.list-tree-level-6 a.list-expand-collapse{left:80px}
table.table.data tr.list-tree-level-6 td.list-cell-index-1{padding-left:85px}
table.table.data tr.list-tree-level-7 a.list-expand-collapse{left:90px}
table.table.data tr.list-tree-level-7 td.list-cell-index-1{padding-left:95px}
table.table.data tr.list-tree-level-8 a.list-expand-collapse{left:100px}
table.table.data tr.list-tree-level-8 td.list-cell-index-1{padding-left:105px}
table.table.data tr.list-tree-level-9 a.list-expand-collapse{left:110px}
table.table.data tr.list-tree-level-9 td.list-cell-index-1{padding-left:115px}
table.table.data tr.list-tree-level-10 a.list-expand-collapse{left:120px}
table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:125px}
table.table.data .list-tree{width:10px;padding:0;padding-left:0 !important;vertical-align:middle}
table.table.data .list-tree a.list-expand-collapse{padding:5px;display:block;text-align:center;font-size:14px;position:relative;text-decoration:none !important;color:#999999}
table.table.data tr.list-tree-level-0 a.list-expand-collapse{left:10px}
table.table.data tr.list-tree-level-0 td.list-cell-index-1{padding-left:15px}
table.table.data tr.list-tree-level-1 a.list-expand-collapse{left:20px}
table.table.data tr.list-tree-level-1 td.list-cell-index-1{padding-left:25px}
table.table.data tr.list-tree-level-2 a.list-expand-collapse{left:30px}
table.table.data tr.list-tree-level-2 td.list-cell-index-1{padding-left:35px}
table.table.data tr.list-tree-level-3 a.list-expand-collapse{left:40px}
table.table.data tr.list-tree-level-3 td.list-cell-index-1{padding-left:45px}
table.table.data tr.list-tree-level-4 a.list-expand-collapse{left:50px}
table.table.data tr.list-tree-level-4 td.list-cell-index-1{padding-left:55px}
table.table.data tr.list-tree-level-5 a.list-expand-collapse{left:60px}
table.table.data tr.list-tree-level-5 td.list-cell-index-1{padding-left:65px}
table.table.data tr.list-tree-level-6 a.list-expand-collapse{left:70px}
table.table.data tr.list-tree-level-6 td.list-cell-index-1{padding-left:75px}
table.table.data tr.list-tree-level-7 a.list-expand-collapse{left:80px}
table.table.data tr.list-tree-level-7 td.list-cell-index-1{padding-left:85px}
table.table.data tr.list-tree-level-8 a.list-expand-collapse{left:90px}
table.table.data tr.list-tree-level-8 td.list-cell-index-1{padding-left:95px}
table.table.data tr.list-tree-level-9 a.list-expand-collapse{left:100px}
table.table.data tr.list-tree-level-9 td.list-cell-index-1{padding-left:105px}
table.table.data tr.list-tree-level-10 a.list-expand-collapse{left:110px}
table.table.data tr.list-tree-level-10 td.list-cell-index-1{padding-left:115px}
.list-preview{padding:0;margin-bottom:20px;background:white;border:1px solid #d4d8da}
.list-preview .list-header:first-child{padding-top:20px}
.list-preview .control-list:last-child{margin-bottom:0}
Expand Down

0 comments on commit 15fcaeb

Please sign in to comment.