Commit de8359d8 authored by wudizhanche1000's avatar wudizhanche1000

Merge remote-tracking branch 'origin/v3' into v3

parents ebdab037 ad22d256
......@@ -82,3 +82,10 @@ li > a:hover, #window-buttons > i:hover {
.navbar {
border-radius: initial;
}
/* https://github.com/electron/electron/issues/7661#event-827104990 */
.hide {
width: 0;
height: 0;
flex: 0 1;
}
\ No newline at end of file
......@@ -31,8 +31,8 @@
</div>
</nav>
<login class="page" [hidden]="currentPage!= 'login'"></login>
<store class="page" [hidden]="currentPage!= 'store'"></store>
<lobby class="page" [hidden]="currentPage!= 'lobby'"></lobby>
<webview id="community" class="page" [hidden]=" currentPage!= 'community'"
<login class="page" [ngClass]="{hide: currentPage != 'login'}"></login>
<store class="page" [ngClass]="{hide: currentPage != 'store'}"></store>
<lobby class="page" [ngClass]="{hide: currentPage != 'lobby'}"></lobby>
<webview id="community" class="page" [ngClass]="{hide: currentPage != 'community'}"
src="https://ygobbs.com"></webview>
\ No newline at end of file
......@@ -13,16 +13,4 @@ h2, h3 {
body {
margin: 2em;
}
/* https://github.com/electron/electron/issues/7661#event-827104990 */
webview[hidden] {
width: 0;
height: 0;
flex: 0 1;
display: block;
}
#candy {
flex: 0 1;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment