Skip to content

Commit 4243810

Browse files
authored
Merge pull request #382 from ember-learn/nickschot/tweak-sidebar-width
make sidebar wider to better match its contents' requirements
2 parents c0438f1 + d05ad75 commit 4243810

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

addon/styles/sidebar-container.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
@media (min-width: 769px) {
1616
.sidebar-container > .es-sidebar {
17-
width: 234px;
18-
margin-right: 32px;
17+
width: 16rem;
18+
margin-right: 2rem;
1919
flex-grow: 0;
2020
flex-shrink: 0;
2121
}
@@ -27,6 +27,6 @@
2727
.sidebar-container > * + .es-sidebar {
2828
order: 999;
2929
margin-right: unset;
30-
margin-left: 32px;
30+
margin-left: 2rem;
3131
}
3232
}

tests/integration/components/es-sidebar-test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module('Integration | Component | es-sidebar', function (hooks) {
3636
`);
3737

3838
assert.dom('.sidebar-container .es-sidebar').hasStyle({
39-
width: '234px',
39+
width: '256px',
4040
});
4141

4242
await render(hbs`
@@ -47,10 +47,10 @@ module('Integration | Component | es-sidebar', function (hooks) {
4747
`);
4848

4949
assert.dom('[data-test-content-left]').hasStyle({
50-
width: '706px',
50+
width: '684px',
5151
});
5252
assert.dom('.sidebar-container .es-sidebar').hasStyle({
53-
width: '234px',
53+
width: '256px',
5454
margin: '0px 0px 0px 32px',
5555
});
5656

@@ -62,11 +62,11 @@ module('Integration | Component | es-sidebar', function (hooks) {
6262
`);
6363

6464
assert.dom('.sidebar-container .es-sidebar').hasStyle({
65-
width: '234px',
65+
width: '256px',
6666
margin: '0px 32px 0px 0px',
6767
});
6868
assert.dom('[data-test-content-right]').hasStyle({
69-
width: '706px',
69+
width: '684px',
7070
});
7171
});
7272
});

0 commit comments

Comments
 (0)