Skip to content

M
mycard
Commit 69014ef8 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'v3-workon' of git.mycard.moe:mycard/mycard into v3-workon

parents c081fbf4 44ab360a
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
package.json
View file @ 69014ef8
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
"scripts": { "scripts": {
"start": "tsc && electron .", "start": "tsc && electron .",
"lint": "tslint ./app/*.ts -t verbose", "lint": "tslint ./app/*.ts -t verbose",
"pack": "tsc && build --dir", "pack": "tsc && electron-builder --dir",
"dist": "tsc && build", "dist": "tsc && electron-builder",
"release": "tsc && build", "release": "tsc && electron-builder",
"build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js", "build:aot": "ngc -p tsconfig-aot.json && rollup -c rollup-config.js",
"tsc": "tsc", "tsc": "tsc",
"i18n": "ng-xi18n --i18nFormat 'xlf2' && sed -i.bak 's/source-language=\"en\"/source-language=\"zh-CN\"/' messages.xlf", "i18n": "ng-xi18n --i18nFormat 'xlf2' && sed -i.bak 's/source-language=\"en\"/source-language=\"zh-CN\"/' messages.xlf",
......
styles.css
View file @ 69014ef8
...@@ -124,14 +124,14 @@ body.resizing /deep/ * { ...@@ -124,14 +124,14 @@ body.resizing /deep/ * {
color:#000; color:#000;
} }
.loading { #loading {
height:100%; height:100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-direction:column; flex-direction:column;
} }
.loading p{ #loading p{
position:relative; position:relative;
top:-15px; top:-15px;
left:10px; left:10px;
...@@ -141,12 +141,12 @@ body.resizing /deep/ * { ...@@ -141,12 +141,12 @@ body.resizing /deep/ * {
text-shadow: 0 3px 8px rgba(0,0,0,0.1); text-shadow: 0 3px 8px rgba(0,0,0,0.1);
} }
.loading p>span{ #loading p>span{
opacity:0; opacity:0;
} }
.loading p>span:nth-child(1) {animation:show 2s infinite 0.0s linear;} #loading p>span:nth-child(1) {animation:show 2s infinite 0.0s linear;}
.loading p>span:nth-child(2) {animation:show 2s infinite 0.2s linear;} #loading p>span:nth-child(2) {animation:show 2s infinite 0.2s linear;}
.loading p>span:nth-child(3) {animation:show 2s infinite 0.4s linear;} #loading p>span:nth-child(3) {animation:show 2s infinite 0.4s linear;}
@keyframes show{ @keyframes show{
from{} from{}
...@@ -156,7 +156,7 @@ body.resizing /deep/ * { ...@@ -156,7 +156,7 @@ body.resizing /deep/ * {
71% {opacity:0;} 71% {opacity:0;}
to {} to {}
} }
.loading>img{ #loading>img{
width:300px; width:300px;
} }
@keyframes zhuan{ @keyframes zhuan{
......
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