Commit f07b1e4a by 林家欣

修改BootStrap4和flex1冲突问题

parent 7b28148b
......@@ -593,7 +593,7 @@ button::-moz-focus-inner {
.tox .tox-collection__item-label {
color: currentColor;
display: inline-block;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
font-size: 14px;
font-style: normal;
......@@ -1147,7 +1147,7 @@ button::-moz-focus-inner {
.tox .tox-dialog__body {
color: #222f3e;
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
font-size: 16px;
font-style: normal;
......@@ -1196,7 +1196,7 @@ button::-moz-focus-inner {
.tox .tox-dialog__body-content {
box-sizing: border-box;
display: flex;
flex-grow: 1;
flex: 1;
flex-direction: column;
-ms-flex-preferred-size: auto;
max-height: 650px;
......@@ -1339,17 +1339,17 @@ button::-moz-focus-inner {
}
.tox .tox-dialog__body-iframe {
display: flex;
flex-grow: 1;
flex: 1;
flex-direction: column;
-ms-flex-preferred-size: auto;
}
.tox .tox-dialog__body-iframe .tox-navobj {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-dialog__body-iframe .tox-navobj :nth-child(2) {
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
height: 100%;
}
......@@ -1409,7 +1409,7 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-dropzone-container {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-dropzone {
......@@ -1430,7 +1430,7 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-edit-area {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
overflow: hidden;
position: relative;
......@@ -1439,7 +1439,7 @@ body.tox-dialog__disable-scroll {
background-color: #fff;
border: 0;
box-sizing: border-box;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
height: 100%;
position: absolute;
......@@ -1483,7 +1483,7 @@ body.tox-dialog__disable-scroll {
transition-delay: 0s;
}
.tox .tox-control-wrap {
flex-grow: 1;
flex: 1;
position: relative;
}
.tox .tox-control-wrap:not(.tox-control-wrap--status-invalid) .tox-control-wrap__status-icon-invalid,
......@@ -1604,7 +1604,7 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-form {
display: flex;
flex-grow: 1;
flex: 1;
flex-direction: column;
-ms-flex-preferred-size: auto;
}
......@@ -1613,7 +1613,7 @@ body.tox-dialog__disable-scroll {
margin-bottom: 4px;
}
.tox .tox-form-group--maximize {
flex-grow: 1;
flex: 1;
}
.tox .tox-form__group--error {
color: #c00;
......@@ -1646,21 +1646,21 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-form__group--stretched {
display: flex;
flex-grow: 1;
flex: 1;
flex-direction: column;
-ms-flex-preferred-size: auto;
}
.tox .tox-form__group--stretched .tox-textarea {
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-form__group--stretched .tox-navobj {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-form__group--stretched .tox-navobj :nth-child(2) {
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
height: 100%;
}
......@@ -1827,7 +1827,7 @@ body.tox-dialog__disable-scroll {
background: url(data:image/gif;base64,R0lGODdhDAAMAIABAMzMzP///ywAAAAADAAMAAACFoQfqYeabNyDMkBQb81Uat85nxguUAEAOw==);
}
.tox .tox-image-tools__toolbar > .tox-spacer {
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-croprect-block {
......@@ -2356,7 +2356,7 @@ body.tox-dialog__disable-scroll {
.tox .tox-slider {
align-items: center;
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
height: 24px;
justify-content: center;
......@@ -2848,7 +2848,7 @@ body.tox-dialog__disable-scroll {
border: 1px solid #cccccc;
border-radius: 3px;
display: flex;
flex-grow: 1;
flex: 1;
position: relative;
}
/* stylelint-disable */
......@@ -2868,12 +2868,12 @@ body.tox-dialog__disable-scroll {
}
.tox .tox-dialog__content-js {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-dialog__body-content .tox-collection {
display: flex;
flex-grow: 1;
flex: 1;
-ms-flex-preferred-size: auto;
}
.tox .tox-image-tools-edit-panel {
......
......@@ -229,7 +229,7 @@
background-color: #fff;
border-bottom: 1px solid #cccccc;
display: flex;
flex-grow: 1;
flex: 1;
height: 2.5em;
width: 100%;
/* Make it no larger than the toolstrip, so that it needs to scroll */
......@@ -244,7 +244,7 @@
align-items: center;
display: flex;
height: 100%;
flex-grow: 1;
flex: 1;
}
.tinymce-mobile-toolstrip .tinymce-mobile-toolbar:not(.tinymce-mobile-context-toolbar) .tinymce-mobile-toolbar-group.tinymce-mobile-exit-container {
background: #f44336;
......@@ -279,7 +279,7 @@
align-items: center;
display: flex;
height: 100%;
flex-grow: 1;
flex: 1;
padding-bottom: 0.4em;
padding-top: 0.4em;
/* Make any buttons appearing on the left and right display in the centre (e.g. color edges) */
......@@ -371,7 +371,7 @@
}
.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider {
display: flex;
flex-grow: 1;
flex: 1;
margin-left: 0;
margin-right: 0;
padding: 0.28em 0;
......@@ -386,7 +386,7 @@
.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider .tinymce-mobile-slider-size-container .tinymce-mobile-slider-size-line {
background: #cccccc;
display: flex;
flex-grow: 1;
flex: 1;
height: 0.2em;
margin-bottom: 0.3em;
margin-top: 0.3em;
......@@ -404,7 +404,7 @@
.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-slider.tinymce-mobile-hue-slider-container .tinymce-mobile-slider-gradient-container .tinymce-mobile-slider-gradient {
background: linear-gradient(to right, hsl(0, 100%, 50%) 0%, hsl(60, 100%, 50%) 17%, hsl(120, 100%, 50%) 33%, hsl(180, 100%, 50%) 50%, hsl(240, 100%, 50%) 67%, hsl(300, 100%, 50%) 83%, hsl(0, 100%, 50%) 100%);
display: flex;
flex-grow: 1;
flex: 1;
height: 0.2em;
margin-bottom: 0.3em;
margin-top: 0.3em;
......@@ -456,7 +456,7 @@
align-items: center;
display: flex;
height: 100%;
flex-grow: 1;
flex: 1;
}
.tinymce-mobile-toolstrip .tinymce-mobile-toolbar.tinymce-mobile-context-toolbar .tinymce-mobile-toolbar-group .tinymce-mobile-serializer-wrapper {
flex-direction: column;
......
......@@ -357,7 +357,7 @@
.el-range-input {
background: none;
color: $color;
flex-grow: 1;
flex: 1;
font-size: calcvw(14);
&::placeholder {
color: $placeholderColor;
......
......@@ -79,7 +79,7 @@ $dialog-border-radius: 20px;
border-radius: $dialog-border-radius $dialog-border-radius 0 0;
.el-dialog__title {
flex-grow: 1;
flex: 1;
font-size: 21px;
font-weight: bold;
color:#8A4E22;
......
......@@ -34,7 +34,7 @@ export default {
color: #454545;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -80,7 +80,7 @@ export default {
transform: rotate(45deg);
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -34,7 +34,7 @@ export default {
color: #454545;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -34,7 +34,7 @@ export default {
color: #454545;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -39,7 +39,7 @@ export default {
padding-left: 30px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
}
&:nth-child(3) {
width: 125px;
......
......@@ -86,7 +86,7 @@ export default {
color: rgba(0, 121, 158, 1);
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -70,7 +70,7 @@ export default {
cursor: pointer;
span {
&:nth-child(1) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -82,7 +82,7 @@ export default {
flex-wrap: wrap;
//justify-content: space-around;
li {
flex-grow: 1;
flex: 1;
margin: 0 15px;
padding: 15px 0;
text-align: center;
......
......@@ -31,7 +31,7 @@ export default {
padding: 20px 0;
margin: 0;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -45,7 +45,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
cursor: pointer;
}
......
......@@ -50,7 +50,7 @@ export default {
margin: 0;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
color: #414345;
......@@ -66,7 +66,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -29,7 +29,7 @@ export default {
margin: 0;
cursor: pointer;
.li {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
font-size: 14px;
......@@ -45,7 +45,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -33,7 +33,7 @@ export default {
margin: 0;
cursor: pointer;
.li {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
font-size: 14px;
......@@ -49,7 +49,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -28,7 +28,7 @@ export default {
padding: 6.1px 0;
margin: 0;
.li {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
cursor: pointer;
......@@ -45,7 +45,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -1386,7 +1386,6 @@ export default {
left: 0;
&::before {
// background: url("../../assets/image/home/prevArrow-hover.png") no-repeat;
background-size: 100% 100%;
content: "";
}
......@@ -1398,7 +1397,6 @@ export default {
justify-content: flex-end;
&::before {
// background: url("../../assets/image/home/nextArrow-hover.png") no-repeat;
background-size: 100% 100%;
content: "";
}
......@@ -1423,6 +1421,7 @@ export default {
height: 18px;
background: url("../../assets/image/home/prevArrow-hover.png")
no-repeat;
background-size: 100% 100%;
}
}
......@@ -1436,6 +1435,7 @@ export default {
height: 18px;
background: url("../../assets/image/home/nextArrow-hover.png")
no-repeat;
background-size: 100% 100%;
}
}
}
......@@ -1446,18 +1446,16 @@ export default {
align-items: center;
justify-content: center;
height: 20px;
line-height: 20px;
li {
width: 10px;
height: 10px;
&.slick-active {
.custom-dot {
background: #ffffff;
opacity: 1;
}
}
.custom-dot {
border-radius: 50%;
width: 100%;
......@@ -1929,7 +1927,7 @@ export default {
border-bottom: 1px solid #c5d8ee;
.nav-item {
flex-grow: 1;
flex: 1;
}
span {
......
......@@ -615,7 +615,7 @@ export default {
}
.value {
flex-grow: 1;
flex: 1;
padding-left: 10px;
color: #414345;
overflow: hidden;
......
......@@ -306,7 +306,7 @@ export default {
.gs-ac-st-table {
width: 100%;
flex-grow: 1;
flex: 1;
overflow: hidden;
}
......
......@@ -214,7 +214,7 @@ export default {
.gs-ac-st-table {
width: 100%;
flex-grow: 1;
flex: 1;
overflow: hidden;
}
......
......@@ -215,7 +215,7 @@ export default {
.gs-ac-st-table {
width: 100%;
flex-grow: 1;
flex: 1;
overflow: hidden;
}
......
......@@ -235,7 +235,7 @@ export default {
.gs-ac-st-table {
width: 100%;
flex-grow: 1;
flex: 1;
overflow: hidden;
}
......
......@@ -75,7 +75,7 @@ $dialog-border-radius: 20px;
.el-dialog__title {
flex-grow: 1;
flex: 1;
font-size: 14px;
color:#fff!important;
line-height: 60px;
......
......@@ -34,7 +34,7 @@ export default {
color: #454545;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -33,7 +33,7 @@ export default {
margin: 0;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
......
......@@ -29,7 +29,7 @@ export default {
margin: 0;
cursor: pointer;
>div {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -45,7 +45,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
cursor: pointer;
a{
......
......@@ -611,7 +611,7 @@ export default {
@include ellipsis;
font-size: 14px;
color: #414345;
flex-grow: 1;
flex: 1;
}
}
}
......
......@@ -354,15 +354,18 @@ export default {
padding: 10px 0;
margin: 0;
cursor: pointer;
position: relative;
> div {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
@include ellipsis;
font-size: 13px;
img {
position: absolute;
left: -4px;
top: 50%;
transform: translateY(-50%);
left: -20px;
}
span {
display: inline-block;
......@@ -370,7 +373,7 @@ export default {
width: 20px;
}
&.name {
flex-grow: 1;
flex: 1;
@include ellipsis;
cursor: pointer;
}
......
......@@ -367,16 +367,18 @@ export default {
justify-content: space-between;
padding: 10px 0;
margin: 0;
position: relative;
> div {
flex-grow: 1;
flex: 1;
display: flex;
align-items: center;
@include ellipsis;
font-size: 13px;
img {
position: absolute;
left: -4px;
top: 50%;
transform: translateY(-50%);
left: -20px;
}
span {
display: inline-block;
......@@ -384,7 +386,7 @@ export default {
width: 20px;
}
&.name {
flex-grow: 1;
flex: 1;
@include ellipsis;
cursor: pointer;
}
......
......@@ -37,7 +37,7 @@ export default {
padding-left: 30px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
}
&:nth-child(3) {
width: 125px;
......
......@@ -163,7 +163,7 @@ export default {
}
.value {
flex-grow: 1;
flex: 1;
font-size: 14px;
font-weight: 400;
color: #414345;
......
......@@ -34,7 +34,7 @@ export default {
color: #454545;
cursor: pointer;
.list-left {
flex-grow: 1;
// flex: 1;
display: flex;
align-items: center;
@include ellipsis;
......@@ -48,7 +48,7 @@ export default {
margin-right: 10px;
}
&:nth-child(2) {
flex-grow: 1;
flex: 1;
@include ellipsis;
}
}
......
......@@ -221,7 +221,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
flex-grow: 1;
flex: 1;
padding: 20px 20px;
.title {
......
......@@ -82,13 +82,13 @@ export default {
}
.body {
flex-grow: 1;
flex: 1;
max-width: 1500px;
display: flex;
flex-direction: column;
.content {
flex-grow: 1;
flex: 1;
padding-top: 148px;
text-align: center;
}
......
......@@ -32,7 +32,7 @@ export default {
align-items: center;
justify-content: space-between;
.cate-left{
flex-grow: 1;
flex: 1;
span{
cursor: pointer;
}
......
......@@ -27,7 +27,7 @@ export default {
align-items: center;
justify-content: space-between;
.cate-left{
flex-grow: 1;
flex: 1;
text-align: center;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment