y

6cd806ef · zhangheng · 55c10cb5 · 6cd806ef · 6cd806ef · 6cd806ef
Commit 6cd806ef authored Aug 30, 2019 by zhangheng
Hide whitespace changes
Inline Side-by-side

Showing with 26 additions and 26 deletions

.idea/workspace.xml
+24 -23

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

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

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

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,10 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/map-word2.png" afterPath="" />
+      <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$/Public/static/images/map-word3.png" afterPath="" />
-      <change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/map-word4.png" afterPath="" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <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" />
@@ -19,7 +19,7 @@
  </component>
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.75023043">
+    <splitter split-orientation="horizontal" split-proportion="0.2202765">
      <split-first>
        <leaf>
          <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
@@ -84,8 +84,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="247">
+                <state relative-caret-position="323">
-                  <caret line="174" column="63" lean-forward="true" selection-start-line="174" selection-start-column="63" selection-end-line="174" selection-end-column="63" />
+                  <caret line="259" column="25" lean-forward="true" selection-start-line="259" selection-start-column="25" selection-end-line="259" selection-end-column="25" />
                  <folding>
                    <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                    <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -180,8 +180,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="437">
+                <state relative-caret-position="342">
-                  <caret line="253" column="9" lean-forward="false" selection-start-line="253" selection-start-column="9" selection-end-line="253" selection-end-column="9" />
+                  <caret line="107" column="13" lean-forward="false" selection-start-line="107" selection-start-column="13" selection-end-line="107" selection-end-column="13" />
                  <folding />
                </state>
              </provider>
@@ -236,8 +236,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>
@@ -591,16 +591,16 @@
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1566667513502</updated>
-      <workItem from="1566667516612" duration="53097000" />
+      <workItem from="1566667516612" duration="53481000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="53097000" />
+    <option name="totallyTimeSpent" value="53481000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="31" y="23" width="1440" height="817" extended-state="0" />
-    <editor active="false" />
+    <editor active="true" />
    <layout>
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22389127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
@@ -610,7 +610,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="true" 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="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" />
@@ -776,18 +776,10 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="253" column="9" lean-forward="false" selection-start-line="253" selection-start-column="9" selection-end-line="253" selection-end-column="9" />
-          <folding />
-        </state>
-      </provider>
-    </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="247">
+        <state relative-caret-position="323">
-          <caret line="174" column="63" lean-forward="true" selection-start-line="174" selection-start-column="63" selection-end-line="174" selection-end-column="63" />
+          <caret line="259" column="25" lean-forward="true" selection-start-line="259" selection-start-column="25" selection-end-line="259" selection-end-column="25" />
          <folding>
            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
            <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -844,5 +836,13 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="107" column="13" lean-forward="false" selection-start-line="107" selection-start-column="13" selection-end-line="107" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
  </component>
 </project>
\ No newline at end of file
--- a/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+++ b/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
--- a/Public/static/css/main.css
+++ b/Public/static/css/main.css
@@ -71,7 +71,7 @@ html, body {
  width: 100%;
  user-select: none;
  padding: 0;
-  background-color: #a9d0fe;
+  background-color: #72a2e2;
  font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC';
 }

--- a/Public/static/css/main.scss
+++ b/Public/static/css/main.scss
@@ -106,9 +106,8 @@ html, body {
  //overflow-x: hidden;
  user-select: none;
  padding: 0;
  //  -webkit-overflow-scrolling: touch;
-  background-color: #a9d0fe;
+  background-color: #72a2e2;
  font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC';
 }