Skip to content

Commit

Permalink
Update theme
Browse files Browse the repository at this point in the history
  • Loading branch information
@CN-Tower
CN-Tower committed Sep 17, 2018
1 parent 4c7bd4a commit 2ab4a6f
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
8 changes: 4 additions & 4 deletions client/src/app/app.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,18 @@ <h3 class="panel-title z-ptt-short hide">{{'fmted' | translate}}</h3>
<a class="links" target="_blank" href="http://github.com/CN-Tower/funclib.js">
http://github.com/CN-Tower/funclib.js
</a><br>
<!--electron ignore sta-->
<!--electron ignore sta_--><!--
<i class="fa fa-star"></i>&nbsp;<strong>{{'download_' | translate}}:</strong>&nbsp;&nbsp;
<a class="links" target="_blank" href="{{updateUrl}}">
zjson-win32-x64.exe (v{{remoteVersion}})
</a><br>
<!--electron ignore end-->
<!--electron enable sta_--><!--
--><!--electron ignore end_-->
<!--electron enable sta-->
<i class="fa fa-star"></i>&nbsp;<strong>{{'website' | translate}}:</strong>&nbsp;&nbsp;
<a class="links" target="_blank" href="http://www.zjson.net">
http://www.zjson.net
</a><br>
--><!--electron enable end_-->
<!--electron enable end-->
</div>
<div [class.hide]="!isShowFmtToTop" id="fmt-to-top" class="zjs-to-Top">
<i class="fa fa-arrow-circle-o-up shadow-ico" title="{{'backToTop' | translate}}"></i>
Expand Down
36 changes: 18 additions & 18 deletions client/src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
this.formated = '';
this.fmtSourcest = '';
if (!this.isOriginEmpty) this.animateGreeting();
/**electron enable sta_*//*
/**electron enable sta*/
fn.defer(() => win.onLinksLoad());
*//**electron enable end_*/
/**electron enable end*/
}

/**
Expand Down Expand Up @@ -737,7 +737,7 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
* 检测、轮询、刷新APP
* =================================*/
checkAndUpdateApp() {
/**electron ignore sta*/
/**electron ignore sta_*//*
this.checkAppVersion(false);
this.refreshVisitCount();
this.getSharedJson(false);
Expand All @@ -746,8 +746,8 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
this.updateUrl = res.updateUrl;
});
fn.interval('refresh-visit-count', 300000, () => this.refreshVisitCount());
/**electron ignore end*/
/**electron enable sta_*//*
*//**electron ignore end_*/
/**electron enable sta*/
fn.defer(() => win.checkAppVersion(res => {
if (res.version !== res.localVersion) {
let ignoreInfo: IgnoreInfo = this.appService.getIgnoreVersion();
Expand All @@ -762,7 +762,7 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
}
}
}));
*//**electron enable end_*/
/**electron enable end*/
this.pollingVisitCount();
fn.interval('polling-visit-count', 15000, () => this.pollingVisitCount());
}
Expand Down Expand Up @@ -803,14 +803,14 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
* =================================*/
pollingVisitCount() {
const userId = this.appService.getUserId();
/**electron ignore sta*/
/**electron ignore sta_*//*
this.appService.pollingVisitCount(userId, this.isOnInit).subscribe((res: any) => {
if (res['vc']) win['vc'] = res.vc;
});
/**electron ignore end*/
/**electron enable sta_*//*
*//**electron ignore end_*/
/**electron enable sta*/
fn.defer(() => win.pollingVisitCount(userId, this.isOnInit));
*//**electron enable end_*/
/**electron enable end*/
this.isOnInit = false;
}

Expand All @@ -835,12 +835,12 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
this.broadcast.hideLoading();
this.alertNotice(this.translate.instant('_shareJsonError'), 'danger');
};
/**electron ignore sta*/
/**electron ignore sta_*//*
this.appService.shareFormated(this.formated).subscribe(success, error);
/**electron ignore end*/
/**electron enable sta_*//*
*//**electron ignore end_*/
/**electron enable sta*/
win.shareFormated(this.formated, this.appService.getUserId(), success, error);
*//**electron enable end_*/
/**electron enable end*/
}

/**
Expand All @@ -856,19 +856,19 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit {
this.broadcast.hideLoading();
this.alertNotice(this.translate.instant('_getJsonError'), 'danger');
};
/**electron ignore sta*/
/**electron ignore sta_*//*
this.appService.getSharedJson(sharedId).subscribe(res => {
this.broadcast.hideLoading();
this.sourcest = res.sharedJson;
}, error);
/**electron ignore end*/
/**electron enable sta_*//*
*//**electron ignore end_*/
/**electron enable sta*/
win.getSharedJson(sharedId, res => {
this.broadcast.hideLoading();
this.sourcest = res.sharedJson;
$('#format-btn').click();
}, error);
*//**electron enable end_*/
/**electron enable end*/
}
if (!sharedId && isFromIpt) {
this.alertNotice(this.translate.instant('_bdSharedLink'), 'danger');
Expand Down
8 changes: 4 additions & 4 deletions client/src/app/monaco-editor/monaco-editor.base.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export class MonacoEditorBase implements AfterViewInit {
}

addLoaderScript() {
/**electron ignore sta*/
/**electron ignore sta_*//*
const loaderScript: HTMLScriptElement = document.createElement('script');
loaderScript.type = 'text/javascript';
loaderScript.src = 'assets/lib/monaco-editor/vs/loader.js';
Expand All @@ -31,13 +31,13 @@ export class MonacoEditorBase implements AfterViewInit {
});
});
document.body.appendChild(loaderScript);
/**electron ignore end*/
/**electron enable sta_*//*
*//**electron ignore end_*/
/**electron enable sta*/
fn.defer(() => win.loadMonacoEditor(() => {
this.defineEditorThemes();
this.broadcast.editorReadyUp();
}));
*//**electron enable end_*/
/**electron enable end*/
}

defineEditorThemes() {
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/shared/theme.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@light-ft-color: #333333;
@dark-ft-color: #999999;

@light-shadow: #999999;
@light-shadow: #aaaaaa;
@dark-shadow: #666666;

@light-bg-color: #ffffff;
Expand Down
2 changes: 1 addition & 1 deletion server/zjson/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ <h2>ZJSON</h2>&nbsp;<h5>.NET</h5>
<script>var win = window;</script>


<script type="text/javascript" src="runtime.6afe30102d8fe7337431.js"></script><script type="text/javascript" src="polyfills.b0205464c9bd4e7fe3b3.js"></script><script type="text/javascript" src="scripts.7f549b325e4ff691defd.js"></script><script type="text/javascript" src="main.bd4f46d30eebd12970eb.js"></script></body></html>
<script type="text/javascript" src="runtime.6afe30102d8fe7337431.js"></script><script type="text/javascript" src="polyfills.b0205464c9bd4e7fe3b3.js"></script><script type="text/javascript" src="scripts.7f549b325e4ff691defd.js"></script><script type="text/javascript" src="main.1f16af2473385f60c2cf.js"></script></body></html>
2 changes: 1 addition & 1 deletion server/zjson/main.bd4f46d30eebd12970eb.js → server/zjson/main.1f16af2473385f60c2cf.js
View file

Large diffs are not rendered by default.

0 comments on commit 2ab4a6f

Please sign in to comment.