j

ef36671e · zhangheng · 67e01968 · ef36671e · ef36671e · ef36671e
Commit ef36671e authored Jul 21, 2019 by zhangheng
Showing with 26 additions and 15 deletions

.idea/workspace.xml
+13 -10

.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc
+0 -0

Application/Home/View/default/Index_index.tpl
+1 -1

Public/static/css/main.css
+6 -2

Public/static/css/main.scss
+6 -2

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -33,8 +36,8 @@
          <file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="197">
+                <state relative-caret-position="159">
-                  <caret line="55" column="36" lean-forward="false" selection-start-line="55" selection-start-column="36" selection-end-line="55" selection-end-column="36" />
+                  <caret line="42" column="39" lean-forward="true" selection-start-line="42" selection-start-column="39" selection-end-line="42" selection-end-column="39" />
                  <folding>
                    <element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                  </folding>
@@ -133,8 +136,8 @@
          <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="122">
+                <state relative-caret-position="236">
-                  <caret line="201" column="21" lean-forward="false" selection-start-line="201" selection-start-column="21" selection-end-line="201" selection-end-column="21" />
+                  <caret line="207" column="9" lean-forward="true" selection-start-line="207" selection-start-column="9" selection-end-line="207" selection-end-column="9" />
                  <folding />
                </state>
              </provider>
@@ -584,12 +587,12 @@
      <workItem from="1563355311998" duration="122000" />
      <workItem from="1563377354829" duration="1609000" />
      <workItem from="1563441996623" duration="114000" />
-      <workItem from="1563716562750" duration="776000" />
+      <workItem from="1563716562750" duration="920000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="18347000" />
+    <option name="totallyTimeSpent" value="18491000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="0" y="23" width="1440" height="813" extended-state="6" />
@@ -600,9 +603,9 @@
      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32918397" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32871014" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22746186" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22746186" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1048,8 +1051,8 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
+        <state relative-caret-position="159">
-          <caret line="55" column="36" lean-forward="false" selection-start-line="55" selection-start-column="36" selection-end-line="55" selection-end-column="36" />
+          <caret line="42" column="39" lean-forward="true" selection-start-line="42" selection-start-column="39" selection-end-line="42" selection-end-column="39" />
          <folding>
            <element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
          </folding>

--- a/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc
+++ b/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc
--- a/Application/Home/View/default/Index_index.tpl
+++ b/Application/Home/View/default/Index_index.tpl
@@ -43,7 +43,7 @@
        //        })(document, window);
    </script>
    <title>谁是桃源幸运锦鲤</title>
-    <link href="__CDN__/css/main.css?t=2" rel="stylesheet">
+    <link href="__CDN__/css/main.css?t=2.1" rel="stylesheet">
    <style>
    </style>

--- a/Public/static/css/main.css
+++ b/Public/static/css/main.css
@@ -178,15 +178,19 @@ ul, li {
 }
 #container .map-bj {
  position: absolute;
-  top: 398px;
+  top: 375px;
+  left: 78px;
 }
 #container .map-bj img {
  width: 314px;
  height: 312px;
 }
 #container .map-bj span {
-  font-size: 30px;
+  font-size: 40px;
  color: #e9674f;
+  position: relative;
+  top: -200px;
+  left: 100px;
 }
 #container .prize-type {
  position: absolute;

--- a/Public/static/css/main.scss
+++ b/Public/static/css/main.scss
@@ -199,14 +199,18 @@ ul, li {
  height: torem(1238px);
  .map-bj {
    position: absolute;
-    top:torem(398px);
+    top:torem(375px);
+    left: torem(78px);
    img {
      width: torem(314px);
      height: torem(312px);
    }
    span{
-      font-size: 30px;
+      font-size: 40px;
      color: #e9674f;
+      position: relative;
+      top: -200px;
+      left: 100px;
    }
  }
  .prize-type {