Skip to content

Commit 5cbd545

Browse files
made Layout styles position-relative
1 parent d781ca4 commit 5cbd545

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+201
-159
lines changed

.gitignore

100644100755
File mode changed.

.travis.yml

100644100755
File mode changed.

.vscode/tasks.json

100644100755
File mode changed.

LICENSE

100644100755
File mode changed.

README.md

100644100755
File mode changed.

docs/data/hsLayout.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@
15761576
"sources": [
15771577
{
15781578
"fileName": "view/PillaredLayouter.ts",
1579-
"line": 290,
1579+
"line": 291,
15801580
"character": 38
15811581
}
15821582
],
@@ -1598,7 +1598,7 @@
15981598
"sources": [
15991599
{
16001600
"fileName": "view/PillaredLayouter.ts",
1601-
"line": 291,
1601+
"line": 292,
16021602
"character": 31
16031603
}
16041604
],
@@ -2141,7 +2141,7 @@
21412141
"sources": [
21422142
{
21432143
"fileName": "view/PillaredLayouter.ts",
2144-
"line": 290,
2144+
"line": 291,
21452145
"character": 13
21462146
}
21472147
],
@@ -2995,7 +2995,7 @@
29952995
"sources": [
29962996
{
29972997
"fileName": "view/PillaredLayouter.ts",
2998-
"line": 351,
2998+
"line": 352,
29992999
"character": 35
30003000
}
30013001
],
@@ -3017,7 +3017,7 @@
30173017
"sources": [
30183018
{
30193019
"fileName": "view/PillaredLayouter.ts",
3020-
"line": 352,
3020+
"line": 353,
30213021
"character": 31
30223022
}
30233023
],
@@ -3560,7 +3560,7 @@
35603560
"sources": [
35613561
{
35623562
"fileName": "view/PillaredLayouter.ts",
3563-
"line": 351,
3563+
"line": 352,
35643564
"character": 10
35653565
}
35663566
],

docs/data/src/hsLayout/coverage/lcov-report/src/view/PillaredLayouter.ts.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ <h1>
402402
<a name='L354'></a><a href='#L354'>354</a>
403403
<a name='L355'></a><a href='#L355'>355</a>
404404
<a name='L356'></a><a href='#L356'>356</a>
405-
<a name='L357'></a><a href='#L357'>357</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
405+
<a name='L357'></a><a href='#L357'>357</a>
406+
<a name='L358'></a><a href='#L358'>358</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
406407
<span class="cline-any cline-neutral">&nbsp;</span>
407408
<span class="cline-any cline-neutral">&nbsp;</span>
408409
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -627,6 +628,7 @@ <h1>
627628
<span class="cline-any cline-yes">7x</span>
628629
<span class="cline-any cline-yes">7x</span>
629630
<span class="cline-any cline-yes">7x</span>
631+
<span class="cline-any cline-neutral">&nbsp;</span>
630632
<span class="cline-any cline-yes">15x</span>
631633
<span class="cline-any cline-yes">45x</span>
632634
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -983,7 +985,8 @@ <h1>
983985
let f = this.fields;
984986
let styles:descriptor[] = this.unit(components.length);
985987
components.map((c:Layout|Vnode, i:number) =&gt; {
986-
c.style = `${f[0]}:0%; ${f[1]}:0%; `;
988+
// c.style = `${f[0]}:0%; ${f[1]}:0%; `;
989+
c.style = `${f[4]}:100%;`;
987990
Object.keys(styles[i].fields).forEach((st:string) =&gt; { c.style += `${st}: ${styles[i].fields[st]};`; });
988991
});
989992
return this.cssClass;

docs/data/src/hsLayout/coverage/src/view/PillaredLayouter.ts.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ <h1>
402402
<a name='L354'></a><a href='#L354'>354</a>
403403
<a name='L355'></a><a href='#L355'>355</a>
404404
<a name='L356'></a><a href='#L356'>356</a>
405-
<a name='L357'></a><a href='#L357'>357</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
405+
<a name='L357'></a><a href='#L357'>357</a>
406+
<a name='L358'></a><a href='#L358'>358</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
406407
<span class="cline-any cline-neutral">&nbsp;</span>
407408
<span class="cline-any cline-neutral">&nbsp;</span>
408409
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -627,6 +628,7 @@ <h1>
627628
<span class="cline-any cline-yes">7x</span>
628629
<span class="cline-any cline-yes">7x</span>
629630
<span class="cline-any cline-yes">7x</span>
631+
<span class="cline-any cline-neutral">&nbsp;</span>
630632
<span class="cline-any cline-yes">15x</span>
631633
<span class="cline-any cline-yes">45x</span>
632634
<span class="cline-any cline-neutral">&nbsp;</span>
@@ -983,7 +985,8 @@ <h1>
983985
let f = this.fields;
984986
let styles:descriptor[] = this.unit(components.length);
985987
components.map((c:Layout|Vnode, i:number) =&gt; {
986-
c.style = `${f[0]}:0%; ${f[1]}:0%; `;
988+
// c.style = `${f[0]}:0%; ${f[1]}:0%; `;
989+
c.style = `${f[4]}:100%;`;
987990
Object.keys(styles[i].fields).forEach((st:string) =&gt; { c.style += `${st}: ${styles[i].fields[st]};`; });
988991
});
989992
return this.cssClass;

