TASK:#110955修改部分冲突
This commit is contained in:
parent
2da290403b
commit
3741eae0ab
|
@ -9,6 +9,7 @@
|
||||||
- add indicator-page-point
|
- add indicator-page-point
|
||||||
- add blur
|
- add blur
|
||||||
- add radio
|
- add radio
|
||||||
|
- add clock
|
||||||
- add toast
|
- add toast
|
||||||
- add card
|
- add card
|
||||||
- add contaienr
|
- add contaienr
|
||||||
|
@ -18,4 +19,3 @@
|
||||||
- add delay exchange feature
|
- add delay exchange feature
|
||||||
- fix bugs of container exchange stradegy
|
- fix bugs of container exchange stradegy
|
||||||
- add confirm
|
- add confirm
|
||||||
- add clock
|
|
||||||
|
|
|
@ -141,8 +141,8 @@ export const sharedStyles: CSSResult = css`
|
||||||
}
|
}
|
||||||
.star-clock-point-transparent {
|
.star-clock-point-transparent {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 20px;
|
width: 18px;
|
||||||
height: 20px;
|
height: 18px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 50%;
|
right: 50%;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
|
|
@ -145,14 +145,6 @@ export class PanelRoot extends LitElement {
|
||||||
href="#radio"
|
href="#radio"
|
||||||
></star-li>
|
></star-li>
|
||||||
<hr />
|
<hr />
|
||||||
<star-li
|
|
||||||
type=${LiType.ICON_LABEL}
|
|
||||||
label="时钟"
|
|
||||||
icon="alarm"
|
|
||||||
iconcolor="green"
|
|
||||||
href="#clock"
|
|
||||||
></star-li>
|
|
||||||
<hr />
|
|
||||||
<star-li
|
<star-li
|
||||||
type=${LiType.ICON_LABEL}
|
type=${LiType.ICON_LABEL}
|
||||||
label="溢出菜单"
|
label="溢出菜单"
|
||||||
|
@ -161,6 +153,14 @@ export class PanelRoot extends LitElement {
|
||||||
href="#overflowmenu"
|
href="#overflowmenu"
|
||||||
></star-li>
|
></star-li>
|
||||||
<hr />
|
<hr />
|
||||||
|
<star-li
|
||||||
|
type=${LiType.ICON_LABEL}
|
||||||
|
label="时钟"
|
||||||
|
icon="alarm"
|
||||||
|
iconcolor="green"
|
||||||
|
href="#clock"
|
||||||
|
></star-li>
|
||||||
|
<hr />
|
||||||
<star-li
|
<star-li
|
||||||
type=${LiType.ICON_LABEL}
|
type=${LiType.ICON_LABEL}
|
||||||
label="关于"
|
label="关于"
|
||||||
|
|
Loading…
Reference in New Issue