diff --git a/src/assets/sass/renderSass/button.scss b/src/assets/sass/renderSass/button.scss index e2bb68d..f9285aa 100644 --- a/src/assets/sass/renderSass/button.scss +++ b/src/assets/sass/renderSass/button.scss @@ -57,6 +57,47 @@ margin: 0; } } + &.primary-button { + //background: var(--color-primary); + background: $--color-primary-button-background; + border: 1px solid #eaecf5; + color: $--color-primary-button-color; + font-size: 14px; + font-weight: 600; + font-family: PingFangSC, PingFang SC; + &:hover { + background: lighten($--color-primary-button-color, 5%); + border: 1px solid #eaecf5; + } + } + &.line-button { + background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + border: unset; + cursor: pointer; + color: #fff; + &:hover { + background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + border: none; + color: #fff; + } + &:active { + background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + border: none; + color: #fff; + } + &:focus { + background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); + border: none; + color: #fff; + } + } + &.el-button--medium { + padding: 8px 20px; + border-radius: 8px; + font-family: PingFangSC, PingFang SC; + font-weight: 500; + font-size: 14px; + } } .el-button--text { @@ -94,6 +135,7 @@ color: $--color-primary-light; &:hover { background-color: $--color-primary-light; + border-color: var(--color-primary); } } &:hover { @@ -146,25 +188,3 @@ border-color: $--color-primary-danger-light; } } - -.line-button { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); - border: unset; - cursor: pointer; - color: #fff; - &:hover { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); - border: none; - color: #fff; - } - &:active { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); - border: none; - color: #fff; - } - &:focus { - background: linear-gradient(311deg, #8d5cff 0%, #026eff 100%); - border: none; - color: #fff; - } -} diff --git a/src/assets/sass/renderSass/input.scss b/src/assets/sass/renderSass/input.scss index 18e2839..e6598aa 100644 --- a/src/assets/sass/renderSass/input.scss +++ b/src/assets/sass/renderSass/input.scss @@ -13,13 +13,21 @@ } } -.el-input--medium { - .el-input__inner { +.el-input--medium, +.el-input--small, +.el-select--medium, +.el-range-editor--medium { + &.el-input__inner { border-radius: 8px; //height: 30px; //line-height: 30px; } - .el-input__icon { + & .el-input__inner { + border-radius: 8px; + //height: 30px; + //line-height: 30px; + } + & .el-input__icon { //line-height: 30px; } } @@ -28,3 +36,91 @@ border-radius: 8px; } } +.el-input, +.el-select, +.el-range-editor { + &.is-active, + &.is-focus { + border-color: $--color-primary; + &:hover { + border-color: $--color-primary; + } + & .el-input__inner { + &:focus { + border-color: $--color-primary; + } + &:hover { + border-color: $--color-primary; + } + &:active { + border-color: $--color-primary; + } + &:focus { + border-color: $--color-primary; + } + &:disabled { + border-color: rgba(0, 0, 0, 0.25); + } + } + } + & .el-input__inner { + &:focus { + border-color: $--color-primary; + } + &:hover { + border-color: $--color-primary; + } + &:active { + border-color: $--color-primary; + } + &:focus { + border-color: $--color-primary; + } + } + &.is-disabled { + border-color: transparent; + & .el-input__inner { + border-color: transparent !important; + &:focus { + border-color: transparent !important; + } + &:hover { + border-color: transparent !important; + } + &:active { + border-color: transparent !important; + } + } + } +} + +.el-select-dropdown__item { + &.selected { + color: $--color-primary; + } +} + +.el-date-table { + & td { + &.available { + &:hover { + color: $--color-primary; + } + } + &.today { + span { + color: $--color-primary; + } + } + &.end-date { + span { + background: lighten($--color-primary, 5%); + } + } + &.start-date { + span { + background: lighten($--color-primary, 5%); + } + } + } +} diff --git a/src/assets/sass/renderSass/label.scss b/src/assets/sass/renderSass/label.scss index 9a85b87..0574a99 100644 --- a/src/assets/sass/renderSass/label.scss +++ b/src/assets/sass/renderSass/label.scss @@ -1,16 +1,12 @@ .el-form--label-top { & .el-form-item__label { - line-height: 30px; padding: 0; + font-family: PingFangSC, PingFang SC; + font-weight: 500; + font-size: 13px; + color: $--color-primary-label; + //line-height: 18px; + text-align: left; + font-style: normal; } } - -.el-form-item__label { - font-family: PingFangSC, PingFang SC; - font-weight: 500; - font-size: 13px; - color: $--color-primary-label; - line-height: 18px; - text-align: left; - font-style: normal; -} diff --git a/src/assets/sass/renderSass/table.scss b/src/assets/sass/renderSass/table.scss index 46dec45..022fe2d 100644 --- a/src/assets/sass/renderSass/table.scss +++ b/src/assets/sass/renderSass/table.scss @@ -36,3 +36,25 @@ border-radius: 5px; padding: 5px; } + +.el-pagination { + &.is-background { + & .el-pager { + li { + &:not(.disabled) { + &.active { + background-color: $--color-primary; + } + &:hover { + color: $--color-primary-light; + } + } + } + } + } +} + +//.el-pagination.is-background .el-pager li:not(.disabled).active { +// +//} +//.el-pagination.is-background .el-pager li:not(.disabled):hover diff --git a/src/assets/sass/renderSass/theme.scss b/src/assets/sass/renderSass/theme.scss index dcb9309..228cc21 100644 --- a/src/assets/sass/renderSass/theme.scss +++ b/src/assets/sass/renderSass/theme.scss @@ -1,5 +1,5 @@ //主题色 -$--color-primary: #0a6dff; //主题色 +$--color-primary: #4f47f5ff; //主题色 $--color-primary-light: lighten($--color-primary, 5%); //高亮颜色 $--color-primary-disabled: #155aef24; $--color-primary-danger: #ff0000; @@ -10,10 +10,12 @@ $--color-primary-desc-text-drank: #999; $--color-primary-table-hover: #eff0f8; $--color-primary-table-button-hover: #e3e5f1; $--color-primary-label: #70778d; +$--color-primary-button-color: #4f47f5; +$--color-primary-button-background: #4f47f51a; :root { - --swiper-theme-color: #0a6dff; - --color-primary: #0a6dff; + --swiper-theme-color: #4f47f5ff; + --color-primary: #4f47f5ff; --color-primary-disabled: #155aef24; --color-primary-danger: #ff0000; } diff --git a/src/assets/sass/renderUi.scss b/src/assets/sass/renderUi.scss index 20759a0..8be7a31 100644 --- a/src/assets/sass/renderUi.scss +++ b/src/assets/sass/renderUi.scss @@ -194,3 +194,20 @@ body, width: 0px; height: 0px; } + +.render-container { + height: calc(100vh - 20px); + background: #fff; + border-radius: 7px; + margin: 10px 10px 10px 0; + padding: 20px; + overflow-y: auto; + &::-webkit-scrollbar { + width: 0px; + } +} + +.header-icon { + width: 50px; + height: 50px; +} diff --git a/src/components/RenderDialog/index.vue b/src/components/RenderDialog/index.vue index 13381eb..e36e4ea 100644 --- a/src/components/RenderDialog/index.vue +++ b/src/components/RenderDialog/index.vue @@ -5,8 +5,8 @@
描述:{{ knowledgeDesc }}
-分段模式:{{ segmentedMode | filterSegmentedMode }}
-