Explorar o código

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/multiPage/index.vue
leo.xie %!s(int64=3) %!d(string=hai) anos
pai
achega
9bf5252b5a
Modificáronse 4 ficheiros con 36 adicións e 2 borrados
  1. 2 0
      .gitignore
  2. 20 0
      .idea/git_toolbox_prj.xml
  3. 6 0
      .idea/misc.xml
  4. 8 2
      src/views/multiPage/index.vue

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+/node_modules/
+/dist/

+ 20 - 0
.idea/git_toolbox_prj.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationConfigOverride">
+      <CommitMessageValidationOverride>
+        <option name="enabled" value="true" />
+      </CommitMessageValidationOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

+ 6 - 0
.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebPackConfiguration">
+    <option name="mode" value="DISABLED" />
+  </component>
+</project>

+ 8 - 2
src/views/multiPage/index.vue

@@ -23,8 +23,12 @@
         <div>{{nomessage}}</div>
       </div>
     </div>
-    <div style="position: absolute;left:0;top:40%;z-index: 10000000;">
-      <div style="width:100%;text-align:center;font-size:50px;color:#003;opacity: 0.2">{{watermark}}</div>
+<!--    <div style="position: absolute;left:0;top:40%;z-index: 10000000;">-->
+<!--      <div style="width:100%;text-align:center;font-size:50px;color:#000;opacity: 0.15">{{watermark}}</div>-->
+<!--    </div>-->
+    <div style="position: relative;width: 100%;height: 100%;z-index: 99999;">
+      <div style="width:300px;font-style:oblique;text-align:center;font-size:30px;color:#000;opacity: 0.2;position: absolute;left: 0;right: 0;margin: 55% auto;">{{watermark}}</div>
+
     </div>
 
   </div>
@@ -264,4 +268,6 @@ export default {
   background: #17a8ff;
   color: #fff;
 }
+img { pointer-events: none!important; }
+image { pointer-events: none!important; }
 </style>