Skip to content

Commit

Permalink
fixed responsive layout when in right-to-left context - close #1405
Browse files Browse the repository at this point in the history
  • Loading branch information
vakata committed May 4, 2016
1 parent 96dc574 commit 35a1565
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 8 deletions.
4 changes: 3 additions & 1 deletion dist/themes/default-dark/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@
.jstree-default-dark-responsive.jstree-rtl .jstree-node {
margin-left: 0;
margin-right: 40px;
background: transparent;
}
.jstree-default-dark-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
margin-right: 0;
Expand All @@ -966,7 +967,8 @@
.jstree-default-dark-responsive .jstree-checkbox {
background-size: 120px 240px;
}
.jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
.jstree-default-dark-responsive .jstree-leaf > .jstree-ocl,
.jstree-default-dark-responsive.jstree-rtl .jstree-leaf > .jstree-ocl {
background: transparent;
}
.jstree-default-dark-responsive .jstree-open > .jstree-ocl {
Expand Down
2 changes: 1 addition & 1 deletion dist/themes/default-dark/style.min.css

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion dist/themes/default/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@
.jstree-default-responsive.jstree-rtl .jstree-node {
margin-left: 0;
margin-right: 40px;
background: transparent;
}
.jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
margin-right: 0;
Expand All @@ -966,7 +967,8 @@
.jstree-default-responsive .jstree-checkbox {
background-size: 120px 240px;
}
.jstree-default-responsive .jstree-leaf > .jstree-ocl {
.jstree-default-responsive .jstree-leaf > .jstree-ocl,
.jstree-default-responsive.jstree-rtl .jstree-leaf > .jstree-ocl {
background: transparent;
}
.jstree-default-responsive .jstree-open > .jstree-ocl {
Expand Down
2 changes: 1 addition & 1 deletion dist/themes/default/style.min.css

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/themes/default-dark/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@
.jstree-default-dark-responsive.jstree-rtl .jstree-node {
margin-left: 0;
margin-right: 40px;
background: transparent;
}
.jstree-default-dark-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
margin-right: 0;
Expand All @@ -966,7 +967,8 @@
.jstree-default-dark-responsive .jstree-checkbox {
background-size: 120px 240px;
}
.jstree-default-dark-responsive .jstree-leaf > .jstree-ocl {
.jstree-default-dark-responsive .jstree-leaf > .jstree-ocl,
.jstree-default-dark-responsive.jstree-rtl .jstree-leaf > .jstree-ocl {
background: transparent;
}
.jstree-default-dark-responsive .jstree-open > .jstree-ocl {
Expand Down
4 changes: 3 additions & 1 deletion src/themes/default/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@
.jstree-default-responsive.jstree-rtl .jstree-node {
margin-left: 0;
margin-right: 40px;
background: transparent;
}
.jstree-default-responsive.jstree-rtl .jstree-container-ul > .jstree-node {
margin-right: 0;
Expand All @@ -966,7 +967,8 @@
.jstree-default-responsive .jstree-checkbox {
background-size: 120px 240px;
}
.jstree-default-responsive .jstree-leaf > .jstree-ocl {
.jstree-default-responsive .jstree-leaf > .jstree-ocl,
.jstree-default-responsive.jstree-rtl .jstree-leaf > .jstree-ocl {
background: transparent;
}
.jstree-default-responsive .jstree-open > .jstree-ocl {
Expand Down
5 changes: 3 additions & 2 deletions src/themes/responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
.jstree-icon, .jstree-icon:empty { width:@base-height; height:@base-height; line-height:@base-height; }

> .jstree-container-ul > .jstree-node { margin-left:0; }
&.jstree-rtl .jstree-node { margin-left:0; margin-right:@base-height; }
&.jstree-rtl .jstree-node { margin-left:0; margin-right:@base-height; background:transparent; }
&.jstree-rtl .jstree-container-ul > .jstree-node { margin-right:0; }

.jstree-ocl,
.jstree-themeicon,
.jstree-checkbox { background-size:(@base-height * 3) (@base-height * 6); }
.jstree-leaf > .jstree-ocl { background:transparent; }
.jstree-leaf > .jstree-ocl,
&.jstree-rtl .jstree-leaf > .jstree-ocl { background:transparent; }
.jstree-open > .jstree-ocl { background-position:0 0px !important; }
.jstree-closed > .jstree-ocl { background-position:0 -(@base-height * 1) !important; }
&.jstree-rtl .jstree-closed > .jstree-ocl { background-position:-(@base-height * 1) 0px !important; }
Expand Down

0 comments on commit 35a1565

Please sign in to comment.