Skip to content

Commit

Permalink
#313 updating to use em instead of rem
Browse files Browse the repository at this point in the history
  • Loading branch information
xaksis committed Jun 23, 2018
1 parent b8ff8a7 commit ae09569
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
1 change: 1 addition & 0 deletions dev/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
enabled: true,
selectOnCheckboxOnly: false,
}"
styleClass="vgt-table condensed"
:sort-options="{enabled: true, initialSortBy: {field: 'name', type: 'asc'}}"
:search-options="{
enabled: false,
Expand Down
2 changes: 1 addition & 1 deletion src/styles/_condensed.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.vgt-table{
&.condensed td, &.condensed th.vgt-row-header{
padding: .4rem .4rem .4rem .4rem;
padding: .4em .4em .4em .4em;
}
}
6 changes: 3 additions & 3 deletions src/styles/_rtl.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

.vgt-table{
td, th:not(.line-numbers) {
padding: .75rem .75rem .75rem 1.5rem;
padding: .75em .75em .75em 1.5em;
}
thead th, &.condensed thead th {
padding-left: 1.5rem;
padding-right: .75rem;
padding-left: 1.5em;
padding-right: .75em;
}
th.sorting:after,
th.sorting-asc:after{
Expand Down
2 changes: 1 addition & 1 deletion src/styles/_table-footer.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.vgt-wrap__footer{
color: $text-color;
padding: 1rem;
padding: 1em;
border: 1px solid $border-color;
background: linear-gradient($thead-bg-color-1, $thead-bg-color-2);
.footer__row-count{
Expand Down
8 changes: 4 additions & 4 deletions src/styles/_table-th.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.vgt-table{
& th{
padding: .75rem 1.5rem .75rem .75rem;
padding: .75em 1.5em .75em .75em;
vertical-align: middle;
position: relative;
&.sorting{
Expand All @@ -25,7 +25,7 @@
}
}
& th.line-numbers, & th.vgt-checkbox-col {
padding: 0 .75rem 0 .75rem;
padding: 0 .75em 0 .75em;
color: $text-color;
border-right: 1px solid $border-color;
word-wrap: break-word;
Expand All @@ -34,7 +34,7 @@
background: linear-gradient($thead-bg-color-1, $thead-bg-color-2);
}
& th.filter-th {
padding: .75rem .75rem .75rem .75rem;
padding: .75em .75em .75em .75em;
}

th.vgt-row-header{
Expand All @@ -47,7 +47,7 @@
color: $text-color;
vertical-align: bottom;
border-bottom: 1px solid $border-color;
padding-right: 1.5rem;
padding-right: 1.5em;
background: linear-gradient($thead-bg-color-1, $thead-bg-color-2);
&.vgt-checkbox-col{
vertical-align: middle;
Expand Down
3 changes: 2 additions & 1 deletion src/styles/_table.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
table.vgt-table{
font-size: 16px;
border-collapse: collapse;
background-color: white;
width: 100%;
max-width: 100%;
table-layout: auto;
border: 1px solid $border-color;
& td {
padding: .75rem .75rem .75rem .75rem;
padding: .75em .75em .75em .75em;
vertical-align: top;
border-bottom: 1px solid $border-color;
color: $text-color;
Expand Down
2 changes: 1 addition & 1 deletion src/styles/black-rhino/black-rhino.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
//th
& th.line-numbers, & th.vgt-checkbox-col {
color: $text-color;
border-right: 1px solid $border-color-td;
border-right: 1px solid $border-color;
background: linear-gradient($thead-bg-color-1, $thead-bg-color-2);
}
thead th{
Expand Down

0 comments on commit ae09569

Please sign in to comment.