Commit 65b3f181 authored by wudizhanche1000's avatar wudizhanche1000

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

parents 73358670 76ae18c6
...@@ -82,15 +82,3 @@ li > a:hover, #window-buttons > i:hover { ...@@ -82,15 +82,3 @@ li > a:hover, #window-buttons > i:hover {
.navbar { .navbar {
border-radius: initial; border-radius: initial;
} }
/* https://github.com/electron/electron/issues/7661#event-827104990 */
webview.hide {
width: 0;
height: 0;
flex: 0 1;
display: inherit;
}
.hide {
display: none;
}
\ No newline at end of file
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
</div> </div>
</nav> </nav>
<login class="page" [ngClass]="{hide: currentPage!= 'login'}"></login> <login class="page" [hidden]="currentPage!= 'login'"></login>
<store class="page" [ngClass]="{hide: currentPage!= 'store'}"></store> <store class="page" [hidden]="currentPage!= 'store'"></store>
<lobby class="page" [ngClass]="{hide: currentPage!= 'lobby'}"></lobby> <lobby class="page" [hidden]="currentPage!= 'lobby'"></lobby>
<webview id="community" class="page" [ngClass]="{hide: currentPage!= 'community'}" <webview id="community" class="page" [hidden]=" currentPage!= 'community'"
src="https://ygobbs.com"></webview> src="https://ygobbs.com"></webview>
\ No newline at end of file
/* Master Styles */ /* Master Styles */
h1 { h1 {
color: #369; color: #369;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: 250%; font-size: 250%;
} }
h2, h3 { h2, h3 {
color: #444; color: #444;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-weight: lighter; font-weight: lighter;
} }
body { body {
margin: 2em; 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