docs/data/src/hsLayout/view/PillaredLayouter.html

Lines changed: 133 additions & 132 deletions
Large diffs are not rendered by default.

docs/example/hslayout.css

Lines changed: 14 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/example/hslayout.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/hsLayout.js

Lines changed: 16 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/hsLayout.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hslayout",
33
"main": "./index.js",
44
"types": "./index.d.ts",
5-
"version": "2.4.11",
5+
"version": "2.4.12",
66
"keywords": [
77
"layout",
88
"UI",

jest.config.json

100644100755
File mode changed.

package-lock.json

100644100755
File mode changed.

sharedGruntConfig.js

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ function hsCamelCase(name) {
1111
}
1212

1313
const webpackExternals = {
14+
// hsutil: 'hsutil',
15+
// hslayout: 'hslayout',
16+
// hswidget: 'hswidget',
1417
fs: 'fs', // node.fs
1518
path: 'path', // node.path
1619
url: 'url', // node.url

src/Config.jest.ts

100644100755
File mode changed.

src/Config.ts

100644100755
File mode changed.

src/__snapshots__/Config.jest.ts.snap

100644100755
File mode changed.

src/css/Layout.less

100644100755
Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
@LayoutSpacing: 0px solid white;
22

33
.hs-layout {
4-
left: 0%; top: 0%;
4+
position: absolute;
5+
&.hs-column-layout {
6+
position: relative;
7+
left: 0%;
8+
}
9+
&.hs-row-layout {
10+
position: relative;
11+
top: 0%;
12+
}
13+
&.hs-tile-layout {
14+
position: relative;
15+
left: 0%;
16+
top: 0%;
17+
}
518
width:100%;
619
height:100%;
7-
position: absolute;
820
display: block;
921
overflow: scroll;
1022
// border: 0;

src/css/hsLayout.less

100644100755
File mode changed.

src/example/config.json

100644100755
File mode changed.

src/example/config.x.ts

100644100755
File mode changed.

src/example/hsLayout.less

100644100755
File mode changed.

src/example/layout.html

100644100755
File mode changed.

src/example/layout.json

100644100755
File mode changed.

src/example/layout.x.ts

100644100755
File mode changed.

src/example/start.ts

100644100755
File mode changed.

src/index.ts

100644100755
File mode changed.

src/mithril.ts

100644100755
File mode changed.

src/overview.ts

100644100755
File mode changed.

src/view/Layout.jest.ts

100644100755
File mode changed.

src/view/Layout.ts

100644100755
File mode changed.

src/view/Layouter.jest.ts

100644100755
File mode changed.

src/view/Layouter.ts

100644100755
File mode changed.

src/view/PillaredLayouter.jest.ts

100644100755
File mode changed.

src/view/PillaredLayouter.ts

100644100755
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ abstract class PillarLayouter extends Layouter{
223223
let f = this.fields;
224224
let styles:descriptor[] = this.unit(components.length);
225225
components.map((c:Layout|Vnode, i:number) => {
226-
c.style = `${f[0]}:0%; ${f[1]}:0%; `;
226+
// c.style = `${f[0]}:0%; ${f[1]}:0%; `;
227+
c.style = `${f[4]}:100%;`;
227228
Object.keys(styles[i].fields).forEach((st:string) => { c.style += `${st}: ${styles[i].fields[st]};`; });
228229
});
229230
return this.cssClass;

src/view/TileLayouter.jest.ts

100644100755
File mode changed.

src/view/TileLayouter.ts

100644100755
File mode changed.

src/view/Token.jest.ts

100644100755
File mode changed.

src/view/Tokens.ts

100644100755
File mode changed.

src/view/__snapshots__/PillaredLayouter.jest.ts.snap

100644100755
File mode changed.

src/view/__snapshots__/TileLayouter.jest.ts.snap

100644100755
File mode changed.

tsconfig.json

100644100755
File mode changed.

tslint.json

100644100755
File mode changed.

0 commit comments

Comments
 (0)