From 8e1868d04772abd33c2d79f47003318c7a06d6ee Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Fri, 29 Jun 2018 08:46:45 +0800 Subject: [PATCH] no message Former-commit-id: 99019c7349357c80c2f4c0009050e0b10188ad1d [formerly 99019c7349357c80c2f4c0009050e0b10188ad1d [formerly 99019c7349357c80c2f4c0009050e0b10188ad1d [formerly 99019c7349357c80c2f4c0009050e0b10188ad1d [formerly 84fbaed2aabc8b01167756d4699f252e7c42879c [formerly 66080f92db3772c5bd3a386e3a87621371a29bfe]]]]] Former-commit-id: fb02670140254bd2a7daf3b9390eb77cc27bd64d Former-commit-id: b0e5e3f5a34c53003e6df305fb9dd3ae71012154 Former-commit-id: 442824b2d29a025ac5c6cfd21e9dc94e76418507 [formerly 7c478f59795554d36498126909179a4a7dd2fb50] Former-commit-id: 90f8a46b9718b4231b3d0a44ab7fb2e9ecc55ad0 Former-commit-id: 4d727ed13ef148bff51f186b893eb5efc8578a98 Former-commit-id: 84349687c131e6f795d6add7cb965b5d986ff342 Former-commit-id: 26dd356ec7bdee47667d78d6180a596381372ff6 Former-commit-id: 946e2b2a0226949902236a4bc049732c65d32635 --- src/assets/style/theme/d2/setting.scss | 3 +++ src/assets/style/theme/line/setting.scss | 5 ++++- src/assets/style/theme/star/setting.scss | 3 +++ src/assets/style/theme/theme.scss.REMOVED.git-id | 2 +- src/assets/style/theme/tomorrow-night-blue/setting.scss | 3 +++ src/assets/style/theme/violet/setting.scss | 3 +++ src/components/core/d2-multiple-page-control/index.vue | 2 +- 7 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/assets/style/theme/d2/setting.scss b/src/assets/style/theme/d2/setting.scss index 7c654fd6..0285d802 100644 --- a/src/assets/style/theme/d2/setting.scss +++ b/src/assets/style/theme/d2/setting.scss @@ -10,8 +10,11 @@ $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid #cfd7e5; $theme-container-border-outer: 1px solid #cfd7e5; + $theme-multiple-page-control-color: $color-text-normal; $theme-multiple-page-control-color-active: #2f74ff; +$theme-multiple-page-control-nav-prev-color: #cfd7e5; +$theme-multiple-page-control-nav-next-color: #cfd7e5; $theme-multiple-page-control-border-color: #cfd7e5; $theme-multiple-page-control-border-color-active: #FFF; $theme-multiple-page-control-background-color: #cfd7e5; diff --git a/src/assets/style/theme/line/setting.scss b/src/assets/style/theme/line/setting.scss index 257d25fc..1b56ce24 100644 --- a/src/assets/style/theme/line/setting.scss +++ b/src/assets/style/theme/line/setting.scss @@ -9,9 +9,12 @@ $theme-bg-mask: rgba(#000, 0); $theme-container-background-color: rgba(#FFF, .8); $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid $color-border-2; -$theme-container-border-outer: 1px solid $color-border-1; +$theme-container-border-outer: 1px solid #cfd7e5; + $theme-multiple-page-control-color: #FFF; $theme-multiple-page-control-color-active: $color-text-normal; +$theme-multiple-page-control-nav-prev-color: #cfd7e5; +$theme-multiple-page-control-nav-next-color: #cfd7e5; $theme-multiple-page-control-border-color: #cfd7e5; $theme-multiple-page-control-border-color-active: #FFF; $theme-multiple-page-control-background-color: #cfd7e5; diff --git a/src/assets/style/theme/star/setting.scss b/src/assets/style/theme/star/setting.scss index 59e4ef67..69d8f836 100644 --- a/src/assets/style/theme/star/setting.scss +++ b/src/assets/style/theme/star/setting.scss @@ -10,8 +10,11 @@ $theme-container-background-color: rgba(#FFF, .9); $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid #114450; $theme-container-border-outer: 1px solid #114450; + $theme-multiple-page-control-color: #FFF; $theme-multiple-page-control-color-active: $color-text-normal; +$theme-multiple-page-control-nav-prev-color: #FFF; +$theme-multiple-page-control-nav-next-color: #FFF; $theme-multiple-page-control-border-color: #114450; $theme-multiple-page-control-border-color-active: #FFF; $theme-multiple-page-control-background-color: rgba(#FFF, .5); diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id index a27e4671..4d00b19c 100644 --- a/src/assets/style/theme/theme.scss.REMOVED.git-id +++ b/src/assets/style/theme/theme.scss.REMOVED.git-id @@ -1 +1 @@ -3fd0d098a5ee6b4dc08df5cbf5c22be416b17c43 \ No newline at end of file +706a6475369208aaac38e443fafd3dd14096fe7c \ No newline at end of file diff --git a/src/assets/style/theme/tomorrow-night-blue/setting.scss b/src/assets/style/theme/tomorrow-night-blue/setting.scss index 9a381aa7..de637b5b 100644 --- a/src/assets/style/theme/tomorrow-night-blue/setting.scss +++ b/src/assets/style/theme/tomorrow-night-blue/setting.scss @@ -10,8 +10,11 @@ $theme-container-background-color: rgba(#FFF, 1); $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid $color-border-1; $theme-container-border-outer: 1px solid #002253; + $theme-multiple-page-control-color: #FFF; $theme-multiple-page-control-color-active: $color-text-normal; +$theme-multiple-page-control-nav-prev-color: #FFF; +$theme-multiple-page-control-nav-next-color: #FFF; $theme-multiple-page-control-border-color: #002253; $theme-multiple-page-control-border-color-active: #FFF; $theme-multiple-page-control-background-color: rgba(#FFF, .2); diff --git a/src/assets/style/theme/violet/setting.scss b/src/assets/style/theme/violet/setting.scss index 26634b96..441b1b2c 100644 --- a/src/assets/style/theme/violet/setting.scss +++ b/src/assets/style/theme/violet/setting.scss @@ -10,8 +10,11 @@ $theme-container-background-color: #FFF; $theme-container-header-footer-background-color: #FFF; $theme-container-border-inner: 1px solid $color-border-2; $theme-container-border-outer: 1px solid #8C40E2; + $theme-multiple-page-control-color: #FFF; $theme-multiple-page-control-color-active: $color-text-normal; +$theme-multiple-page-control-nav-prev-color: #FFF; +$theme-multiple-page-control-nav-next-color: #FFF; $theme-multiple-page-control-border-color: #8C40E2; $theme-multiple-page-control-border-color-active: #FFF; $theme-multiple-page-control-background-color: rgba(#FFF, .3); diff --git a/src/components/core/d2-multiple-page-control/index.vue b/src/components/core/d2-multiple-page-control/index.vue index 261f4379..69ffb473 100644 --- a/src/components/core/d2-multiple-page-control/index.vue +++ b/src/components/core/d2-multiple-page-control/index.vue @@ -8,7 +8,7 @@ v-for="n in 20" :key="n" :label="`页面 ${n}`" - :name="n"> + :name="`page${n}`">