Browse Source

[新增]修改字体为思源黑体

zhuzhou
邵佳豪 4 years ago
parent
commit
51992d89c6
  1. 2
      src/app/data-collection/fire-force/fire-force.component.scss
  2. 2
      src/app/data-collection/linkage-forces/linkage-forces.component.scss
  3. 5
      src/app/data-collection/linkage-forces/linkage-forces.component.ts
  4. 2
      src/app/data-collection/water-collection/water-collection.component.scss
  5. 6
      src/app/gis-management/basic-info/basic-info.component.scss
  6. 4
      src/app/gis-management/gis-labeling/shareUrl.scss
  7. BIN
      src/assets/font/SourceHanSansCN-Regular.otf
  8. 9
      src/styles.scss

2
src/app/data-collection/fire-force/fire-force.component.scss

@ -6,7 +6,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

2
src/app/data-collection/linkage-forces/linkage-forces.component.scss

@ -6,7 +6,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

5
src/app/data-collection/linkage-forces/linkage-forces.component.ts

@ -168,7 +168,7 @@ export class LinkageForcesComponent implements OnInit {
} }
ngOnInit(): void { ngOnInit(): void {
this.getAllFireForce() this.getAllFireForce()
window.onload = () => { setTimeout(() => {
var mySwiper = new Swiper('.swiper-container', { var mySwiper = new Swiper('.swiper-container', {
slidesPerView: 10,//每页显示的个数 slidesPerView: 10,//每页显示的个数
slidesPerGroup: 3,//点击一次需要跳多少次 slidesPerGroup: 3,//点击一次需要跳多少次
@ -178,9 +178,6 @@ export class LinkageForcesComponent implements OnInit {
prevEl: '.swiper-button-prev', prevEl: '.swiper-button-prev',
}, },
}) })
}
setTimeout(() => {
this.createMap() this.createMap()
}, 0); }, 0);
} }

2
src/app/data-collection/water-collection/water-collection.component.scss

@ -6,7 +6,7 @@
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
} }

6
src/app/gis-management/basic-info/basic-info.component.scss

@ -18,7 +18,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
color: #333333; color: #333333;
padding: 10px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
@ -31,7 +31,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;
@ -54,7 +54,7 @@ table { text-align: center; border-collapse: collapse; padding:2px;}
p{ p{
height: 14px; height: 14px;
font-size: 14px; font-size: 14px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 14px; line-height: 14px;
color: #333333; color: #333333;

4
src/app/gis-management/gis-labeling/shareUrl.scss

@ -8,7 +8,7 @@
position: relative; position: relative;
.name{ .name{
font-size: 20px; font-size: 20px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #FFFFFF; color: #FFFFFF;
} }
@ -37,7 +37,7 @@
line-height: 36px; line-height: 36px;
background: #EEF1F5; background: #EEF1F5;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #333333; color: #333333;
opacity: 0.4; opacity: 0.4;

BIN
src/assets/font/SourceHanSansCN-Regular.otf

Binary file not shown.

9
src/styles.scss

@ -1,12 +1,19 @@
@import './app/theme.scss'; @import './app/theme.scss';
@import "./app/ngZorroTree.css"; /* 引入组件样式 */ @import "./app/ngZorroTree.css"; /* 引入组件样式 */
@font-face
{
font-family: Regular;
src: url('./assets/font/SourceHanSansCN-Regular.otf'),
}
html,body{ html,body{
width: 100%; width: 100%;
height:100%; height:100%;
margin:0 auto; margin:0 auto;
padding:0; padding:0;
overflow: hidden; overflow: hidden;
font-family: Regular
} }
ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{ ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{
margin:0; margin:0;
@ -112,7 +119,7 @@ table td.mat-footer-cell:last-of-type{
border-radius: 4px; border-radius: 4px;
margin: 0 5px; margin: 0 5px;
font-size: 14px; font-size: 14px;
font-family: Source Han Sans CN; // font-family: Source Han Sans CN;
font-weight: 400; font-weight: 400;
line-height: 36px; line-height: 36px;
color: #0080FF; color: #0080FF;

Loading…
Cancel
Save