Commit 74dfb104 by zhangheng

j

parent a7c4ab93
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment=""> <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$/.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$/.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.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/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
...@@ -166,8 +165,8 @@ ...@@ -166,8 +165,8 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <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$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -588,12 +587,12 @@ ...@@ -588,12 +587,12 @@
<workItem from="1563355311998" duration="122000" /> <workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="1609000" /> <workItem from="1563377354829" duration="1609000" />
<workItem from="1563441996623" duration="114000" /> <workItem from="1563441996623" duration="114000" />
<workItem from="1563716562750" duration="1192000" /> <workItem from="1563716562750" duration="1214000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="18763000" /> <option name="totallyTimeSpent" value="18785000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="64" y="23" width="1440" height="813" extended-state="0" /> <frame x="64" y="23" width="1440" height="813" extended-state="0" />
...@@ -1042,14 +1041,6 @@ ...@@ -1042,14 +1041,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273"> <state relative-caret-position="273">
...@@ -1060,6 +1051,14 @@ ...@@ -1060,6 +1051,14 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="203" column="15" lean-forward="false" selection-start-line="203" selection-start-column="15" selection-end-line="203" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
...@@ -181,8 +181,8 @@ ul, li { ...@@ -181,8 +181,8 @@ ul, li {
top: 375px; top: 375px;
left: 19px; left: 19px;
opacity: 0; opacity: 0;
-webkit-transform-origin: 46% 50%;
-webkit-animation: rotate 2s ease 0s 1; -webkit-animation: rotate 2s ease 0s 1;
-webkit-transform-origin: 46% 50%;
-webkit-animation-fill-mode: forwards; -webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
......
...@@ -202,8 +202,8 @@ ul, li { ...@@ -202,8 +202,8 @@ ul, li {
top:torem(375px); top:torem(375px);
left: 19px; left: 19px;
opacity: 0; opacity: 0;
-webkit-transform-origin: 46% 50%;
-webkit-animation: rotate 2s ease 0s 1; -webkit-animation: rotate 2s ease 0s 1;
-webkit-transform-origin: 46% 50%;
-webkit-animation-fill-mode: forwards; -webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards; animation-fill-mode: forwards;
img { img {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment