Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

peng/359 update scrollbars, max-width #505

Merged
merged 4 commits into from
Feb 27, 2018
Merged

peng/359 update scrollbars, max-width #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa82c2b
update max width, scrollbars
nylira Feb 27, 2018
cfb1d44
update snapshots
nylira Feb 27, 2018
cf650da
update snapshots
faboweb Feb 27, 2018
2314964
increase timeout for balance update
faboweb Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions app/src/renderer/components/common/NiPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,10 @@ export default {
data: () => ({
ps: ''
}),
methods: {
handleResize () {
if (this.config.desktop) {
const container = this.$el.querySelector('.ni-page-main')
this.ps = new PerfectScrollbar(container)
} else if (this.ps) {
this.ps.destroy()
this.ps = null
}
}
},
mounted () {
this.handleResize()
window.addEventListener('resize', this.handleResize)
async mounted () {
await this.$nextTick()
const container = this.$el.querySelector('.ni-page-main')
this.ps = new PerfectScrollbar(container)
}
}
</script>
Expand All @@ -55,7 +45,6 @@ export default {
.ni-page-main
flex 1
position relative
max-width width-main-max

.ni-page-title
color bright
Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/components/common/NiPart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default {

.ni-part
position relative
max-width width-main
max-width width-main-max

.ni-part-container
.ni-part-header
Expand Down
5 changes: 4 additions & 1 deletion app/src/renderer/styles/app.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ reset-html5()
html, body, #app
background app-bg

html
overflow hidden

a
color link
text-decoration none
Expand All @@ -28,7 +31,7 @@ a
padding-top 3rem
height 100vh
width 100vw
max-width 100%
max-width 100% // fixes bug where horizontal scrollbar appears
font-weight 300

display flex
Expand Down
2 changes: 1 addition & 1 deletion app/src/renderer/styles/variables.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ danger = hsl(0,100%,55%)
// sizes
aw = 64rem
width-main = 100%
width-main-max = 64rem
width-main-max = 48rem
width-side = 16rem
bw = 3*px

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/wallet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ test('wallet', async function (t) {
await client.$('.material-icons=refresh').click()

let mycoinEl = () => balanceEl('fermion')
await waitForText(mycoinEl, '9007199254740892')
await waitForText(mycoinEl, '9007199254740892', 10000)
t.pass('balance is reduced by 100')
t.end()
})
Expand Down
25 changes: 23 additions & 2 deletions test/unit/specs/components/common/__snapshots__/NiPage.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,28 @@ exports[`NiPage has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
/>
class="ni-page-main ps"
>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
22 changes: 21 additions & 1 deletion test/unit/specs/components/common/__snapshots__/Page404.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ exports[`Page404 has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<section
class="ni-part"
Expand Down Expand Up @@ -150,6 +150,26 @@ exports[`Page404 has the expected html structure 1`] = `
</main>
</div>
</section>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
8 changes: 7 additions & 1 deletion test/unit/specs/components/monitor/__snapshots__/PageBlock.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exports[`PageBlock has the expected html structure 1`] = `
</menu>
</div>
</header>
<main class=\\"ni-page-main\\">
<main class=\\"ni-page-main ps\\">
<section class=\\"ni-part\\">
<div class=\\"ni-part-container\\">
<!---->
Expand Down Expand Up @@ -253,6 +253,12 @@ exports[`PageBlock has the expected html structure 1`] = `
</main>
</div>
</section>
<div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
<div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
</div>
<div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
<div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
</div>
</main>
</div>"
`;
Expand Down
8 changes: 7 additions & 1 deletion test/unit/specs/components/monitor/__snapshots__/PageBlocks.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ exports[`PageBlocks has the expected html structure 1`] = `
</menu>
</div>
</header>
<main class=\\"ni-page-main\\">
<main class=\\"ni-page-main ps\\">
<modal-search type=\\"blocks\\"></modal-search>
<!---->
<section class=\\"ni-part\\">
Expand Down Expand Up @@ -152,6 +152,12 @@ exports[`PageBlocks has the expected html structure 1`] = `
</main>
</div>
</section>
<div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
<div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
</div>
<div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
<div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
</div>
</main>
</div>"
`;
22 changes: 21 additions & 1 deletion test/unit/specs/components/staking/__snapshots__/PageBond.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ exports[`PageBond has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<section
class="ni-part"
Expand Down Expand Up @@ -456,6 +456,26 @@ exports[`PageBond has the expected html structure 1`] = `
</main>
</div>
</section>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
22 changes: 21 additions & 1 deletion test/unit/specs/components/staking/__snapshots__/PageDelegate.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ exports[`PageDelegate has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<section
class="ni-part"
Expand Down Expand Up @@ -322,6 +322,26 @@ exports[`PageDelegate has the expected html structure 1`] = `
</main>
</div>
</section>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
8 changes: 7 additions & 1 deletion test/unit/specs/components/staking/__snapshots__/PageDelegates.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ exports[`PageDelegates has the expected html structure 1`] = `
</menu>
</div>
</header>
<main class=\\"ni-page-main\\">
<main class=\\"ni-page-main ps\\">
<!---->
<div class=\\"delegates-container\\">
<div class=\\"panel-sort\\">
Expand Down Expand Up @@ -133,6 +133,12 @@ exports[`PageDelegates has the expected html structure 1`] = `
<strong>0</strong> delegates selected
</div>
<a href=\\"#/staking/bond\\" class=\\"ni-btn\\" disabled=\\"disabled\\"><span class=\\"ni-btn__container ni-btn__icon-right ni-btn--primary\\"><i aria-hidden=\\"true\\" class=\\"ni-btn__icon material-icons\\">chevron_right</i><span class=\\"ni-btn__value\\">Next</span></span></a>
</div>
<div class=\\"ps__rail-x\\" style=\\"left: 0px; top: 0px;\\">
<div class=\\"ps__thumb-x\\" tabindex=\\"0\\" style=\\"left: 0px; width: 0px;\\"></div>
</div>
<div class=\\"ps__rail-y\\" style=\\"top: 0px; left: 0px;\\">
<div class=\\"ps__thumb-y\\" tabindex=\\"0\\" style=\\"top: 0px; height: 0px;\\"></div>
</div>
</main>
</div>"
Expand Down
44 changes: 42 additions & 2 deletions test/unit/specs/components/wallet/__snapshots__/PageBalances.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ exports[`PageBalances has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<modal-search
type="balances"
Expand Down Expand Up @@ -319,6 +319,26 @@ exports[`PageBalances has the expected html structure 1`] = `
/>
</div>
</section>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
Expand Down Expand Up @@ -426,7 +446,7 @@ exports[`PageBalances should filter the balances 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<modal-search
type="balances"
Expand Down Expand Up @@ -642,6 +662,26 @@ exports[`PageBalances should filter the balances 1`] = `
/>
</div>
</section>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
22 changes: 21 additions & 1 deletion test/unit/specs/components/wallet/__snapshots__/PageSend.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ exports[`PageSend has the expected html structure 1`] = `
</div>
</header>
<main
class="ni-page-main"
class="ni-page-main ps"
>
<form
class="ni-form"
Expand Down Expand Up @@ -535,6 +535,26 @@ exports[`PageSend has the expected html structure 1`] = `
</footer>
</div>
</form>
<div
class="ps__rail-x"
style="left: 0px; top: 0px;"
>
<div
class="ps__thumb-x"
style="left: 0px; width: 0px;"
tabindex="0"
/>
</div>
<div
class="ps__rail-y"
style="top: 0px; left: 0px;"
>
<div
class="ps__thumb-y"
style="top: 0px; height: 0px;"
tabindex="0"
/>
</div>
</main>
</div>
`;
Expand Down
Loading