diff --git a/components/uni-im-info-card/uni-im-info-card.vue b/components/uni-im-info-card/uni-im-info-card.vue index 8945f6cc6d045891949a2882ef287b224a69cee9..91d6832afe9d4dd882c8e8cbe1137d85629f8225 100644 --- a/components/uni-im-info-card/uni-im-info-card.vue +++ b/components/uni-im-info-card/uni-im-info-card.vue @@ -140,7 +140,7 @@ justify-content: center; overflow: hidden; margin-left: 5px; - + flex-shrink: 1; .row { flex-direction: row; align-items: center; @@ -212,7 +212,8 @@ .note-box { flex-direction: row; overflow: hidden; - align-items: center; + align-items: center; + flex-shrink: 1; .red-note { font-size: 12px; @@ -220,7 +221,7 @@ color: #f00; } - .note { + .note { font-size: 14px; color: #aaa; @include ellipsis; diff --git a/components/uni-im-msg/types/text.vue b/components/uni-im-msg/types/text.vue index 9e0fbd00f49b1e7b8007480bf323ccf0406632d5..7a20c1a16344f19f602229a0439cd4920ed0ec52 100644 --- a/components/uni-im-msg/types/text.vue +++ b/components/uni-im-msg/types/text.vue @@ -84,6 +84,7 @@ border-radius: 10px; background-color: #FFFFFF; min-width: 30px; + flex-shrink: 1; .msg-text { padding: 10px; font-size: 15px; diff --git a/static/flex.scss b/static/flex.scss index e3f984470783bc1099c3c2fb081055ab8dc2eb00..0b46137b1a49f21dfff84ab534728831b5181bae 100644 --- a/static/flex.scss +++ b/static/flex.scss @@ -1,16 +1,42 @@ -page,view, -::v-deep view{ - display: flex; - flex-direction: column; - box-sizing: border-box; -} - -page,page ::v-deep { - text,button,scroll-view { +page ::v-deep { + uni-view, + uni-label, + uni-swiper-item, + uni-scroll-view { + display: flex; + flex-shrink: 0; + flex-grow: 0; + flex-basis: auto; + align-items: stretch; + align-content: flex-start; + } + + uni-button{ + margin: 0; + } + + uni-view, + uni-label, + uni-swiper-item { + flex-direction: column; + } + + + uni-view, + uni-image, + uni-input, + uni-scroll-view, + uni-swiper, + uni-swiper-item, + uni-text, + uni-textarea, + uni-video { + position: relative; + border: 0px solid #000000; box-sizing: border-box; } - label { - display: flex; + + uni-swiper-item { + position: absolute; } -} - +} \ No newline at end of file