1

.idea/workspace.xml

@@ -4,7 +4,6 @@
     <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="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>
@@ -125,8 +124,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="306">
-                  <caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
+                <state relative-caret-position="401">
+                  <caret line="148" column="3" lean-forward="false" selection-start-line="148" selection-start-column="3" selection-end-line="148" selection-end-column="3" />
                   <folding />
                 </state>
               </provider>
@@ -187,8 +186,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>
@@ -549,12 +548,12 @@
       <updated>1566667513502</updated>
       <workItem from="1566667516612" duration="55749000" />
       <workItem from="1567098016695" duration="6433000" />
-      <workItem from="1567181764126" duration="2663000" />
+      <workItem from="1567181764126" duration="2732000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="64845000" />
+    <option name="totallyTimeSpent" value="64914000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="815" extended-state="6" />
@@ -947,8 +946,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
+        <state relative-caret-position="401">
+          <caret line="148" column="3" lean-forward="false" selection-start-line="148" selection-start-column="3" selection-end-line="148" selection-end-column="3" />
           <folding />
         </state>
       </provider>

Public/static/css/main.css

@@ -84,21 +84,37 @@ html, body {
   .page-sate {
     height: 1030px;
   }
+
+  html, body {
+    height: 1041px;
+  }
 }
 @media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1041px;
   }
+
+  html, body {
+    height: 1041px;
+  }
 }
 @media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1041px;
   }
+
+  html, body {
+    height: 1041px;
+  }
 }
 @media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1238px;
   }
+
+  html, body {
+    height: 1041px;
+  }
 }
 ul, li {
   list-style: none;

Public/static/css/main.scss

@@ -121,23 +121,35 @@ html, body {
   .page-sate {
     height: 1030px;
   }
+  html,body{
+    height: 1041px;
+  }
 }
 
 @media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1041px;
   }
+  html,body{
+    height: 1041px;
+  }
 }
 
 @media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1041px;
   }
+  html,body{
+    height: 1041px;
+  }
 }
 @media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
   .page-sate {
     height: 1238px;
   }
+  html,body{
+    height: 1041px;
+  }
 }
 
 ul, li {