Gitlink
/
forgeplus-react
33
0
Fork 29
Code Issues Pull Requests Releases 1 Wiki Activity

修改fork显示的样式

This commit is contained in:
sylor_huang@126.com 2020-04-07 14:54:30 +08:00
parent 4c11feb276
commit 0123b7810f
3 changed files with 97 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
.idea/workspace.xml
View File

@ -3,9 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/IndexItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -19,7 +17,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="391" column="26" lean-forward="true" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<caret line="391" column="26" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
@ -55,7 +53,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="86" column="60" lean-forward="true" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<caret line="86" column="60" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#3295#3542#0" />
@ -64,11 +62,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530">
<caret line="85" column="22" lean-forward="true" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
<state relative-caret-position="139">
<caret line="60" column="26" lean-forward="true" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" />
@ -81,16 +79,16 @@
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="239" lean-forward="true" selection-start-line="239" selection-end-line="239" />
<caret line="239" selection-start-line="239" selection-end-line="239" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-625">
<caret line="252" column="7" selection-start-line="252" selection-start-column="7" selection-end-line="252" selection-end-column="7" />
<state relative-caret-position="319">
<caret line="320" column="70" lean-forward="true" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
@ -98,11 +96,29 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="81" column="22" lean-forward="true" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="569" column="1" lean-forward="true" selection-start-line="569" selection-start-column="1" selection-end-line="569" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2320">
<caret line="455" column="11" lean-forward="true" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<caret line="455" column="11" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
@ -114,8 +130,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>forked</find>
<find>.OptionsUl</find>
<find>tyle=</find>
<find>overflo</find>
<find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
@ -144,6 +158,8 @@
<find>img_fork</find>
<find>fork</find>
<find>projectDe</find>
<find>.color-white</find>
<find>color-white</find>
</findStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
@ -190,10 +206,11 @@
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Version/version.css" />
<option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
<option value="$PROJECT_DIR$/src/forge/Main/list.css" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
</list>
</option>
</component>
@ -290,18 +307,18 @@
<workItem from="1585817691582" duration="2125000" />
<workItem from="1585900267463" duration="136000" />
<workItem from="1585902299727" duration="2113000" />
<workItem from="1586153685130" duration="6012000" />
<workItem from="1586153685130" duration="7242000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="74380000" />
<option name="totallyTimeSpent" value="75610000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17596567" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17596567" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@ -314,7 +331,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.17710844" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.24216868" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@ -376,25 +393,6 @@
</option>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="33" column="4" selection-start-line="33" selection-start-column="4" selection-end-line="33" selection-end-column="4" />
<folding>
<element signature="e#0#26#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/home/shixunsHome.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5268">
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
@ -742,7 +740,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="391" column="26" lean-forward="true" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<caret line="391" column="26" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
@ -762,7 +760,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2320">
<caret line="455" column="11" lean-forward="true" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<caret line="455" column="11" selection-start-line="455" selection-start-column="11" selection-end-line="455" selection-end-column="11" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
@ -779,16 +777,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-625">
<caret line="252" column="7" selection-start-line="252" selection-start-column="7" selection-end-line="252" selection-end-column="7" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
@ -802,25 +790,14 @@
<entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="239" lean-forward="true" selection-start-line="239" selection-end-line="239" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="86" column="60" lean-forward="true" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#3295#3542#0" />
</folding>
<caret line="239" selection-start-line="239" selection-end-line="239" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="530">
<caret line="85" column="22" lean-forward="true" selection-start-line="85" selection-start-column="22" selection-end-line="85" selection-end-column="22" />
<state relative-caret-position="139">
<caret line="60" column="26" lean-forward="true" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" />
@ -828,5 +805,40 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="166">
<caret line="86" column="60" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#3295#3542#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="569" column="1" lean-forward="true" selection-start-line="569" selection-start-column="1" selection-end-line="569" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89">
<caret line="81" column="22" lean-forward="true" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="320" column="70" lean-forward="true" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

27
src/forge/Main/Detail.js
View File

@ -303,7 +303,7 @@ class Detail extends Component{
<Spin spinning={isSpin}>
<div className="detailHeader-wrapper">
<div className="normal">
<div className="f-wrap-between mb20">
<div className="f-wrap-between mb25">
<p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
{
projectDetail && projectDetail.forked_from_project_id ?
@ -317,21 +317,22 @@ class Detail extends Component{
<span className="hide-1 flex-1">
<Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link>
</span>
</p>
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<p className="font-18 color-white df flex-1 lineH2 mt10" style={{alignItems:"center"}}>
<span>Forked From</span>
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<div className="fork-css font-14 color-grey-c df flex-1 lineH2" style={{alignItems:"center"}}>
<span className="mr10">Forked From</span>
{projectDetail.fork_info.fork_project_user_name}
<span className="ml5 mr5">/</span>
<span className="hide-1 flex-1">
{projectDetail.fork_info.fork_project_user_name}
<span className="ml5 mr5">/</span>
<span className="hide-1 flex-1">
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-white">{ projectDetail.fork_info.fork_form_name }</Link>
</span>
</p>
:
""
}
</div>
:
""
}
</p>
</div>
<div className="f-wrap-between">
<ul className="headerMenu-wrapper">

6
src/forge/Main/list.css
View File

@ -567,3 +567,9 @@ border: 1px solid #2185d0;
height: auto;
}
.text-center{text-align: center;}
.fork-css{
position: absolute;
left: 0;
top: 50px;
width: 100%;
}