Commit ef82abbd by xuzhenghua

scss

parent 386f09e0
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="60bc3527-5f9e-436f-8ed9-968e6eddd66e" name="Default Changelist" comment=""> <list default="true" id="60bc3527-5f9e-436f-8ed9-968e6eddd66e" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Index/index.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/styles/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/styles/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/Index/index.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/Index/index.scss" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/courselist.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/components/classify/courselist.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/components/classify/courselist.scss" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/node_modules/" /> <ignored path="$PROJECT_DIR$/node_modules/" />
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
...@@ -37,11 +34,11 @@ ...@@ -37,11 +34,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122"> <state relative-caret-position="830">
<caret line="94" column="17" selection-start-line="94" selection-start-column="17" selection-end-line="94" selection-end-column="17" /> <caret line="97" column="35" lean-forward="true" selection-start-line="97" selection-start-column="35" selection-end-line="97" selection-end-column="35" />
<folding> <folding>
<marker date="1555928924379" expanded="true" signature="1358:1477" ph="..." /> <marker date="1555928924379" expanded="true" signature="1358:1477" ph="..." />
</folding> </folding>
...@@ -49,6 +46,18 @@ ...@@ -49,6 +46,18 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/styles/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7371">
<caret line="351" column="13" lean-forward="true" selection-start-line="351" selection-start-column="13" selection-end-line="351" selection-end-column="13" />
<folding>
<marker date="1555929386207" expanded="true" signature="4575:5170" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
...@@ -66,6 +75,8 @@ ...@@ -66,6 +75,8 @@
<find>iconerji</find> <find>iconerji</find>
<find>class-course</find> <find>class-course</find>
<find>animated</find> <find>animated</find>
<find>/*</find>
<find>/*</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -87,6 +98,7 @@ ...@@ -87,6 +98,7 @@
<option value="$PROJECT_DIR$/src/components/Index/index.scss" /> <option value="$PROJECT_DIR$/src/components/Index/index.scss" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.js" /> <option value="$PROJECT_DIR$/src/components/classify/courselist.js" />
<option value="$PROJECT_DIR$/src/components/classify/courselist.scss" /> <option value="$PROJECT_DIR$/src/components/classify/courselist.scss" />
<option value="$PROJECT_DIR$/src/styles/index.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -115,25 +127,6 @@ ...@@ -115,25 +127,6 @@
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" /> <item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" /> <item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="components" type="462c0819:PsiDirectoryNode" />
<item name="classify" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="font" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="mr-julyedu" type="b2602c69:ProjectViewProjectNode" />
<item name="mr-julyedu" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="styles" type="462c0819:PsiDirectoryNode" /> <item name="styles" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
...@@ -182,12 +175,12 @@ ...@@ -182,12 +175,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1555481508116</updated> <updated>1555481508116</updated>
<workItem from="1555481509516" duration="544000" /> <workItem from="1555481509516" duration="544000" />
<workItem from="1555900140776" duration="14306000" /> <workItem from="1555900140776" duration="14737000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="14893000" /> <option name="totallyTimeSpent" value="15324000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="0" />
...@@ -255,13 +248,6 @@ ...@@ -255,13 +248,6 @@
<state relative-caret-position="-2293" /> <state relative-caret-position="-2293" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="8" column="46" selection-start-line="8" selection-start-column="46" selection-end-line="8" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Nav/NavLink/index.js"> <entry file="file://$PROJECT_DIR$/src/common/Nav/NavLink/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84"> <state relative-caret-position="84">
...@@ -326,13 +312,6 @@ ...@@ -326,13 +312,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/styles/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-632">
<caret line="223" column="9" lean-forward="true" selection-start-line="223" selection-start-column="9" selection-end-line="223" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/common/Scroll/index.js"> <entry file="file://$PROJECT_DIR$/src/common/Scroll/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="441"> <state relative-caret-position="441">
...@@ -456,15 +435,35 @@ ...@@ -456,15 +435,35 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" lean-forward="true" selection-start-line="9" selection-end-line="10" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss"> <entry file="file://$PROJECT_DIR$/src/components/classify/courselist.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122"> <state relative-caret-position="830">
<caret line="94" column="17" selection-start-line="94" selection-start-column="17" selection-end-line="94" selection-end-column="17" /> <caret line="97" column="35" lean-forward="true" selection-start-line="97" selection-start-column="35" selection-end-line="97" selection-end-column="35" />
<folding> <folding>
<marker date="1555928924379" expanded="true" signature="1358:1477" ph="..." /> <marker date="1555928924379" expanded="true" signature="1358:1477" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/styles/index.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7371">
<caret line="351" column="13" lean-forward="true" selection-start-line="351" selection-start-column="13" selection-end-line="351" selection-end-column="13" />
<folding>
<marker date="1555929386207" expanded="true" signature="4575:5170" ph="..." />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -335,9 +335,8 @@ img { ...@@ -335,9 +335,8 @@ img {
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 1; -webkit-line-clamp: 1;
/* autoprefixer: off; */ /* autoprefixer: ignore next */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
/* autoprefixer: on; */
} }
// 字符超出两行溢出隐藏 // 字符超出两行溢出隐藏
...@@ -346,9 +345,8 @@ img { ...@@ -346,9 +345,8 @@ img {
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
/* autoprefixer: off; */ /* autoprefixer: ignore next */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
/* autoprefixer: on; */
} }
// 字符超出三行溢出隐藏 // 字符超出三行溢出隐藏
...@@ -357,9 +355,8 @@ img { ...@@ -357,9 +355,8 @@ img {
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
/* autoprefixer: off; */ /* autoprefixer: ignore next */
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
/* autoprefixer: on; */
} }
// 浮动控制 // 浮动控制
......
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 to comment