处理冲突
This commit is contained in:
parent
6af95102e1
commit
7c237442b7
|
@ -37,6 +37,7 @@ import './slider/slider'
|
|||
import './switch/switch'
|
||||
import './toast/toast'
|
||||
import './weather/weather'
|
||||
import './iconfont/iconfont'
|
||||
import './swiper/swiper'
|
||||
|
||||
type SEID = string
|
||||
|
@ -301,7 +302,7 @@ export class PanelRoot extends LitElement {
|
|||
iconcolor="blue"
|
||||
href="#battery"
|
||||
></star-li>
|
||||
<hr />
|
||||
|
||||
<star-li
|
||||
type=${LiType.ICON_LABEL}
|
||||
label="电池"
|
||||
|
@ -309,6 +310,15 @@ export class PanelRoot extends LitElement {
|
|||
iconcolor="red"
|
||||
href="#batterysquare"
|
||||
></star-li>
|
||||
<hr />
|
||||
|
||||
<star-li
|
||||
type=${LiType.ICON_LABEL}
|
||||
label="IconFont图标"
|
||||
icon="all-day"
|
||||
iconcolor="yellow"
|
||||
href="#iconfont"
|
||||
></star-li>
|
||||
</star-ul>
|
||||
|
||||
<star-ul type=${UlType.ONLY_HEADER} title="时钟">
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import {css, CSSResult} from 'lit'
|
||||
import './iconfont/iconfont/iconfont.css'
|
||||
|
||||
export const sharedPickerStyles: CSSResult = css`
|
||||
* {
|
||||
|
@ -25,4 +26,23 @@ export const sharedPickerStyles: CSSResult = css`
|
|||
#demo {
|
||||
margin: 20px;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 3736756 */
|
||||
/* Color fonts */
|
||||
src:
|
||||
url('iconfont.ttf?t=1667368773903') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
font-family: "iconfont" !important;
|
||||
font-size: 32px;
|
||||
color:red;
|
||||
font-style: normal;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
display: inline-block;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
}
|
||||
`
|
||||
|
|
Loading…
Reference in New Issue