Browse Source

Pull request #13313: REPORT-107973 主页及组件视觉样式翻新

Merge in DESIGN/design from ~LEO.QIN/design:newui to newui

* commit '102a0f306171b5dc8942353bc5712cc5075fd2b2':
  REPORT-107973 主页及组件视觉样式翻新 【问题原因】rt 【改动思路】更新一下disable状态下的icon
newui
Leo.Qin-覃宇攀 1 year ago
parent
commit
4e364903c6
  1. 2
      designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java
  2. 13
      designer-base/src/main/resources/com/fine/theme/icon/clear_disable.svg
  3. 6
      designer-base/src/main/resources/com/fine/theme/icon/dot_disable.svg
  4. 7
      designer-base/src/main/resources/com/fine/theme/icon/down_arrow_disable.svg
  5. 4
      designer-base/src/main/resources/com/fine/theme/icon/up_arrow_disable.svg

2
designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java

@ -138,7 +138,7 @@ public class FineLightIconSet extends AbstractIconSet {
new SvgIconSource("sub_report", "com/fine/theme/icon/insert/sub_report.svg", true),
new SvgIconSource("chart_line", "com/fine/theme/icon/chart/chart_line.svg", true),
new SvgIconSource("popup", "com/fine/theme/icon/popup/popup.svg", true),
new SvgIconSource("clear", "com/fine/theme/icon/clear.svg"),
new SvgIconSource("clear", "com/fine/theme/icon/clear.svg", true),
// 工具栏
new SvgIconSource("tool_copy", "com/fine/theme/icon/toolbar/copy.svg", true),

13
designer-base/src/main/resources/com/fine/theme/icon/clear_disable.svg

@ -0,0 +1,13 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#177;&#187;&#229;&#158;&#139;=&#231;&#186;&#191;&#230;&#128;&#167;, &#231;&#166;&#129;&#231;&#148;&#168;=on"
clip-path="url(#clip0_6669_103725)">
<path id="Union"
d="M14.5858 16L7.51472 23.071C7.12419 23.4616 7.12419 24.0947 7.51472 24.4853C7.90524 24.8758 8.53841 24.8758 8.92893 24.4853L16 17.4142L23.0711 24.4853C23.4616 24.8758 24.0948 24.8758 24.4853 24.4853C24.8758 24.0947 24.8758 23.4616 24.4853 23.071L17.4142 16L24.4853 8.92891C24.8758 8.53839 24.8758 7.90522 24.4853 7.5147C24.0948 7.12418 23.4616 7.12418 23.0711 7.5147L16 14.5858L8.92893 7.5147C8.53841 7.12418 7.90524 7.12418 7.51472 7.5147C7.12419 7.90522 7.12419 8.53839 7.51472 8.92891L14.5858 16Z"
fill="#0A1C38" fill-opacity="0.29"/>
</g>
<defs>
<clipPath id="clip0_6669_103725">
<rect width="32" height="32" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 1017 B

6
designer-base/src/main/resources/com/fine/theme/icon/dot_disable.svg

@ -1,7 +1,7 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#230;&#155;&#180;&#229;&#164;&#154;">
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#229;&#144;&#141;&#231;&#167;&#176;=&#230;&#155;&#180;&#229;&#164;&#154;, &#231;&#166;&#129;&#231;&#148;&#168;=on">
<path id="Union" fill-rule="evenodd" clip-rule="evenodd"
d="M5.34999 8.35C5.34999 8.81944 4.96944 9.2 4.49999 9.2C4.03055 9.2 3.64999 8.81944 3.64999 8.35C3.64999 7.88056 4.03055 7.5 4.49999 7.5C4.96944 7.5 5.34999 7.88056 5.34999 8.35ZM8.84999 8.35C8.84999 8.81944 8.46944 9.2 7.99999 9.2C7.53055 9.2 7.14999 8.81944 7.14999 8.35C7.14999 7.88056 7.53055 7.5 7.99999 7.5C8.46944 7.5 8.84999 7.88056 8.84999 8.35ZM11.5 9.2C11.9694 9.2 12.35 8.81944 12.35 8.35C12.35 7.88056 11.9694 7.5 11.5 7.5C11.0306 7.5 10.65 7.88056 10.65 8.35C10.65 8.81944 11.0306 9.2 11.5 9.2Z"
d="M10.6998 16.7C10.6998 17.6389 9.93869 18.4 8.9998 18.4C8.06092 18.4 7.2998 17.6389 7.2998 16.7C7.2998 15.7611 8.06092 15 8.9998 15C9.93869 15 10.6998 15.7611 10.6998 16.7ZM17.6998 16.7C17.6998 17.6389 16.9387 18.4 15.9998 18.4C15.0609 18.4 14.2998 17.6389 14.2998 16.7C14.2998 15.7611 15.0609 15 15.9998 15C16.9387 15 17.6998 15.7611 17.6998 16.7ZM22.9998 18.4C23.9387 18.4 24.6998 17.6389 24.6998 16.7C24.6998 15.7611 23.9387 15 22.9998 15C22.0609 15 21.2998 15.7611 21.2998 16.7C21.2998 17.6389 22.0609 18.4 22.9998 18.4Z"
fill="#0A1C38" fill-opacity="0.29"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 803 B

After

Width:  |  Height:  |  Size: 898 B

7
designer-base/src/main/resources/com/fine/theme/icon/down_arrow_disable.svg

@ -1,5 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g id="&#231;&#174;&#173;&#229;&#164;&#180;">
<path id="Union" d="M3.75743 6.09835C3.56217 6.29361 3.56217 6.6102 3.75743 6.80546L8.00007 11.0481L12.2427 6.80546C12.438 6.61019 12.438 6.29362 12.2427 6.09835C12.0474 5.90308 11.7309 5.90309 11.5356 6.09835L8.00007 9.63388L4.46454 6.09835C4.26928 5.90309 3.95269 5.90309 3.75743 6.09835Z" fill="#0A1C38" fill-opacity="0.29"/>
</g>
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.51486 12.1967C7.12433 12.5872 7.12434 13.2204 7.51486 13.6109L16.0001 22.0962L24.4854 13.6109C24.8759 13.2204 24.876 12.5872 24.4854 12.1967C24.0949 11.8062 23.4617 11.8062 23.0712 12.1967L16.0001 19.2678L8.92907 12.1967C8.53855 11.8062 7.90538 11.8062 7.51486 12.1967Z"
fill="#0A1C38" fill-opacity="0.29"/>
</svg>

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 437 B

4
designer-base/src/main/resources/com/fine/theme/icon/up_arrow_disable.svg

@ -0,0 +1,4 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.51486 19.8033C7.12433 19.4128 7.12434 18.7796 7.51486 18.3891L16.0001 9.90381L24.4854 18.3891C24.8759 18.7796 24.876 19.4128 24.4854 19.8033C24.0949 20.1938 23.4617 20.1938 23.0712 19.8033L16.0001 12.7322L8.92907 19.8033C8.53855 20.1938 7.90538 20.1938 7.51486 19.8033Z"
fill="#0A1C38" fill-opacity="0.29"/>
</svg>

After

Width:  |  Height:  |  Size: 437 B

Loading…
Cancel
Save