Commit 4ed8f8f2 authored by h3remi7's avatar h3remi7

merge

parents 863bb558 62d8a3ef
<<<<<<< HEAD
body { body {
font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif; font-family: "Helvetica Neue", Helvetica, Arial, 'Source Sans Pro', "Microsoft YaHei", 'Microsoft JhengHei', "WenQuanYi Micro Hei", sans-serif;
} }
...@@ -16,6 +17,12 @@ nav.darwin { ...@@ -16,6 +17,12 @@ nav.darwin {
.navbar-right > div, #user > .item { .navbar-right > div, #user > .item {
float: left; float: left;
margin: 0 0.5rem margin: 0 0.5rem
#wrapper {
padding-top: 60px;
/*margin-bottom: 60px;*/
}
.nav-right {
float: right;
} }
#avatar { #avatar {
......
...@@ -63,8 +63,9 @@ ...@@ -63,8 +63,9 @@
</div> </div>
</nav> </nav>
</div>--> </div>-->
<div id="wrapper">
<login></login> <login [hidden]="routingService.component != 'login'"></login>
<store></store> <store [hidden]="routingService.component != 'store'"></store>
<lobby></lobby> <lobby [hidden]="routingService.component != 'lobby'"></lobby>
<community></community> <community [hidden]="routingService.component != 'community'"></community>
\ No newline at end of file </div>
\ No newline at end of file
import { Component } from '@angular/core'; import { Component } from '@angular/core';
declare var process; declare var process;
import { RoutingService } from './routing.service';
@Component({ @Component({
selector: 'mycard', selector: 'mycard',
templateUrl: 'app/mycard.component.html', templateUrl: 'app/mycard.component.html',
...@@ -9,4 +10,5 @@ declare var process; ...@@ -9,4 +10,5 @@ declare var process;
export class MyCardComponent { export class MyCardComponent {
platform = process.platform; platform = process.platform;
constructor(private routingService: RoutingService) { }
} }
...@@ -6,10 +6,13 @@ import { StoreComponent } from './store.component'; ...@@ -6,10 +6,13 @@ import { StoreComponent } from './store.component';
import { LobbyComponent } from './lobby.component'; import { LobbyComponent } from './lobby.component';
import { CommunityComponent } from './community.component'; import { CommunityComponent } from './community.component';
import { RoutingService } from './routing.service';
@NgModule({ @NgModule({
imports: [ BrowserModule ], imports: [ BrowserModule ],
declarations: [ MyCardComponent, LoginComponent, StoreComponent, LobbyComponent, CommunityComponent ], declarations: [ MyCardComponent, LoginComponent, StoreComponent, LobbyComponent, CommunityComponent ],
bootstrap: [ MyCardComponent ] bootstrap: [ MyCardComponent ],
providers: [ RoutingService ],
}) })
export class MyCard { } export class MyCard { }
\ No newline at end of file
import { Injectable } from '@angular/core';
@Injectable()
export class RoutingService {
component = 'lobby';
app;
}
\ No newline at end of file
<!-- Begin page content --> store
<div class="container"> \ No newline at end of file
<div class="m-t-1">
<h1>Sticky footer with fixed navbar</h1>
</div>
<p class="lead">Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added with <code>padding-top: 60px;</code> on the <code>body &gt; .container</code>.</p>
<p>Back to <a href="../sticky-footer">the default sticky footer</a> minus the navbar.</p>
</div>
<footer class="footer">
<div class="container">
<span class="text-muted">Place sticky footer content here.</span>
</div>
</footer>
\ No newline at end of file
version: '{build}'
platform:
- x64
cache:
- node_modules
- app\node_modules
- '%APPDATA%\npm-cache'
- '%USERPROFILE%\.electron'
init:
- git config --global core.autocrlf input
install:
- ps: Install-Product node 6 x64
- git reset --hard HEAD
- npm install npm -g
- npm install electron-builder
- npm install
- npm prune
build_script:
- node --version
- npm --version
- npm run dist
test: off
\ No newline at end of file
...@@ -3,10 +3,13 @@ ...@@ -3,10 +3,13 @@
"description": "mycard", "description": "mycard",
"author": "zh99998 <zh99998@gmail.com>", "author": "zh99998 <zh99998@gmail.com>",
"homepage": "https://mycard.moe", "homepage": "https://mycard.moe",
"version": "3.0.0", "version": "3.0.0-dev.3",
"repository": "github:mycard/mycard",
"scripts": { "scripts": {
"pack": "./node_modules/.bin/build --dir", "pack": "./node_modules/.bin/build --dir",
"dist": "./node_modules/.bin/build", "dist": "./node_modules/.bin/build",
"release": "build",
"electron": "electron",
"start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ", "start": "tsc && concurrently \"npm run tsc:w\" \"npm run lite\" ",
"lite": "lite-server", "lite": "lite-server",
"postinstall": "typings install", "postinstall": "typings install",
...@@ -45,7 +48,7 @@ ...@@ -45,7 +48,7 @@
"build": { "build": {
"productName": "MyCard", "productName": "MyCard",
"appId": "com.mycard.mycard", "appId": "com.mycard.mycard",
"category": "public.app-category.entertainment", "category": "public.app-category.social-networking",
"win": { "win": {
"iconUrl": "http://mycard.moe/logo.png" "iconUrl": "http://mycard.moe/logo.png"
}, },
......
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