2

ba4a72b6 · zhangheng · 0bc37d48 · ba4a72b6 · ba4a72b6 · ba4a72b6
Commit ba4a72b6 authored Aug 30, 2019 by zhangheng
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 13 deletions

.idea/workspace.xml
+7 -11

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

Public/static/css/main.css
+1 -1

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

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,10 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/12.png" afterPath="$PROJECT_DIR$/Public/static/images/12.png" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/13.png" afterPath="$PROJECT_DIR$/Public/static/images/13.png" />
      <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" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -127,7 +123,7 @@
            <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
              <provider selected="true" editor-type-id="text-editor">
                <state relative-caret-position="458">
-                  <caret line="594" column="5" lean-forward="false" selection-start-line="594" selection-start-column="5" selection-end-line="594" selection-end-column="5" />
+                  <caret line="593" column="4" lean-forward="false" selection-start-line="593" selection-start-column="4" selection-end-line="593" selection-end-column="4" />
                  <folding />
                </state>
              </provider>
@@ -186,8 +182,8 @@
        <option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
        <option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
        <option value="$PROJECT_DIR$/Public/static/js/index.js" />
-        <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
        <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
+        <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
      </list>
    </option>
  </component>
@@ -548,12 +544,12 @@
      <option name="presentableId" value="Default" />
      <updated>1566667513502</updated>
      <workItem from="1566667516612" duration="55749000" />
-      <workItem from="1567098016695" duration="3916000" />
+      <workItem from="1567098016695" duration="3954000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="59665000" />
+    <option name="totallyTimeSpent" value="59703000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="14" y="23" width="1440" height="817" extended-state="0" />
@@ -566,7 +562,7 @@
      <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.24689655" 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="false" show_stripe_button="true" weight="0.17517242" 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="true" show_stripe_button="true" weight="0.17517242" 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" />
@@ -849,7 +845,7 @@
    <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="458">
-          <caret line="594" column="5" lean-forward="false" selection-start-line="594" selection-start-column="5" selection-end-line="594" selection-end-column="5" />
+          <caret line="593" column="4" lean-forward="false" selection-start-line="593" selection-start-column="4" selection-end-line="593" selection-end-column="4" />
          <folding />
        </state>
      </provider>

--- a/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+++ b/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
--- a/Public/static/css/main.css
+++ b/Public/static/css/main.css
@@ -755,7 +755,7 @@ ul, li {
  opacity: 0;
  position: absolute;
  display: inline-block;
-  left: 225px;
+  left: 384px;
  top: 4678px;
  background: url("../images/37.png") left top;
  width: 172px;

--- a/Public/static/css/main.scss
+++ b/Public/static/css/main.scss
@@ -591,7 +591,8 @@ ul, li {
  }
  .map-37 {
    opacity: 0;
-    @include image_bounds_by_pos("../images/37.png", 225px, 4678px);
+    @include image_bounds_by_pos("../images/37.png", 384px, 4678px);
    -webkit-animation: right 0.5s 1 linear 1s;
    animation-fill-mode: forwards
  }