Commit c02c6357 by zhangheng

1

parent 94362d7c
......@@ -2,8 +2,11 @@
<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="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" />
......@@ -17,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.61002785">
<splitter split-orientation="horizontal" split-proportion="0.49767873">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -82,8 +85,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="228">
<caret line="205" column="0" lean-forward="false" selection-start-line="205" selection-start-column="0" selection-end-line="205" selection-end-column="0" />
<state relative-caret-position="114">
<caret line="199" column="52" lean-forward="false" selection-start-line="199" selection-start-column="52" selection-end-line="199" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......@@ -120,8 +123,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="285">
<caret line="367" column="10" lean-forward="false" selection-start-line="367" selection-start-column="3" selection-end-line="367" selection-end-column="10" />
<state relative-caret-position="266">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
<folding />
</state>
</provider>
......@@ -161,8 +164,8 @@
<find>map-20</find>
<find>map-12</find>
<find>image_bounds_by_pos</find>
<find>page-s-</find>
<find>b-j-two</find>
<find>page-s-</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -544,12 +547,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="1823000" />
<workItem from="1567181764126" duration="2048000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64005000" />
<option name="totallyTimeSpent" value="64230000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -926,16 +929,16 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="367" column="10" lean-forward="false" selection-start-line="367" selection-start-column="3" selection-end-line="367" selection-end-column="10" />
<state relative-caret-position="266">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
<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="228">
<caret line="205" column="0" lean-forward="false" selection-start-line="205" selection-start-column="0" selection-end-line="205" selection-end-column="0" />
<state relative-caret-position="114">
<caret line="199" column="52" lean-forward="false" selection-start-line="199" selection-start-column="52" selection-end-line="199" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......
......@@ -198,16 +198,15 @@
</div>
</div>
<div class="page-s-c" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="b-j-two">
</div>
<img class="h-b" src="">
<img class="btn-s" src="__CDN__/images/f-h.png">
<div class="btn">
<div class="btn-c-w btn-sate"></div>
<div class="btn-prize btn-sate"></div>
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<img class="h-b" src="">
<img class="btn-s" src="__CDN__/images/f-h.png">
<div class="btn">
<div class="btn-c-w btn-sate"></div>
<div class="btn-prize btn-sate"></div>
</div>
</div>
</div>
<div class="dialog dialog_rule" style="display: none">
......
......@@ -410,10 +410,12 @@ ul, li {
align-items: center;
justify-content: center;
width: 640px;
height: 1111px;
}
.page-s-c .b-j-two {
position: relative;
display: block;
width: 100%;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
......
......@@ -364,11 +364,11 @@ ul, li {
align-items: center;
justify-content: center;
width: 640px;
//height: 1238px;
height: 1111px;
.b-j-two {
position: relative;
display: block;
//width: 599px;
width:100%;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
......
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