diff --git a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc b/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc index cec85b8d..0f7d0d9a 100644 --- a/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc +++ b/client/components/Reader/SettingsPage/include/ViewTab/Mode.inc @@ -90,4 +90,11 @@ +
+
Ширина тени
+
+ +
+
+ \ No newline at end of file diff --git a/client/components/Reader/TextPage/DrawHelper.js b/client/components/Reader/TextPage/DrawHelper.js index ac31e594..8bd57214 100644 --- a/client/components/Reader/TextPage/DrawHelper.js +++ b/client/components/Reader/TextPage/DrawHelper.js @@ -132,7 +132,7 @@ export default class DrawHelper { const boxH = this.h + (isScrolling ? this.lineHeight : 0); let out = `
`; + ` line-height: ${this.lineHeight}px; white-space: nowrap;">`; let imageDrawn1 = new Set(); let imageDrawn2 = new Set(); @@ -182,7 +182,7 @@ export default class DrawHelper { //разделитель out += `
` + `
` + - `
` + //`` + `` + diff --git a/client/components/Reader/TextPage/TextPage.css b/client/components/Reader/TextPage/TextPage.css new file mode 100644 index 00000000..c6461feb --- /dev/null +++ b/client/components/Reader/TextPage/TextPage.css @@ -0,0 +1,54 @@ +.paper1 { + background: url("images/paper1.jpg") center; + background-size: cover; +} + +.paper2 { + background: url("images/paper2.jpg") center; + background-size: cover; +} + +.paper3 { + background: url("images/paper3.jpg") center; + background-size: cover; +} + +.paper4 { + background: url("images/paper4.jpg") center; + background-size: cover; +} + +.paper5 { + background: url("images/paper5.jpg") center; + background-size: cover; +} + +.paper6 { + background: url("images/paper6.jpg") center; + background-size: cover; +} + +.paper7 { + background: url("images/paper7.jpg") center; + background-size: cover; +} + +.paper8 { + background: url("images/paper8.jpg") center; + background-size: cover; +} + +.paper9 { + background: url("images/paper9.jpg"); +} + +@keyframes page1-animation-thaw { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +@keyframes page2-animation-thaw { + 0% { opacity: 1; } + 100% { opacity: 0; } +} + diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 3f682d86..60c3da24 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -27,7 +27,7 @@
- +
@@ -40,6 +40,8 @@ import Component from 'vue-class-component'; import {loadCSS} from 'fg-loadcss'; import _ from 'lodash'; +import './TextPage.css'; + import * as utils from '../../../share/utils'; import bookManager from '../share/bookManager'; import DrawHelper from './DrawHelper'; @@ -200,6 +202,7 @@ class TextPage extends Vue { this.drawHelper.dualDivColor = this.hex2rgba(this.textColor || '#000000', this.dualDivColorAlpha); this.drawHelper.dualDivStrokeFill = this.dualDivStrokeFill; this.drawHelper.dualDivStrokeGap = this.dualDivStrokeGap; + this.drawHelper.dualDivShadowWidth = this.dualDivShadowWidth; this.drawHelper.backgroundColor = this.backgroundColor; this.drawHelper.statusBarColor = this.statusBarColor; @@ -1190,60 +1193,3 @@ class TextPage extends Vue { } - - diff --git a/client/store/modules/reader.js b/client/store/modules/reader.js index ec81a923..983a5a2c 100644 --- a/client/store/modules/reader.js +++ b/client/store/modules/reader.js @@ -228,11 +228,12 @@ const settingDefaults = { dualPageMode: false, dualIndentLR: 10,// px, отступ слева и справа внутри страницы в двухстраничном режиме - dualDivWidth: 4,// px, ширина разделителя - dualDivHeight: 96,// процент, высота разделителя - dualDivColorAlpha: 1,// прозрачность разделителя + dualDivWidth: 2,// px, ширина разделителя + dualDivHeight: 100,// процент, высота разделителя + dualDivColorAlpha: 0.7,// прозрачность разделителя dualDivStrokeFill: 1,// px, заполнение пунктира dualDivStrokeGap: 1,// px, промежуток пунктира + dualDivShadowWidth: 0,// px, ширина тени showStatusBar: true, statusBarTop: false,// top, bottom