odjbin/sist_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

01

Browse Source
This commit is contained in:
clay
2022-01-12 18:53:03 +08:00
parent 4b68da9e32
commit f5d34a00db
9 changed files with 271 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/views/index/components/scientific_research_trends.vue
View File

@@ -25,10 +25,10 @@
</el-row>
<!--科学研究新闻内容-->
<el-row>
<el-col :xs="1" :sm="2" :md="2" :lg="4" :xl="4">
<el-col :xs="1" :sm="2" :md="2" :lg="2.5" :xl="4">
<div class="grid-content"></div>
</el-col>
<el-col class="scientific_context" :xs="22" :sm="20" :md="20" :lg="16" :xl="16">
<el-col class="scientific_context" :xs="22" :sm="20" :md="20" :lg="19" :xl="16">
<el-row>
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
<el-row class="scientific_context_text">
@@ -193,10 +193,10 @@
</el-row>
<!--学术交流-->
<el-row>
<el-col :xs="1" :sm="2" :md="2" :lg="4" :xl="4">
<el-col :xs="1" :sm="2" :md="2" :lg="2.5" :xl="4">
<div class="grid-content"></div>
</el-col>
<el-col class="academia_context" :xs="22" :sm="20" :md="20" :lg="16" :xl="16">
<el-col class="academia_context" :xs="22" :sm="20" :md="20" :lg="19" :xl="16">
<el-row>
<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
<el-row class="academia_context_text">
@@ -343,7 +343,7 @@ export default {
padding-left: 4rem;
.img {
img{
img {
width: 2.6rem;
}
}
@@ -352,9 +352,9 @@ export default {
margin-left: 1rem;
font-size: 1.8rem;
font-weight: 500;
overflow:hidden; //超出的文本隐藏
text-overflow:ellipsis; //溢出用省略号显示
white-space:nowrap; //溢出不换行
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.time {
@@ -395,7 +395,7 @@ export default {
.img {
img{
img {
width: 2.6rem;
}
}
@@ -404,9 +404,9 @@ export default {
margin-left: 1rem;
font-size: 1.8rem;
font-weight: 500;
overflow:hidden; //超出的文本隐藏
text-overflow:ellipsis; //溢出用省略号显示
white-space:nowrap; //溢出不换行
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.time {
@@ -419,4 +419,20 @@ export default {
}
}
@media screen and (min-width: 1100px) and (max-width: 1400px) {
.scientific_context_text {
padding-left: 2rem !important;
.time {
margin-left: 2rem !important;
}
}
.academia_context_text {
padding-left: 2rem !important;
.time{
margin-left: 2rem !important;
}
}
}
</style>