Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改样式

This commit is contained in:
sylor_huang@126.com 2020-04-07 15:08:48 +08:00
parent 0123b7810f
commit b04649dc7c
3 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.idea/workspace.xml
View File

@ -66,7 +66,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js"> <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139"> <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" /> <caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" /> <element signature="e#2764#3198#0" />
@ -87,10 +87,11 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319"> <state relative-caret-position="226">
<caret line="320" column="70" lean-forward="true" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" /> <caret line="325" lean-forward="true" selection-start-line="325" selection-end-line="325" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
<element signature="e#7722#8184#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -99,8 +100,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css"> <entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89"> <state relative-caret-position="163">
<caret line="81" column="22" lean-forward="true" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" /> <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -108,8 +109,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css"> <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="372">
<caret line="569" column="1" lean-forward="true" selection-start-line="569" selection-start-column="1" selection-end-line="569" selection-end-column="9" /> <caret line="575" column="1" lean-forward="true" selection-start-line="575" selection-start-column="1" selection-end-line="575" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -130,8 +131,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>tyle=</find>
<find>overflo</find>
<find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find> <find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
<find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find> <find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
<find>分支合并到</find> <find>分支合并到</find>
@ -157,9 +156,11 @@
<find>renderJournalList</find> <find>renderJournalList</find>
<find>img_fork</find> <find>img_fork</find>
<find>fork</find> <find>fork</find>
<find>projectDe</find>
<find>.color-white</find> <find>.color-white</find>
<find>color-white</find> <find>color-white</find>
<find>posi</find>
<find>projectDe</find>
<find>pository</find>
</findStrings> </findStrings>
<dirStrings> <dirStrings>
<dir>$PROJECT_DIR$</dir> <dir>$PROJECT_DIR$</dir>
@ -307,12 +308,12 @@
<workItem from="1585817691582" duration="2125000" /> <workItem from="1585817691582" duration="2125000" />
<workItem from="1585900267463" duration="136000" /> <workItem from="1585900267463" duration="136000" />
<workItem from="1585902299727" duration="2113000" /> <workItem from="1585902299727" duration="2113000" />
<workItem from="1586153685130" duration="7242000" /> <workItem from="1586153685130" duration="8122000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="75610000" /> <option name="totallyTimeSpent" value="76490000" />
</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" />
@ -331,7 +332,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <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="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.61566263" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.24216868" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.48313254" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <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="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@ -797,7 +798,7 @@
<entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js"> <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="139"> <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" /> <caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
<element signature="e#2764#3198#0" /> <element signature="e#2764#3198#0" />
@ -816,26 +817,27 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/list.css"> <entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="163">
<caret line="569" column="1" lean-forward="true" selection-start-line="569" selection-start-column="1" selection-end-line="569" selection-end-column="9" /> <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/css/index.css"> <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="89"> <state relative-caret-position="372">
<caret line="81" column="22" lean-forward="true" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" /> <caret line="575" column="1" lean-forward="true" selection-start-line="575" selection-start-column="1" selection-end-line="575" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319"> <state relative-caret-position="226">
<caret line="320" column="70" lean-forward="true" selection-start-line="320" selection-start-column="70" selection-end-line="320" selection-end-column="70" /> <caret line="325" lean-forward="true" selection-start-line="325" selection-end-line="325" />
<folding> <folding>
<element signature="e#0#42#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
<element signature="e#7722#8184#0" />
</folding> </folding>
</state> </state>
</provider> </provider>

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

@ -303,7 +303,7 @@ class Detail extends Component{
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
<div className="detailHeader-wrapper"> <div className="detailHeader-wrapper">
<div className="normal"> <div className="normal">
<div className="f-wrap-between mb25"> <div className="f-wrap-between mb25" style={{position:"relative"}}>
<p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}> <p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
{ {
projectDetail && projectDetail.forked_from_project_id ? projectDetail && projectDetail.forked_from_project_id ?
@ -317,21 +317,22 @@ class Detail extends Component{
<span className="hide-1 flex-1"> <span className="hide-1 flex-1">
<Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link> <Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link>
</span> </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">
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-white">{ projectDetail.fork_info.fork_form_name }</Link>
</span>
</div>
:
""
}
</p> </p>
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<div className="fork-css font-14 color-grey-ccc 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">
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-grey-ccc">{ projectDetail.fork_info.fork_form_name }</Link>
</span>
</div>
:
""
}
</div> </div>
<div className="f-wrap-between"> <div className="f-wrap-between">

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

@ -573,3 +573,9 @@ border: 1px solid #2185d0;
top: 50px; top: 50px;
width: 100%; width: 100%;
} }
.color-grey-ccc{
color: #ccc;
}
a.color-grey-ccc:hover{
color: #4cacff !important;
}