test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-03 04:18:29 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Layout 改成flex 布局

Browse Source
This commit is contained in:
2betop 2020-09-01 20:03:07 +08:00
parent 09cf30a541
commit e6bed8f554
1 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
scss/layout/_layout.scss
View File

@ -9,7 +9,6 @@ body {
}
.#{$ns}Layout {
height: 100%;
min-height: 100%;
width: 100%;
position: relative;
@ -97,7 +96,7 @@ body {
}
&-aside {
float: left;
position: relative;
background: $Layout-aside-bg;
color: $Layout-aside-color;
@ -128,11 +127,6 @@ body {
}
}
&-content {
height: 100%;
@include clearfix();
}
// &-content--full {
// position: absolute;
// top: $Layout-header-height;
@ -159,10 +153,6 @@ body {
padding-bottom: 0;
}
&-content &-body {
float: left;
}
&-footer {
position: absolute;
bottom: 0;
@ -192,10 +182,10 @@ body {
}
@include media-breakpoint-down(sm) {
.#{$ns}Layout {
// Layout 层没有出现滚动条件，导致移动端无法响应固定顶部/底部效果
// overflow-x: hidden;
}
// .#{$ns}Layout {
// Layout 层没有出现滚动条件，导致移动端无法响应固定顶部/底部效果
// overflow-x: hidden;
// }
.#{$ns}Layout-content {
transition: transform 0.2s ease;
@ -244,6 +234,22 @@ body {
@include media-breakpoint-up(md) {
.#{$ns}Layout {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: stretch;
&-header,
&-footer {
width: 100%;
}
&-content {
flex-grow: 1;
width: 0;
position: relative;
}
&--boxed {
width: px2rem(760px);
@ -256,6 +262,7 @@ body {
&-brandBar,
&-aside {
width: $Layout-aside-width;
transition: width 0.3s ease;
}
&-brandBar {
@ -264,9 +271,9 @@ body {
&--withAside {
.#{$ns}Layout-headerBar,
.#{$ns}Layout-content,
.#{$ns}Layout-footer {
margin-left: $Layout-aside-width;
transition: margin 0.3s ease;
}
}
@ -302,7 +309,6 @@ body {
&.#{$ns}Layout--withAside {
.#{$ns}Layout-headerBar,
.#{$ns}Layout-content,
.#{$ns}Layout-footer {
margin-left: $Layout-aside--folded-width;
}
@ -336,12 +342,13 @@ body {
top: $Layout-header-height;
bottom: 0;
left: 0;
width: $Layout-aside-width - px2rem(1px);
width: inherit;
z-index: $zindex-fixed;
}
.#{$ns}Layout-asideInner {
width: $Layout-aside-width + $scrollbar-width;
width: calc(100% + 17px);
position: relative;
height: 100%;
overflow-x: hidden;
@ -353,41 +360,38 @@ body {
}
&::-webkit-scrollbar:vertical {
width: $scrollbar-width;
}
& > * {
width: $Layout-aside-width;
width: 17px;
}
}
}
&--asideFixed.#{$ns}Layout--folded {
.#{$ns}Layout-aside {
position: static;
}
// &--asideFixed.#{$ns}Layout--folded {
// .#{$ns}Layout-aside {
// position: static;
// }
.#{$ns}Layout-brandBar {
position: static;
}
// .#{$ns}Layout-brandBar {
// position: static;
// }
.#{$ns}Layout-asideWrap {
overflow: visible;
position: relative;
top: 0;
z-index: 15;
width: $Layout-aside--folded-width - px2rem(1px);
}
// .#{$ns}Layout-asideWrap {
// overflow: visible;
// position: relative;
// height: 100%;
// top: 0;
// z-index: 15;
// width: $Layout-aside--folded-width - px2rem(1px);
// }
.#{$ns}Layout-asideInner {
overflow: visible;
width: $Layout-aside--folded-width + $scrollbar-width;
// .#{$ns}Layout-asideInner {
// overflow: visible;
// width: $Layout-aside--folded-width + $scrollbar-width;
> * {
width: $Layout-aside--folded-width;
}
}
}
// > * {
// width: $Layout-aside--folded-width;
// }
// }
// }
&--sm:not(.#{$ns}Layout--folded) {
.#{$ns}Layout-brand,