cdia/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop-3'

Browse Source
This commit is contained in:
zhouyuejun
2018-12-19 13:43:24 +08:00
parent c45be7e43d 80de841e7f
commit 633f3fb560
30 changed files with 433 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/carousel/carousel.component.html
+12 -2
View File
@@ -1,5 +1,15 @@
<div class="main-page">
<div class="page-content">
<div class="main-page breadcrumb-main-content">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>
行李转盘
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="page-content breadcrumb-main-content card">
<div class="search-filter mb-3">
<div class="first-condition row">
<div class="line-operator-left input-container mb-3 col-xlg-8 col-mlg-8 col-xl-8 col-lg-10">
src/app/pages/basic-data/carousel/carousel.component.scss
+18 -13
View File
@@ -2,23 +2,15 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 15px 10px;
background-color: #fff;
padding: 16px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
padding: 10px 20px;
// padding: 10px 20px;
// overflow-y: scroll;
// height: 100%;
.search-filter {
padding: 0 15px;
.first-condition {
.line-operator-right {
text-align: right;
padding: 0;
.btn-info {
background-color: rgb(122, 156, 204);
border-color: rgb(122, 156, 204);
}
}
}
.input-container {
padding: 0;
> .form-control {
@@ -54,6 +46,19 @@
}
}
}
.navigation{
padding-bottom: 16px;
}
.breadcrumb-main-container {
padding: 20px 20px;
background-color: #f0f0f0;
}
.card{
background: #fff;
padding: 20px;
box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
border-radius: 0;
}
}
@media screen and (max-width: 991px) {